]> source.dussan.org Git - vaadin-framework.git/commitdiff
Remove type parameters from GridKeyEvents (#13334)
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 26 Aug 2014 12:05:59 +0000 (15:05 +0300)
committerVaadin Code Review <review@vaadin.com>
Tue, 26 Aug 2014 13:21:44 +0000 (13:21 +0000)
Change-Id: I8132c034ec378bae91574535f6f1b20591f46d1e

16 files changed:
client/src/com/vaadin/client/ui/grid/Grid.java
client/src/com/vaadin/client/ui/grid/keyevents/AbstractGridKeyEventHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyDownHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyPressHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/BodyKeyUpHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyDownHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyPressHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/FooterKeyUpHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/GridKeyDownEvent.java
client/src/com/vaadin/client/ui/grid/keyevents/GridKeyPressEvent.java
client/src/com/vaadin/client/ui/grid/keyevents/GridKeyUpEvent.java
client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyDownHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyPressHandler.java
client/src/com/vaadin/client/ui/grid/keyevents/HeaderKeyUpHandler.java
client/src/com/vaadin/client/ui/grid/selection/MultiSelectionRenderer.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java

index 70d8286c9035792677fd554bd291de786235ed90..4efe42a82505f14bd7945923c291fdac63164ded 100644 (file)
@@ -124,7 +124,7 @@ import com.vaadin.shared.ui.grid.SortEventOriginator;
 public class Grid<T> extends Composite implements
         HasSelectionChangeHandlers<T>, SubPartAware {
 
-    public static abstract class AbstractGridKeyEvent<T, HANDLER extends AbstractGridKeyEventHandler>
+    public static abstract class AbstractGridKeyEvent<HANDLER extends AbstractGridKeyEventHandler>
             extends KeyCodeEvent<HANDLER> {
 
         /**
@@ -134,13 +134,13 @@ public class Grid<T> extends Composite implements
             HEADER, BODY, FOOTER
         }
 
-        private Grid<T> grid;
+        private Grid<?> grid;
         protected Cell activeCell;
         protected GridSection activeSection;
         private final Type<HANDLER> associatedType = new Type<HANDLER>(
                 getBrowserEventType(), this);
 
-        public AbstractGridKeyEvent(Grid<T> grid) {
+        public AbstractGridKeyEvent(Grid<?> grid) {
             this.grid = grid;
         }
 
@@ -151,7 +151,7 @@ public class Grid<T> extends Composite implements
          * 
          * @return grid
          */
-        public Grid<T> getGrid() {
+        public Grid<?> getGrid() {
             return grid;
         }
 
@@ -182,9 +182,9 @@ public class Grid<T> extends Composite implements
         }
     }
 
-    private GridKeyDownEvent<T> keyDown = new GridKeyDownEvent<T>(this);
-    private GridKeyUpEvent<T> keyUp = new GridKeyUpEvent<T>(this);
-    private GridKeyPressEvent<T> keyPress = new GridKeyPressEvent<T>(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<T> extends Composite implements
      *            the key handler to register
      * @return the registration for the event
      */
-    public <HANDLER extends GridKeyDownHandler<T>> HandlerRegistration addKeyDownHandler(
+    public <HANDLER extends GridKeyDownHandler> HandlerRegistration addKeyDownHandler(
             HANDLER handler) {
         if (handler instanceof BodyKeyDownHandler
                 || handler instanceof HeaderKeyDownHandler
@@ -2495,7 +2495,7 @@ public class Grid<T> extends Composite implements
      *            the key handler to register
      * @return the registration for the event
      */
-    public <HANDLER extends GridKeyUpHandler<T>> HandlerRegistration addKeyUpHandler(
+    public <HANDLER extends GridKeyUpHandler> HandlerRegistration addKeyUpHandler(
             HANDLER handler) {
         if (handler instanceof BodyKeyUpHandler
                 || handler instanceof HeaderKeyUpHandler
@@ -2515,7 +2515,7 @@ public class Grid<T> extends Composite implements
      *            the key handler to register
      * @return the registration for the event
      */
-    public <HANDLER extends GridKeyPressHandler<T>> HandlerRegistration addKeyPressHandler(
+    public <HANDLER extends GridKeyPressHandler> HandlerRegistration addKeyPressHandler(
             HANDLER handler) {
         if (handler instanceof BodyKeyPressHandler
                 || handler instanceof HeaderKeyPressHandler
index 28a85924fa16d383aa34bcf7bde96cf79e6bc136..57708e8bc9e7268869060238d43cb59bf99c0d77 100644 (file)
@@ -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<T> extends
+    public abstract interface GridKeyDownHandler extends
             AbstractGridKeyEventHandler {
-        public void onKeyDown(GridKeyDownEvent<T> event);
+        public void onKeyDown(GridKeyDownEvent event);
     }
 
-    public abstract interface GridKeyUpHandler<T> extends
+    public abstract interface GridKeyUpHandler extends
             AbstractGridKeyEventHandler {
-        public void onKeyUp(GridKeyUpEvent<T> event);
+        public void onKeyUp(GridKeyUpEvent event);
     }
 
-    public abstract interface GridKeyPressHandler<T> extends
+    public abstract interface GridKeyPressHandler extends
             AbstractGridKeyEventHandler {
-        public void onKeyPress(GridKeyPressEvent<T> event);
+        public void onKeyPress(GridKeyPressEvent event);
     }
 
 }
index a3b76ea5d734a4c746beadec634e85ac084ba07d..9e61624a28551da7096363395693b778ebfb3966 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo
  * @since
  * @author Vaadin Ltd
  */
-public interface BodyKeyDownHandler<T> extends GridKeyDownHandler<T> {
+public interface BodyKeyDownHandler extends GridKeyDownHandler {
 }
index 5548994cf9dc50f866931206d34931362657bc8f..f44c1d172eb9402342b733e892447eb7eca93da0 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr
  * @since
  * @author Vaadin Ltd
  */
-public interface BodyKeyPressHandler<T> extends GridKeyPressHandler<T> {
+public interface BodyKeyPressHandler extends GridKeyPressHandler {
 }
\ No newline at end of file
index 33b4fc81feb6aed94ddf899066e2eb968c79a759..a6b3929d807d7da0ebb3a5c9e3ba44af6e748581 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp
  * @since
  * @author Vaadin Ltd
  */
-public interface BodyKeyUpHandler<T> extends GridKeyUpHandler<T> {
+public interface BodyKeyUpHandler extends GridKeyUpHandler {
 }
\ No newline at end of file
index e90f52e73676b3d98e60e5f9b7a767991275e071..5e9fffdcda8c4e0c3e150288be3c3d3099fa031f 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo
  * @since
  * @author Vaadin Ltd
  */
-public interface FooterKeyDownHandler<T> extends GridKeyDownHandler<T> {
+public interface FooterKeyDownHandler extends GridKeyDownHandler {
 }
index 58f48f36f5a8c29fb5380d5217e2d4b3631b994d..d5713d9135aa4c99e7bb93001b7d429192c0649d 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr
  * @since
  * @author Vaadin Ltd
  */
-public interface FooterKeyPressHandler<T> extends GridKeyPressHandler<T> {
+public interface FooterKeyPressHandler extends GridKeyPressHandler {
 }
\ No newline at end of file
index d6bcddf71025601c8f643a0c2a977099172cf533..87978e1cd25f43255386d9a29f1103ede3851bc9 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp
  * @since
  * @author Vaadin Ltd
  */
-public interface FooterKeyUpHandler<T> extends GridKeyUpHandler<T> {
+public interface FooterKeyUpHandler extends GridKeyUpHandler {
 }
\ No newline at end of file
index 8af65dbf49709dc4cf66d051110fe26807edd539..65c8327eb6cb09b9424cd830f62946b0b6b14a91 100644 (file)
@@ -26,15 +26,14 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo
  * @since
  * @author Vaadin Ltd
  */
-public class GridKeyDownEvent<T> extends
-        AbstractGridKeyEvent<T, GridKeyDownHandler<T>> {
+public class GridKeyDownEvent extends AbstractGridKeyEvent<GridKeyDownHandler> {
 
-    public GridKeyDownEvent(Grid<T> grid) {
+    public GridKeyDownEvent(Grid<?> grid) {
         super(grid);
     }
 
     @Override
-    protected void dispatch(GridKeyDownHandler<T> handler) {
+    protected void dispatch(GridKeyDownHandler handler) {
         super.dispatch(handler);
         if ((activeSection == GridSection.BODY && handler instanceof BodyKeyDownHandler)
                 || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyDownHandler)
index 6f06bc6674fc567519ecea7364a55f015c4b7394..388467990bff428fbedd28e5b5b4fb24e6afc43c 100644 (file)
@@ -26,15 +26,15 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr
  * @since
  * @author Vaadin Ltd
  */
-public class GridKeyPressEvent<T> extends
-        AbstractGridKeyEvent<T, GridKeyPressHandler<T>> {
+public class GridKeyPressEvent extends
+        AbstractGridKeyEvent<GridKeyPressHandler> {
 
-    public GridKeyPressEvent(Grid<T> grid) {
+    public GridKeyPressEvent(Grid<?> grid) {
         super(grid);
     }
 
     @Override
-    protected void dispatch(GridKeyPressHandler<T> handler) {
+    protected void dispatch(GridKeyPressHandler handler) {
         super.dispatch(handler);
         if ((activeSection == GridSection.BODY && handler instanceof BodyKeyPressHandler)
                 || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyPressHandler)
index d289dbae9888d0493a61387029e974b95a0f3926..dd1fb33e3ff962c781159ead1428f4c531826627 100644 (file)
@@ -26,15 +26,14 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp
  * @since
  * @author Vaadin Ltd
  */
-public class GridKeyUpEvent<T> extends
-        AbstractGridKeyEvent<T, GridKeyUpHandler<T>> {
+public class GridKeyUpEvent extends AbstractGridKeyEvent<GridKeyUpHandler> {
 
-    public GridKeyUpEvent(Grid<T> grid) {
+    public GridKeyUpEvent(Grid<?> grid) {
         super(grid);
     }
 
     @Override
-    protected void dispatch(GridKeyUpHandler<T> handler) {
+    protected void dispatch(GridKeyUpHandler handler) {
         super.dispatch(handler);
         if ((activeSection == GridSection.BODY && handler instanceof BodyKeyUpHandler)
                 || (activeSection == GridSection.HEADER && handler instanceof HeaderKeyUpHandler)
index 28c9a8e056d12cded74faaa03f0bef27cc2503a4..d8a1132a84d0a8a593725041f0390a36ebc602a7 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyDo
  * @since
  * @author Vaadin Ltd
  */
-public interface HeaderKeyDownHandler<T> extends GridKeyDownHandler<T> {
+public interface HeaderKeyDownHandler extends GridKeyDownHandler {
 }
index 607c30493d3f6ae238dbbb61507aa0ddb3dd6def..a2245b1dfef0ae0d7f1d7605bf99db02fcf9da6d 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyPr
  * @since
  * @author Vaadin Ltd
  */
-public interface HeaderKeyPressHandler<T> extends GridKeyPressHandler<T> {
+public interface HeaderKeyPressHandler extends GridKeyPressHandler {
 }
\ No newline at end of file
index bfa3dde79b3859e8a24b7c584414d8976b89b700..405195ec94600b05ff1b61542e0a80232038a70a 100644 (file)
@@ -24,5 +24,5 @@ import com.vaadin.client.ui.grid.keyevents.AbstractGridKeyEventHandler.GridKeyUp
  * @since
  * @author Vaadin Ltd
  */
-public interface HeaderKeyUpHandler<T> extends GridKeyUpHandler<T> {
+public interface HeaderKeyUpHandler extends GridKeyUpHandler {
 }
\ No newline at end of file
index a3030e3a1fd422374ef862ce57aa88d19d6f83d1..bfcc639a64c16e593a89fc3fda880443033eea22 100644 (file)
@@ -584,13 +584,13 @@ public class MultiSelectionRenderer<T> extends ComplexRenderer<Boolean> {
         }
     }
 
-    private class SpaceKeyDownSelectHandler implements BodyKeyDownHandler<T> {
+    private class SpaceKeyDownSelectHandler implements BodyKeyDownHandler {
 
         private HandlerRegistration scrollHandler = null;
         private boolean spaceDown = false;
 
         @Override
-        public void onKeyDown(GridKeyDownEvent<T> event) {
+        public void onKeyDown(GridKeyDownEvent event) {
             if (event.getNativeKeyCode() != KeyCodes.KEY_SPACE || spaceDown) {
                 return;
             }
@@ -634,10 +634,10 @@ public class MultiSelectionRenderer<T> extends ComplexRenderer<Boolean> {
     public MultiSelectionRenderer(final Grid<T> grid) {
         this.grid = grid;
         spaceDown = grid.addKeyDownHandler(handler);
-        spaceUp = grid.addKeyUpHandler(new BodyKeyUpHandler<T>() {
+        spaceUp = grid.addKeyUpHandler(new BodyKeyUpHandler() {
 
             @Override
-            public void onKeyUp(GridKeyUpEvent<T> event) {
+            public void onKeyUp(GridKeyUpEvent event) {
                 if (event.getNativeKeyCode() == KeyCodes.KEY_SPACE) {
                     handler.spaceDown = false;
                 }
index a7210236d4509c82a5b3774951eceedbd74f1272..1bdbd76a20f102f76d919a2cc3c107dd8b1385c4 100644 (file)
@@ -659,93 +659,92 @@ public class GridBasicClientFeaturesWidget extends
         }
 
         // Key Down Events
-        grid.addKeyDownHandler(new BodyKeyDownHandler<List<Data>>() {
+        grid.addKeyDownHandler(new BodyKeyDownHandler() {
             private final VLabel label = labels.get(0);
 
             @Override
-            public void onKeyDown(GridKeyDownEvent<List<Data>> event) {
+            public void onKeyDown(GridKeyDownEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyDownHandler(new HeaderKeyDownHandler<List<Data>>() {
+        grid.addKeyDownHandler(new HeaderKeyDownHandler() {
             private final VLabel label = labels.get(1);
 
             @Override
-            public void onKeyDown(GridKeyDownEvent<List<Data>> event) {
+            public void onKeyDown(GridKeyDownEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyDownHandler(new FooterKeyDownHandler<List<Data>>() {
+        grid.addKeyDownHandler(new FooterKeyDownHandler() {
             private final VLabel label = labels.get(2);
 
             @Override
-            public void onKeyDown(GridKeyDownEvent<List<Data>> event) {
+            public void onKeyDown(GridKeyDownEvent event) {
                 updateLabel(label, event);
             }
         });
 
         // Key Up Events
-        grid.addKeyUpHandler(new BodyKeyUpHandler<List<Data>>() {
+        grid.addKeyUpHandler(new BodyKeyUpHandler() {
             private final VLabel label = labels.get(3);
 
             @Override
-            public void onKeyUp(GridKeyUpEvent<List<Data>> event) {
+            public void onKeyUp(GridKeyUpEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyUpHandler(new HeaderKeyUpHandler<List<Data>>() {
+        grid.addKeyUpHandler(new HeaderKeyUpHandler() {
             private final VLabel label = labels.get(4);
 
             @Override
-            public void onKeyUp(GridKeyUpEvent<List<Data>> event) {
+            public void onKeyUp(GridKeyUpEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyUpHandler(new FooterKeyUpHandler<List<Data>>() {
+        grid.addKeyUpHandler(new FooterKeyUpHandler() {
             private final VLabel label = labels.get(5);
 
             @Override
-            public void onKeyUp(GridKeyUpEvent<List<Data>> event) {
+            public void onKeyUp(GridKeyUpEvent event) {
                 updateLabel(label, event);
             }
         });
 
         // Key Press Events
-        grid.addKeyPressHandler(new BodyKeyPressHandler<List<Data>>() {
+        grid.addKeyPressHandler(new BodyKeyPressHandler() {
             private final VLabel label = labels.get(6);
 
             @Override
-            public void onKeyPress(GridKeyPressEvent<List<Data>> event) {
+            public void onKeyPress(GridKeyPressEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyPressHandler(new HeaderKeyPressHandler<List<Data>>() {
+        grid.addKeyPressHandler(new HeaderKeyPressHandler() {
             private final VLabel label = labels.get(7);
 
             @Override
-            public void onKeyPress(GridKeyPressEvent<List<Data>> event) {
+            public void onKeyPress(GridKeyPressEvent event) {
                 updateLabel(label, event);
             }
         });
 
-        grid.addKeyPressHandler(new FooterKeyPressHandler<List<Data>>() {
+        grid.addKeyPressHandler(new FooterKeyPressHandler() {
             private final VLabel label = labels.get(8);
 
             @Override
-            public void onKeyPress(GridKeyPressEvent<List<Data>> event) {
+            public void onKeyPress(GridKeyPressEvent event) {
                 updateLabel(label, event);
             }
         });
 
     }
 
-    private void updateLabel(VLabel label,
-            AbstractGridKeyEvent<List<Data>, ?> event) {
+    private void updateLabel(VLabel label, AbstractGridKeyEvent<?> event) {
         String type = event.getNativeEvent().getType();
         Cell active = event.getActiveCell();
         String coords = "(" + active.getRow() + ", " + active.getColumn() + ")";