From aaba0aca69d0093f30d6fa04f2695d8272b7314a Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Fri, 5 Dec 2014 12:58:30 +0200 Subject: Rename SortEventHandler to better match GWT conventions (#13334) Change-Id: Ice2452ab2f1c48c4bcac2bc84dc25135ed458bbf --- client/src/com/vaadin/client/ui/grid/Grid.java | 4 +-- .../com/vaadin/client/ui/grid/GridConnector.java | 4 +-- .../client/ui/grid/datasources/ListSorter.java | 4 +-- .../com/vaadin/client/ui/grid/sort/SortEvent.java | 12 +++---- .../client/ui/grid/sort/SortEventHandler.java | 38 ---------------------- .../vaadin/client/ui/grid/sort/SortHandler.java | 38 ++++++++++++++++++++++ .../grid/GridClientColumnRendererConnector.java | 4 +-- 7 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 client/src/com/vaadin/client/ui/grid/sort/SortEventHandler.java create mode 100644 client/src/com/vaadin/client/ui/grid/sort/SortHandler.java diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java index 32de9cccc8..fe14ddef30 100644 --- a/client/src/com/vaadin/client/ui/grid/Grid.java +++ b/client/src/com/vaadin/client/ui/grid/Grid.java @@ -78,7 +78,7 @@ import com.vaadin.client.ui.grid.selection.SelectionModelNone; import com.vaadin.client.ui.grid.selection.SelectionModelSingle; import com.vaadin.client.ui.grid.sort.Sort; import com.vaadin.client.ui.grid.sort.SortEvent; -import com.vaadin.client.ui.grid.sort.SortEventHandler; +import com.vaadin.client.ui.grid.sort.SortHandler; import com.vaadin.client.ui.grid.sort.SortOrder; import com.vaadin.shared.ui.grid.GridConstants; import com.vaadin.shared.ui.grid.GridStaticCellType; @@ -2930,7 +2930,7 @@ public class Grid extends ResizeComposite implements * a sort event handler * @return the registration for the event */ - public HandlerRegistration addSortHandler(SortEventHandler handler) { + public HandlerRegistration addSortHandler(SortHandler handler) { return addHandler(handler, SortEvent.getType()); } diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java index 6aa32abef4..ae78860d79 100644 --- a/client/src/com/vaadin/client/ui/grid/GridConnector.java +++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java @@ -51,7 +51,7 @@ import com.vaadin.client.ui.grid.selection.SelectionModelMulti; import com.vaadin.client.ui.grid.selection.SelectionModelNone; import com.vaadin.client.ui.grid.selection.SelectionModelSingle; import com.vaadin.client.ui.grid.sort.SortEvent; -import com.vaadin.client.ui.grid.sort.SortEventHandler; +import com.vaadin.client.ui.grid.sort.SortHandler; import com.vaadin.client.ui.grid.sort.SortOrder; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.grid.EditorRowClientRpc; @@ -372,7 +372,7 @@ public class GridConnector extends AbstractHasComponentsConnector implements getWidget().addSelectionChangeHandler(internalSelectionChangeHandler); - getWidget().addSortHandler(new SortEventHandler() { + getWidget().addSortHandler(new SortHandler() { @Override public void sort(SortEvent event) { List order = event.getOrder(); diff --git a/client/src/com/vaadin/client/ui/grid/datasources/ListSorter.java b/client/src/com/vaadin/client/ui/grid/datasources/ListSorter.java index 9e643825e9..374a12396d 100644 --- a/client/src/com/vaadin/client/ui/grid/datasources/ListSorter.java +++ b/client/src/com/vaadin/client/ui/grid/datasources/ListSorter.java @@ -25,7 +25,7 @@ import com.vaadin.client.data.DataSource; import com.vaadin.client.ui.grid.Grid; import com.vaadin.client.ui.grid.GridColumn; import com.vaadin.client.ui.grid.sort.SortEvent; -import com.vaadin.client.ui.grid.sort.SortEventHandler; +import com.vaadin.client.ui.grid.sort.SortHandler; import com.vaadin.client.ui.grid.sort.SortOrder; import com.vaadin.shared.ui.grid.SortDirection; @@ -54,7 +54,7 @@ public class ListSorter { comparators = new HashMap, Comparator>(); sortHandlerRegistration = grid - .addSortHandler(new SortEventHandler() { + .addSortHandler(new SortHandler() { @Override public void sort(SortEvent event) { ListSorter.this.sort(event.getOrder()); diff --git a/client/src/com/vaadin/client/ui/grid/sort/SortEvent.java b/client/src/com/vaadin/client/ui/grid/sort/SortEvent.java index b0e1d27539..44f1510f6f 100644 --- a/client/src/com/vaadin/client/ui/grid/sort/SortEvent.java +++ b/client/src/com/vaadin/client/ui/grid/sort/SortEvent.java @@ -29,9 +29,9 @@ import com.vaadin.shared.ui.grid.SortEventOriginator; * @since * @author Vaadin Ltd */ -public class SortEvent extends GwtEvent> { +public class SortEvent extends GwtEvent> { - private static final Type> TYPE = new Type>(); + private static final Type> TYPE = new Type>(); private final Grid grid; private final List order; @@ -56,7 +56,7 @@ public class SortEvent extends GwtEvent> { } @Override - public Type> getAssociatedType() { + public Type> getAssociatedType() { return TYPE; } @@ -66,7 +66,7 @@ public class SortEvent extends GwtEvent> { * * @return a type object, uniquely describing this event type. */ - public static Type> getType() { + public static Type> getType() { return TYPE; } @@ -121,8 +121,8 @@ public class SortEvent extends GwtEvent> { @SuppressWarnings("unchecked") @Override - protected void dispatch(SortEventHandler handler) { - ((SortEventHandler) handler).sort(this); + protected void dispatch(SortHandler handler) { + ((SortHandler) handler).sort(this); } } diff --git a/client/src/com/vaadin/client/ui/grid/sort/SortEventHandler.java b/client/src/com/vaadin/client/ui/grid/sort/SortEventHandler.java deleted file mode 100644 index 57e7fc2ead..0000000000 --- a/client/src/com/vaadin/client/ui/grid/sort/SortEventHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.client.ui.grid.sort; - -import com.google.gwt.event.shared.EventHandler; - -/** - * Handler for a Grid sort event, called when the Grid needs its data source to - * provide data sorted in a specific manner. - * - * @since - * @author Vaadin Ltd - */ -public interface SortEventHandler extends EventHandler { - - /** - * Handle sorting of the Grid. This method is called when a re-sorting of - * the Grid's data is requested. - * - * @param event - * the sort event - */ - public void sort(SortEvent event); - -} diff --git a/client/src/com/vaadin/client/ui/grid/sort/SortHandler.java b/client/src/com/vaadin/client/ui/grid/sort/SortHandler.java new file mode 100644 index 0000000000..d9b72e3343 --- /dev/null +++ b/client/src/com/vaadin/client/ui/grid/sort/SortHandler.java @@ -0,0 +1,38 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.client.ui.grid.sort; + +import com.google.gwt.event.shared.EventHandler; + +/** + * Handler for a Grid sort event, called when the Grid needs its data source to + * provide data sorted in a specific manner. + * + * @since + * @author Vaadin Ltd + */ +public interface SortHandler extends EventHandler { + + /** + * Handle sorting of the Grid. This method is called when a re-sorting of + * the Grid's data is requested. + * + * @param event + * the sort event + */ + public void sort(SortEvent event); + +} diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java index 5d99d65d43..bde16b817e 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java @@ -46,7 +46,7 @@ import com.vaadin.client.ui.grid.renderers.TextRenderer; import com.vaadin.client.ui.grid.renderers.WidgetRenderer; import com.vaadin.client.ui.grid.sort.Sort; import com.vaadin.client.ui.grid.sort.SortEvent; -import com.vaadin.client.ui.grid.sort.SortEventHandler; +import com.vaadin.client.ui.grid.sort.SortHandler; import com.vaadin.client.ui.grid.sort.SortOrder; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers; @@ -153,7 +153,7 @@ public class GridClientColumnRendererConnector extends grid.getHeader().getDefaultRow().getCell(c).setText("Column 2"); // Add method for testing sort event firing - grid.addSortHandler(new SortEventHandler() { + grid.addSortHandler(new SortHandler() { @Override public void sort(SortEvent event) { Element console = Document.get().getElementById( -- cgit v1.2.3