Removed java6 @Override annotations

svn changeset:15543/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java b/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java
index 37312710f77eaad677e3b0ea2d9b60c04d2ea7c9..fdd3a3fce7314fdf05de23c535543e9b898d37c0 100644 (file)
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/tests/src/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -50,14 +50,12 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
 
     protected Command<T, String> widthCommand = new Command<T, String>() {
 
-        @Override
         public void execute(T t, String value, Object data) {
             t.setWidth(value);
         }
     };
     protected Command<T, String> heightCommand = new Command<T, String>() {
 
-        @Override
         public void execute(T t, String value, Object data) {
             t.setHeight(value);
         }
@@ -65,7 +63,6 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
 
     protected Command<T, Boolean> enabledCommand = new Command<T, Boolean>() {
 
-        @Override
         public void execute(T c, Boolean enabled, Object data) {
             c.setEnabled(enabled);
         }
@@ -73,14 +70,13 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
 
     protected Command<T, Boolean> immediateCommand = new Command<T, Boolean>() {
 
-        @Override
         public void execute(T c, Boolean immediate, Object data) {
             c.setImmediate(immediate);
         }
     };
 
     protected Command<T, Boolean> requiredCommand = new Command<T, Boolean>() {
-        @Override
+
         public void execute(T c, Boolean enabled, Object data) {
             if (c instanceof Field) {
                 ((Field) c).setRequired(enabled);
@@ -92,7 +88,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
     };
 
     protected Command<T, Boolean> errorIndicatorCommand = new Command<T, Boolean>() {
-        @Override
+
         public void execute(T c, Boolean enabled, Object data) {
             if (enabled) {
                 c.setComponentError(new UserError("It failed!"));
@@ -104,7 +100,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
     };
 
     protected Command<T, Boolean> readonlyCommand = new Command<T, Boolean>() {
-        @Override
+
         public void execute(T c, Boolean enabled, Object data) {
             c.setReadOnly(enabled);
         }

diff --git a/tests/src/com/vaadin/tests/components/MenuBasedComponentTestCase.java b/tests/src/com/vaadin/tests/components/MenuBasedComponentTestCase.java
index 0c7db4c483d9aad5311e303dbd4e4173b14e64b7..88129ecedc6e37de461cf23348dac928f35ca1ba 100644 (file)
--- a/tests/src/com/vaadin/tests/components/MenuBasedComponentTestCase.java
+++ b/tests/src/com/vaadin/tests/components/MenuBasedComponentTestCase.java
@@ -249,7 +249,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
             final Object data) {\r
 \r
         return new MenuBar.Command() {\r
-            @Override\r
             public void menuSelected(MenuItem selectedItem) {\r
                 boolean selected = !isSelected(selectedItem);\r
                 doCommand(getText(selectedItem), booleanCommand, selected, data);\r
@@ -275,7 +274,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
             final com.vaadin.tests.components.ComponentTestCase.Command<T, VALUETYPE> cmd,\r
             final VALUETYPE object, final Object data) {\r
         return new MenuBar.Command() {\r
-            @Override\r
             public void menuSelected(MenuItem selectedItem) {\r
                 doCommand(getText(selectedItem), cmd, object, data);\r
 \r
@@ -355,7 +353,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
 \r
     protected Command<AbstractSelect, Boolean> nullSelectionAllowedCommand = new Command<AbstractSelect, Boolean>() {\r
 \r
-        @Override\r
         public void execute(AbstractSelect c, Boolean value, Object data) {\r
             (c).setNullSelectionAllowed(value);\r
         }\r
@@ -363,7 +360,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
 \r
     protected Command<AbstractSelect, Object> nullSelectItemIdCommand = new Command<AbstractSelect, Object>() {\r
 \r
-        @Override\r
         public void execute(AbstractSelect c, Object value, Object data) {\r
             c.setNullSelectionItemId(value);\r
         }\r
@@ -371,7 +367,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
 \r
     protected Command<AbstractSelect, Integer> itemsInContainerCommand = new Command<AbstractSelect, Integer>() {\r
 \r
-        @Override\r
         public void execute(AbstractSelect t, Integer value, Object data) {\r
             t.setContainerDataSource(createContainer(t.getContainerDataSource()\r
                     .getContainerPropertyIds().size(), value));\r
@@ -380,7 +375,6 @@ public abstract class MenuBasedComponentTestCase<T extends AbstractComponent>
 \r
     protected Command<AbstractSelect, Integer> columnsInContainerCommand = new Command<AbstractSelect, Integer>() {\r
 \r
-        @Override\r
         public void execute(AbstractSelect t, Integer value, Object data) {\r
             t.setContainerDataSource(createContainer(value, t\r
                     .getContainerDataSource().size()));\r

diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java
index 617532b9758202060dfcc7756f6c3a123730ea18..8a1f52f3a489b97d96cf3c8b25543be35e6a4458 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/Tables.java
+++ b/tests/src/com/vaadin/tests/components/table/Tables.java
@@ -46,7 +46,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     };\r
 \r
     protected Command<Table, Boolean> columnResizeListenerCommand = new Command<Table, Boolean>() {\r
-        @Override\r
+\r
         public void execute(Table c, Boolean value, Object data) {\r
             if (value) {\r
                 c.addListener((ColumnResizeListener) Tables.this);\r
@@ -57,7 +57,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     };\r
 \r
     protected Command<Table, Boolean> headerClickListenerCommand = new Command<Table, Boolean>() {\r
-        @Override\r
+\r
         public void execute(Table c, Boolean value, Object data) {\r
             if (value) {\r
                 c.addListener((HeaderClickListener) Tables.this);\r
@@ -68,7 +68,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     };\r
 \r
     protected Command<Table, Boolean> footerClickListenerCommand = new Command<Table, Boolean>() {\r
-        @Override\r
+\r
         public void execute(Table c, Boolean value, Object data) {\r
             if (value) {\r
                 c.addListener((FooterClickListener) Tables.this);\r
@@ -79,7 +79,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     };\r
 \r
     protected Command<Table, Integer> rowHeaderModeCommand = new Command<Table, Integer>() {\r
-        @Override\r
+\r
         public void execute(Table c, Integer value, Object data) {\r
             if (value == Table.ROW_HEADER_MODE_PROPERTY) {\r
                 c.setItemCaptionPropertyId("Column 3");\r
@@ -89,7 +89,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     };\r
 \r
     protected Command<Table, String> footerTextCommand = new Command<Table, String>() {\r
-        @Override\r
+\r
         public void execute(Table c, String value, Object data) {\r
             for (Object propertyId : c.getContainerPropertyIds()) {\r
                 if (value != null) {\r
@@ -107,7 +107,7 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     }\r
 \r
     protected Command<Table, Alignments> columnAlignmentCommand = new Command<Table, Alignments>() {\r
-        @Override\r
+\r
         public void execute(Table c, Alignments value, Object data) {\r
             for (Object propertyId : c.getContainerPropertyIds()) {\r
                 // TODO\r
@@ -151,7 +151,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     private void createColumnReorderingAllowedCheckbox(String category) {\r
         createBooleanAction("Column reordering allowed", category, true,\r
                 new Command<Table, Boolean>() {\r
-                    @Override\r
                     public void execute(Table c, Boolean value, Object data) {\r
                         c.setColumnReorderingAllowed(value);\r
                     }\r
@@ -161,7 +160,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     private void createColumnCollapsingAllowedCheckbox(String category) {\r
         createBooleanAction("Column collapsing allowed", category, true,\r
                 new Command<Table, Boolean>() {\r
-                    @Override\r
                     public void execute(Table c, Boolean value, Object data) {\r
                         c.setColumnCollapsingAllowed(value);\r
                     }\r
@@ -233,7 +231,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
     private void createItemClickListenerCheckbox(String category) {\r
         Command<Table, Boolean> itemClickListenerCommand = new Command<Table, Boolean>() {\r
 \r
-            @Override\r
             public void execute(Table c, Boolean value, Object data) {\r
                 if (value) {\r
                     c.addListener((ItemClickListener) Tables.this);\r
@@ -287,7 +284,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
         createBooleanAction("Footer visible", category, true,\r
                 new Command<Table, Boolean>() {\r
 \r
-                    @Override\r
                     public void execute(Table c, Boolean value, Object data) {\r
                         c.setFooterVisible(value);\r
                     }\r
@@ -305,7 +301,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
         createSelectAction("Header mode", category, options,\r
                 "Explicit defaults id", new Command<Table, Integer>() {\r
 \r
-                    @Override\r
                     public void execute(Table c, Integer value, Object data) {\r
                         c.setColumnHeaderMode(value);\r
 \r
@@ -324,7 +319,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
         createSelectAction("PageLength", category, options, "10",\r
                 new Command<Table, Integer>() {\r
 \r
-                    @Override\r
                     public void execute(Table t, Integer value, Object data) {\r
                         t.setPageLength(value);\r
                     }\r
@@ -345,7 +339,6 @@ public class Tables extends MenuBasedComponentTestCase<Table> implements
         createSelectAction("Selection Mode", category, options,\r
                 "Multi - ctrl/shift", new Command<Table, SelectMode>() {\r
 \r
-                    @Override\r
                     public void execute(Table t, SelectMode value, Object data) {\r
                         switch (value) {\r
                         case NONE:\r