From ec2ecdf0e79ee3c13f0e16192c8000930e525e8a Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Tue, 26 Aug 2014 15:05:59 +0300 Subject: [PATCH] Remove type parameters from GridKeyEvents (#13334) Change-Id: I8132c034ec378bae91574535f6f1b20591f46d1e --- .../src/com/vaadin/client/ui/grid/Grid.java | 20 +++++----- .../AbstractGridKeyEventHandler.java | 13 ++++--- .../ui/grid/keyevents/BodyKeyDownHandler.java | 2 +- .../grid/keyevents/BodyKeyPressHandler.java | 2 +- .../ui/grid/keyevents/BodyKeyUpHandler.java | 2 +- .../grid/keyevents/FooterKeyDownHandler.java | 2 +- .../grid/keyevents/FooterKeyPressHandler.java | 2 +- .../ui/grid/keyevents/FooterKeyUpHandler.java | 2 +- .../ui/grid/keyevents/GridKeyDownEvent.java | 7 ++-- .../ui/grid/keyevents/GridKeyPressEvent.java | 8 ++-- .../ui/grid/keyevents/GridKeyUpEvent.java | 7 ++-- .../grid/keyevents/HeaderKeyDownHandler.java | 2 +- .../grid/keyevents/HeaderKeyPressHandler.java | 2 +- .../ui/grid/keyevents/HeaderKeyUpHandler.java | 2 +- .../selection/MultiSelectionRenderer.java | 8 ++-- .../grid/GridBasicClientFeaturesWidget.java | 39 +++++++++---------- 16 files changed, 59 insertions(+), 61 deletions(-) diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java index 70d8286c90..4efe42a825 100644 --- a/client/src/com/vaadin/client/ui/grid/Grid.java +++ b/client/src/com/vaadin/client/ui/grid/Grid.java @@ -124,7 +124,7 @@ import com.vaadin.shared.ui.grid.SortEventOriginator; public class Grid extends Composite implements HasSelectionChangeHandlers, SubPartAware { - public static abstract class AbstractGridKeyEvent + public static abstract class AbstractGridKeyEvent extends KeyCodeEvent { /** @@ -134,13 +134,13 @@ public class Grid extends Composite implements HEADER, BODY, FOOTER } - private Grid grid; + private Grid grid; protected Cell activeCell; protected GridSection activeSection; private final Type associatedType = new Type( getBrowserEventType(), this); - public AbstractGridKeyEvent(Grid grid) { + public AbstractGridKeyEvent(Grid grid) { this.grid = grid; } @@ -151,7 +151,7 @@ public class Grid extends Composite implements * * @return grid */ - public Grid getGrid() { + public Grid getGrid() { return grid; } @@ -182,9 +182,9 @@ public class Grid extends Composite implements } } - private GridKeyDownEvent keyDown = new GridKeyDownEvent(this); - private GridKeyUpEvent keyUp = new GridKeyUpEvent(this); - private GridKeyPressEvent keyPress = new GridKeyPressEvent(this); + private GridKeyDownEvent keyDown = new GridKeyDownEvent(this); + private GridKeyUpEvent keyUp = new GridKeyUpEvent(this); + private GridKeyPressEvent keyPress = new GridKeyPressEvent(this); private class ActiveCellHandler { @@ -2475,7 +2475,7 @@ public class Grid extends Composite implements * the key handler to register * @return the registration for the event */ - public > HandlerRegistration addKeyDownHandler( + public HandlerRegistration addKeyDownHandler( HANDLER handler) { if (handler instanceof BodyKeyDownHandler || handler instanceof HeaderKeyDownHandler @@ -2495,7 +2495,7 @@ public class Grid extends Composite implements * the key handler to register * @return the registration for the event */ - public > HandlerRegistration addKeyUpHandler( + public HandlerRegistration addKeyUpHandler( HANDLER handler) { if (handler instanceof BodyKeyUpHandler || handler instanceof HeaderKeyUpHandler @@ -2515,7 +2515,7 @@ public class Grid extends Composite implements * the key handler to register * @return the registration for the event */ - public > HandlerRegistration addKeyPressHandler( + public HandlerRegistration addKeyPressHandler( HANDLER handler) { if (handler instanceof BodyKeyPressHandler || handler instanceof HeaderKeyPressHandler diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/AbstractGridKeyEventHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/AbstractGridKeyEventHandler.java index 28a85924fa..57708e8bc9 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/AbstractGridKeyEventHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/AbstractGridKeyEventHandler.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.grid.keyevents; import com.google.gwt.event.shared.EventHandler; +import com.vaadin.client.ui.grid.Grid.AbstractGridKeyEvent; /** * Base interface of all handlers for {@link AbstractGridKeyEvent}s. @@ -25,19 +26,19 @@ import com.google.gwt.event.shared.EventHandler; */ public abstract interface AbstractGridKeyEventHandler extends EventHandler { - public abstract interface GridKeyDownHandler extends + public abstract interface GridKeyDownHandler extends AbstractGridKeyEventHandler { - public void onKeyDown(GridKeyDownEvent event); + public void onKeyDown(GridKeyDownEvent event); } - public abstract interface GridKeyUpHandler extends + public abstract interface GridKeyUpHandler extends AbstractGridKeyEventHandler { - public void onKeyUp(GridKeyUpEvent event); + public void onKeyUp(GridKeyUpEvent event); } - public abstract interface GridKeyPressHandler extends + public abstract interface GridKeyPressHandler extends AbstractGridKeyEventHandler { - public void onKeyPress(GridKeyPressEvent event); + public void onKeyPress(GridKeyPressEvent event); } } diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyDownHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyDownHandler.java index a3b76ea5d7..9e61624a28 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyDownHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyDownHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo * @since * @author Vaadin Ltd */ -public interface BodyKeyDownHandler extends GridKeyDownHandler { +public interface BodyKeyDownHandler extends GridKeyDownHandler { } diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyPressHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyPressHandler.java index 5548994cf9..f44c1d172e 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyPressHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyPressHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr * @since * @author Vaadin Ltd */ -public interface BodyKeyPressHandler extends GridKeyPressHandler { +public interface BodyKeyPressHandler extends GridKeyPressHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyUpHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyUpHandler.java index 33b4fc81fe..a6b3929d80 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyUpHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyUpHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp * @since * @author Vaadin Ltd */ -public interface BodyKeyUpHandler extends GridKeyUpHandler { +public interface BodyKeyUpHandler extends GridKeyUpHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyDownHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyDownHandler.java index e90f52e736..5e9fffdcda 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyDownHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyDownHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo * @since * @author Vaadin Ltd */ -public interface FooterKeyDownHandler extends GridKeyDownHandler { +public interface FooterKeyDownHandler extends GridKeyDownHandler { } diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyPressHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyPressHandler.java index 58f48f36f5..d5713d9135 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyPressHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyPressHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr * @since * @author Vaadin Ltd */ -public interface FooterKeyPressHandler extends GridKeyPressHandler { +public interface FooterKeyPressHandler extends GridKeyPressHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyUpHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyUpHandler.java index d6bcddf710..87978e1cd2 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyUpHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyUpHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp * @since * @author Vaadin Ltd */ -public interface FooterKeyUpHandler extends GridKeyUpHandler { +public interface FooterKeyUpHandler extends GridKeyUpHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyDownEvent.java b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyDownEvent.java index 8af65dbf49..65c8327eb6 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyDownEvent.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyDownEvent.java @@ -26,15 +26,14 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo * @since * @author Vaadin Ltd */ -public class GridKeyDownEvent extends - AbstractGridKeyEvent> { +public class GridKeyDownEvent extends AbstractGridKeyEvent { - public GridKeyDownEvent(Grid grid) { + public GridKeyDownEvent(Grid grid) { super(grid); } @Override - protected void dispatch(GridKeyDownHandler handler) { + protected void dispatch(GridKeyDownHandler handler) { super.dispatch(handler); if ((activeSection == GridSection.BODY && handler instanceof BodyKeyDownHandler) || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyDownHandler) diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyPressEvent.java b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyPressEvent.java index 6f06bc6674..388467990b 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyPressEvent.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyPressEvent.java @@ -26,15 +26,15 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr * @since * @author Vaadin Ltd */ -public class GridKeyPressEvent extends - AbstractGridKeyEvent> { +public class GridKeyPressEvent extends + AbstractGridKeyEvent { - public GridKeyPressEvent(Grid grid) { + public GridKeyPressEvent(Grid grid) { super(grid); } @Override - protected void dispatch(GridKeyPressHandler handler) { + protected void dispatch(GridKeyPressHandler handler) { super.dispatch(handler); if ((activeSection == GridSection.BODY && handler instanceof BodyKeyPressHandler) || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyPressHandler) diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyUpEvent.java b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyUpEvent.java index d289dbae98..dd1fb33e3f 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyUpEvent.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/GridKeyUpEvent.java @@ -26,15 +26,14 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp * @since * @author Vaadin Ltd */ -public class GridKeyUpEvent extends - AbstractGridKeyEvent> { +public class GridKeyUpEvent extends AbstractGridKeyEvent { - public GridKeyUpEvent(Grid grid) { + public GridKeyUpEvent(Grid grid) { super(grid); } @Override - protected void dispatch(GridKeyUpHandler handler) { + protected void dispatch(GridKeyUpHandler handler) { super.dispatch(handler); if ((activeSection == GridSection.BODY && handler instanceof BodyKeyUpHandler) || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyUpHandler) diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyDownHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyDownHandler.java index 28c9a8e056..d8a1132a84 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyDownHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyDownHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo * @since * @author Vaadin Ltd */ -public interface HeaderKeyDownHandler extends GridKeyDownHandler { +public interface HeaderKeyDownHandler extends GridKeyDownHandler { } diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyPressHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyPressHandler.java index 607c30493d..a2245b1dfe 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyPressHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyPressHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr * @since * @author Vaadin Ltd */ -public interface HeaderKeyPressHandler extends GridKeyPressHandler { +public interface HeaderKeyPressHandler extends GridKeyPressHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyUpHandler.java b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyUpHandler.java index bfa3dde79b..405195ec94 100644 --- a/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyUpHandler.java +++ b/client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyUpHandler.java @@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp * @since * @author Vaadin Ltd */ -public interface HeaderKeyUpHandler extends GridKeyUpHandler { +public interface HeaderKeyUpHandler extends GridKeyUpHandler { } \ No newline at end of file diff --git a/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java b/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java index a3030e3a1f..bfcc639a64 100644 --- a/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java +++ b/client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java @@ -584,13 +584,13 @@ public class MultiSelectionRenderer extends ComplexRenderer { } } - private class SpaceKeyDownSelectHandler implements BodyKeyDownHandler { + private class SpaceKeyDownSelectHandler implements BodyKeyDownHandler { private HandlerRegistration scrollHandler = null; private boolean spaceDown = false; @Override - public void onKeyDown(GridKeyDownEvent event) { + public void onKeyDown(GridKeyDownEvent event) { if (event.getNativeKeyCode() != KeyCodes.KEY_SPACE || spaceDown) { return; } @@ -634,10 +634,10 @@ public class MultiSelectionRenderer extends ComplexRenderer { public MultiSelectionRenderer(final Grid grid) { this.grid = grid; spaceDown = grid.addKeyDownHandler(handler); - spaceUp = grid.addKeyUpHandler(new BodyKeyUpHandler() { + spaceUp = grid.addKeyUpHandler(new BodyKeyUpHandler() { @Override - public void onKeyUp(GridKeyUpEvent event) { + public void onKeyUp(GridKeyUpEvent event) { if (event.getNativeKeyCode() == KeyCodes.KEY_SPACE) { handler.spaceDown = false; } diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java index a7210236d4..1bdbd76a20 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java @@ -659,93 +659,92 @@ public class GridBasicClientFeaturesWidget extends } // Key Down Events - grid.addKeyDownHandler(new BodyKeyDownHandler>() { + grid.addKeyDownHandler(new BodyKeyDownHandler() { private final VLabel label = labels.get(0); @Override - public void onKeyDown(GridKeyDownEvent> event) { + public void onKeyDown(GridKeyDownEvent event) { updateLabel(label, event); } }); - grid.addKeyDownHandler(new HeaderKeyDownHandler>() { + grid.addKeyDownHandler(new HeaderKeyDownHandler() { private final VLabel label = labels.get(1); @Override - public void onKeyDown(GridKeyDownEvent> event) { + public void onKeyDown(GridKeyDownEvent event) { updateLabel(label, event); } }); - grid.addKeyDownHandler(new FooterKeyDownHandler>() { + grid.addKeyDownHandler(new FooterKeyDownHandler() { private final VLabel label = labels.get(2); @Override - public void onKeyDown(GridKeyDownEvent> event) { + public void onKeyDown(GridKeyDownEvent event) { updateLabel(label, event); } }); // Key Up Events - grid.addKeyUpHandler(new BodyKeyUpHandler>() { + grid.addKeyUpHandler(new BodyKeyUpHandler() { private final VLabel label = labels.get(3); @Override - public void onKeyUp(GridKeyUpEvent> event) { + public void onKeyUp(GridKeyUpEvent event) { updateLabel(label, event); } }); - grid.addKeyUpHandler(new HeaderKeyUpHandler>() { + grid.addKeyUpHandler(new HeaderKeyUpHandler() { private final VLabel label = labels.get(4); @Override - public void onKeyUp(GridKeyUpEvent> event) { + public void onKeyUp(GridKeyUpEvent event) { updateLabel(label, event); } }); - grid.addKeyUpHandler(new FooterKeyUpHandler>() { + grid.addKeyUpHandler(new FooterKeyUpHandler() { private final VLabel label = labels.get(5); @Override - public void onKeyUp(GridKeyUpEvent> event) { + public void onKeyUp(GridKeyUpEvent event) { updateLabel(label, event); } }); // Key Press Events - grid.addKeyPressHandler(new BodyKeyPressHandler>() { + grid.addKeyPressHandler(new BodyKeyPressHandler() { private final VLabel label = labels.get(6); @Override - public void onKeyPress(GridKeyPressEvent> event) { + public void onKeyPress(GridKeyPressEvent event) { updateLabel(label, event); } }); - grid.addKeyPressHandler(new HeaderKeyPressHandler>() { + grid.addKeyPressHandler(new HeaderKeyPressHandler() { private final VLabel label = labels.get(7); @Override - public void onKeyPress(GridKeyPressEvent> event) { + public void onKeyPress(GridKeyPressEvent event) { updateLabel(label, event); } }); - grid.addKeyPressHandler(new FooterKeyPressHandler>() { + grid.addKeyPressHandler(new FooterKeyPressHandler() { private final VLabel label = labels.get(8); @Override - public void onKeyPress(GridKeyPressEvent> event) { + public void onKeyPress(GridKeyPressEvent event) { updateLabel(label, event); } }); } - private void updateLabel(VLabel label, - AbstractGridKeyEvent, ?> event) { + private void updateLabel(VLabel label, AbstractGridKeyEvent event) { String type = event.getNativeEvent().getType(); Cell active = event.getActiveCell(); String coords = "(" + active.getRow() + ", " + active.getColumn() + ")"; -- 2.39.5