140 files changed, 164 insertions, 13 deletions
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java b/src/com/itmill/toolkit/tests/tickets/Ticket1225.java
index 4cbf1267f0..c119478c43 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1225.java
@@ -16,6 +16,7 @@ import com.itmill.toolkit.ui.Window;
  */
 public class Ticket1225 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
index 1e51951c62..76102bb2ba 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
@@ -16,6 +16,7 @@ public class Ticket1230 extends Application {
     private Select selectWithoutNullItem;
     private Select selectWithNullItem;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket124.java b/src/com/itmill/toolkit/tests/tickets/Ticket124.java
index 1c839e2029..4d3293769b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket124.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket124.java
@@ -14,6 +14,7 @@ public class Ticket124 extends Application {
     private TextField tf;
     private GridLayout gl;
 
+    @Override
     public void init() {
         Window w = new Window("#124: Insert & remove row for GridLayout");
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java b/src/com/itmill/toolkit/tests/tickets/Ticket1245.java
index b7c0e07179..61800af0a1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1245.java
@@ -15,6 +15,7 @@ public class Ticket1245 extends com.itmill.toolkit.Application {
 
     TextField f = new TextField();
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java b/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java
index 9b99019773..3ced64947b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java
@@ -134,6 +134,7 @@ public class Ticket1362Login extends Application {
             setCompositionRoot(iframe);
         }
 
+        @Override
         public void attach() {
             super.attach();
             getApplication().addResource(loginPage);
@@ -141,6 +142,7 @@ public class Ticket1362Login extends Application {
             iframe.setSource(loginPage);
         }
 
+        @Override
         public void detach() {
             getApplication().removeResource(loginPage);
             getWindow().removeParameterHandler(paramHandler);
@@ -220,6 +222,7 @@ public class Ticket1362Login extends Application {
 
     private ExpandLayout el;
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java b/src/com/itmill/toolkit/tests/tickets/Ticket1365.java
index eb3504dc56..becd0781b0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1365.java
@@ -14,6 +14,7 @@ public class Ticket1365 extends com.itmill.toolkit.Application implements
 
     Label status = new Label("ENTER and CTRL-S fires shortcut action.");
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java b/src/com/itmill/toolkit/tests/tickets/Ticket1368.java
index 70b5f383ba..b2f137ec8c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1368.java
@@ -12,6 +12,7 @@ public class Ticket1368 extends Application {
 
     private Table t;
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app to #1368");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java b/src/com/itmill/toolkit/tests/tickets/Ticket1397.java
index 9f34d93d2e..08305830eb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1397.java
@@ -18,6 +18,7 @@ public class Ticket1397 extends Application {
 
     Window main;
 
+    @Override
     public void init() {
         setTheme("default");
         main = new Window("PopupView test");
@@ -101,8 +102,9 @@ public class Ticket1397 extends Application {
 
         // Fifth test component
         Table table = new Table("Table for testing purposes");
-        for (int i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++) {
             table.addContainerProperty("" + (i + 1), String.class, "");
+        }
         table.addContainerProperty("" + 6, PopupView.class, null);
         table.addContainerProperty("" + 7, PopupView.class, null);
         table.setPageLength(20);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java b/src/com/itmill/toolkit/tests/tickets/Ticket1435.java
index 65d06db678..d235ac9cef 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1435.java
@@ -18,6 +18,7 @@ public class Ticket1435 extends Application {
 
     private static final boolean useWorkaround = true;
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("ButtonPanel containing a table test");
@@ -169,6 +170,7 @@ public class Ticket1435 extends Application {
             container.setHeight("100%");
         }
 
+        @Override
         public void setHeight(String height) {
             root.setHeight(height);
             lastHeight = root.getHeight();
@@ -176,6 +178,7 @@ public class Ticket1435 extends Application {
             container.setHeight("100%");
         }
 
+        @Override
         public void setWidth(String width) {
             root.setWidth(width);
         }
@@ -184,6 +187,7 @@ public class Ticket1435 extends Application {
             root.setWidth(width, unit);
         }
 
+        @Override
         public void setSizeFull() {
             setWidth("100%");
             setHeight("100%");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java b/src/com/itmill/toolkit/tests/tickets/Ticket1444.java
index 8436378b30..9ee7d4772e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1444.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1444 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java b/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java
index 3e941643f3..62bebb7319 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1465ModalNotification extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("ButtonPanel containing a table test");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java
index c45c1ceb5c..648aecf2fc 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java
@@ -28,14 +28,14 @@ public class Ticket1506_TestContainer implements Container {
                 String.class));
         item1.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name 1",
                 String.class));
-        this.items.put(ITEM_1_ID, item1);
+        items.put(ITEM_1_ID, item1);
 
         final PropertysetItem item2 = new PropertysetItem();
         item2.addItemProperty(PROPERTY_1_ID, new ObjectProperty("value 2",
                 String.class));
         item2.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name 2",
                 String.class));
-        this.items.put(ITEM_2_ID, item2);
+        items.put(ITEM_2_ID, item2);
     }
 
     public Item getItem(Object itemId) {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java
index 73a3f6c319..7654eef668 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java
@@ -29,7 +29,7 @@ public class Ticket1506_TestContainer2 implements Container {
                     "value " + i, String.class));
             item.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name " + i,
                     String.class));
-            this.items.put(String.valueOf(i), item);
+            items.put(String.valueOf(i), item);
         }
     }
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java b/src/com/itmill/toolkit/tests/tickets/Ticket1519.java
index 4f0decf1ef..72ebc5e0bb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1519.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1519 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app to #1368");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java b/src/com/itmill/toolkit/tests/tickets/Ticket1572.java
index 6de0fd56d3..11457b02f6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1572.java
@@ -14,6 +14,7 @@ public class Ticket1572 extends com.itmill.toolkit.Application {
     private GridLayout gl;
     private Label spacingstate;
 
+    @Override
     public void init() {
 
         final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java b/src/com/itmill/toolkit/tests/tickets/Ticket1581.java
index cd880ced9d..a8f65314e5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1581.java
@@ -15,6 +15,7 @@ public class Ticket1581 extends com.itmill.toolkit.Application {
     private ProgressIndicator poller;
     private Thread thread;
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
@@ -30,6 +31,7 @@ public class Ticket1581 extends com.itmill.toolkit.Application {
 
         thread = new Thread() {
 
+            @Override
             public void run() {
                 super.run();
                 while (true) {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java b/src/com/itmill/toolkit/tests/tickets/Ticket1589.java
index d97208fad1..9a4767dc2b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1589.java
@@ -20,6 +20,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1589 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java b/src/com/itmill/toolkit/tests/tickets/Ticket1598.java
index 3c21d25a4d..8b1b819206 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1598.java
@@ -16,6 +16,7 @@ public class Ticket1598 extends Application {
 
     final MenuBar menuBar = new MenuBar();
 
+    @Override
     public void init() {
         setMainWindow(main);
         setTheme("default");
@@ -66,13 +67,14 @@ public class Ticket1598 extends Application {
         MenuItem third = (MenuItem) menuBar.getItems().get(2);
         third.setIcon(new ThemeResource("icons/16/document.png"));
 
-        for (int i = 2; i <= 3; i++)
+        for (int i = 2; i <= 3; i++) {
             ((MenuItem) menuBar.getItems().get(i)).setCommand(new Command() {
 
                 public void menuSelected(MenuItem selectedItem) {
                     main.showNotification("Action " + selectedItem.getText());
                 }
             });
+        }
 
         final MenuItem fourth = (MenuItem) menuBar.getItems().get(3);
         fourth.setText("Toggle animation");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket161.java b/src/com/itmill/toolkit/tests/tickets/Ticket161.java
index a3a13bf93c..5369c2397c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket161.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket161.java
@@ -14,6 +14,7 @@ public class Ticket161 extends Application {
 
     private Table t;
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app to #1368");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java b/src/com/itmill/toolkit/tests/tickets/Ticket1632.java
index 62b7d21bd2..e126c1193e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1632.java
@@ -13,6 +13,7 @@ public class Ticket1632 extends Application {
 
     private Table t;
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java b/src/com/itmill/toolkit/tests/tickets/Ticket1659.java
index 659fbc3f4d..94b222a2bf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1659.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1659 extends Application {
 
+    @Override
     public void init() {
         final Window mainWin = new Window();
         setMainWindow(mainWin);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java b/src/com/itmill/toolkit/tests/tickets/Ticket1663.java
index edbd96f69e..a25741ee5f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1663.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1663 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         Window main = new Window("#1663");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java b/src/com/itmill/toolkit/tests/tickets/Ticket1673.java
index 320412d69a..2bfd551799 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1673.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1673 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         final Window main = new Window("#1673");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java b/src/com/itmill/toolkit/tests/tickets/Ticket1737.java
index e36ea3f5ce..ac1ab350f1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1737.java
@@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Window;
 public class Ticket1737 extends Application {
 
     Resource slowRes = new ClassResource(Calc.class, "m-bullet-blue.gif", this) {
+        @Override
         public DownloadStream getStream() {
             try {
                 Thread.sleep(4000);
@@ -24,6 +25,7 @@ public class Ticket1737 extends Application {
         }
     };
 
+    @Override
     public void init() {
 
         final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java b/src/com/itmill/toolkit/tests/tickets/Ticket1767.java
index 4b3134a64f..550d3a6d0f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1767.java
@@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1767 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java b/src/com/itmill/toolkit/tests/tickets/Ticket1772.java
index e0e3f1e8ce..4e9221d0c1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1772.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1772 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java b/src/com/itmill/toolkit/tests/tickets/Ticket1775.java
index ca3093855d..403efac2e4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1775.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1775 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         final Window main = new Window("#1775");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
index 38f9305d92..102f9c25fa 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
@@ -18,6 +18,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
+    @Override
     public void init() {
 
         final Window main = new Window("#1804");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java b/src/com/itmill/toolkit/tests/tickets/Ticket1805.java
index e9a84531d4..b72d3e7e6d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1805.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1805 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java b/src/com/itmill/toolkit/tests/tickets/Ticket1806.java
index a7694952c6..61ef29f396 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1806.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1806 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java b/src/com/itmill/toolkit/tests/tickets/Ticket1811.java
index 338b85524b..0075cac4ce 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1811.java
@@ -15,6 +15,7 @@ public class Ticket1811 extends com.itmill.toolkit.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
+    @Override
     public void init() {
 
         final Window main = new Window("#1811");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java b/src/com/itmill/toolkit/tests/tickets/Ticket1819.java
index 03701ba698..1f03390976 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1819.java
@@ -14,6 +14,7 @@ public class Ticket1819 extends com.itmill.toolkit.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
+    @Override
     public void init() {
 
         final Window main = new Window("#1819");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
index 312c8ca5cb..050f520aa5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
@@ -16,6 +16,7 @@ public class Ticket1834PanelScrolling extends com.itmill.toolkit.Application {
 
     private Panel p;
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java b/src/com/itmill/toolkit/tests/tickets/Ticket1857.java
index 9fe891e770..5a014de09b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1857.java
@@ -13,6 +13,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1857 extends Application implements Handler {
 
+    @Override
     public void init() {
 
         setTheme("tests-tickets");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java b/src/com/itmill/toolkit/tests/tickets/Ticket1868.java
index e0b0ae3bf0..897ac4aac3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1868.java
@@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1868 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
 
         setMainWindow(new Window("#1868"));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java b/src/com/itmill/toolkit/tests/tickets/Ticket1869.java
index 9794015e90..25f97201e6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1869.java
@@ -12,6 +12,7 @@ public class Ticket1869 extends com.itmill.toolkit.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
+    @Override
     public void init() {
 
         GridLayout lo = new GridLayout(2, 1);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
index a5f394d68b..e5b4578693 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
@@ -35,6 +35,7 @@ public class Ticket1878 extends Application {
     private Button switchToOrderedButton;
     private Button switchToFormsButton;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java b/src/com/itmill/toolkit/tests/tickets/Ticket1902.java
index 9779fc9700..89f3148817 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1902.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1902 extends Application {
 
+    @Override
     public void init() {
 
         // Main layout and main window
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java b/src/com/itmill/toolkit/tests/tickets/Ticket1904.java
index 2c6a86677c..41d10630ab 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1904.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1904 extends Application {
 
+    @Override
     public void init() {
         setMainWindow(new Window("#1904"));
         setTheme("tests-tickets");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java b/src/com/itmill/toolkit/tests/tickets/Ticket1916.java
index 9cc8eaa20d..1548949ff9 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1916.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1916 extends Application {
 
+    @Override
     public void init() {
 
         OrderedLayout test = new OrderedLayout(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java b/src/com/itmill/toolkit/tests/tickets/Ticket1919.java
index 9662615e4b..83581bee5e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1919.java
@@ -11,6 +11,7 @@ public class Ticket1919 extends com.itmill.toolkit.Application {
     private GridLayout lo;
     private boolean on = true;
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java b/src/com/itmill/toolkit/tests/tickets/Ticket1921.java
index 5adde6eb27..2e78422277 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1921.java
@@ -16,6 +16,7 @@ public class Ticket1921 extends Application implements ParameterHandler {
     Button button;
     OrderedLayout outer, inner;
 
+    @Override
     public void init() {
 
         outer = new OrderedLayout();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java b/src/com/itmill/toolkit/tests/tickets/Ticket1923.java
index 9182a795da..b75b08dbac 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1923.java
@@ -11,6 +11,7 @@ public class Ticket1923 extends com.itmill.toolkit.Application {
 
     private Panel p;
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java b/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java
index 9bb7b72b56..ac4d9562d3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java
@@ -14,6 +14,7 @@ public class Ticket1924ThemeChanging extends com.itmill.toolkit.Application {
     @SuppressWarnings("unused")
     private Panel p;
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
index 0f6ee95f38..92c92eeba1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
@@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1925 extends Application {
 
+    @Override
     public void init() {
         Window mainWindow = new Window("Test åäö");
         setMainWindow(mainWindow);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java b/src/com/itmill/toolkit/tests/tickets/Ticket1934.java
index 8d2b8cbd9d..c086f51867 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1934.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1934 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(
                 "#1934 : Horizontal ExpandLayout completely broken");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java b/src/com/itmill/toolkit/tests/tickets/Ticket1939.java
index 50aaf03c1d..97f6437d9f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1939.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1939 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java b/src/com/itmill/toolkit/tests/tickets/Ticket1940.java
index f485f3f387..347b17878b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1940.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1940 extends Application {
 
+    @Override
     public void init() {
         final Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
index 4357a9bac3..e37a393a15 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
@@ -13,6 +13,7 @@ public class Ticket1953 extends Application {
     public static final String spacerStyle = "test-spacer";
     public static final String pageButtonStyle = "test-page-change";
 
+    @Override
     public void init() {
 
         final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
index 496016f4ec..de95399bf8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
@@ -31,6 +31,7 @@ public class Ticket1966 extends Application {
         names.put(new Integer(TOP), "Top");
     }
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
index 5e8f3b1e91..a4e7e24dd1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
@@ -32,6 +32,7 @@ public class Ticket1966_2 extends Application {
         names.put(new Integer(TOP), "Top");
     }
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
index d9f2df08b1..59fc33d3ad 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
@@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1966_3 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java b/src/com/itmill/toolkit/tests/tickets/Ticket1969.java
index cc11d040d5..606d571d37 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1969.java
@@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket1969 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java b/src/com/itmill/toolkit/tests/tickets/Ticket1970.java
index ea40703ddd..6550f0aa76 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1970.java
@@ -11,10 +11,12 @@ import com.itmill.toolkit.ui.Window.CloseEvent;
 
 public class Ticket1970 extends Application {
 
+    @Override
     public void init() {
         setMainWindow(createWindow());
     }
 
+    @Override
     public Window getWindow(String name) {
 
         // If we already have the requested window, use it
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java b/src/com/itmill/toolkit/tests/tickets/Ticket1972.java
index 6377b12e1f..5b885f18cd 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1972.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1972 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java b/src/com/itmill/toolkit/tests/tickets/Ticket1973.java
index 2c5b2710cd..27a42ffbf8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1973.java
@@ -13,6 +13,7 @@ public class Ticket1973 extends com.itmill.toolkit.Application {
     Window main = new Window();
     Table table = new Table();
 
+    @Override
     public void init() {
         setMainWindow(main);
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java
index 2769b5e70f..2879213a8e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java
@@ -13,6 +13,7 @@ public class Ticket1973_2 extends Application {
     Window main = new Window();
     Table table = new Table();
 
+    @Override
     public void init() {
         setMainWindow(main);
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java b/src/com/itmill/toolkit/tests/tickets/Ticket1975.java
index c5d0ec90f1..faaf11d9e8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1975.java
@@ -18,6 +18,7 @@ public class Ticket1975 extends Application {
     private CustomLayout cl1;
     private CustomLayout cl2;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java b/src/com/itmill/toolkit/tests/tickets/Ticket1982.java
index 892b8ee538..8f1ef81885 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1982.java
@@ -16,6 +16,7 @@ public class Ticket1982 extends Application {
 
     private List components = new ArrayList();
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java b/src/com/itmill/toolkit/tests/tickets/Ticket1983.java
index f8fafedbfd..977361b6e0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1983.java
@@ -16,6 +16,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
  */
 public class Ticket1983 extends Application {
 
+    @Override
     public void init() {
         Window main = new Window("Test for ticket 1983");
         main.setLayout(new TestLayout());
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java b/src/com/itmill/toolkit/tests/tickets/Ticket1986.java
index ae413c01d4..1a920da655 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1986.java
@@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1986 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java b/src/com/itmill/toolkit/tests/tickets/Ticket1991.java
index 6ec03cac89..a2f10a753a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1991.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket1991 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java b/src/com/itmill/toolkit/tests/tickets/Ticket1995.java
index c079836282..38f041f8fd 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1995.java
@@ -14,6 +14,7 @@ public class Ticket1995 extends Application {
     private static final Object PROPERTY_1 = "Test";
     private Table table;
 
+    @Override
     public void init() {
         final Window mainWin = new Window(getClass().getName());
         setMainWindow(mainWin);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket20.java b/src/com/itmill/toolkit/tests/tickets/Ticket20.java
index d074509f2a..193bb0961f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket20.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket20.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket20 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app for #20");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java b/src/com/itmill/toolkit/tests/tickets/Ticket2001.java
index a03268cf57..3ce16c2030 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2001.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2001 extends Application {
 
+    @Override
     public void init() {
         final Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java b/src/com/itmill/toolkit/tests/tickets/Ticket2002.java
index eec74108a0..596f931570 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2002.java
@@ -26,6 +26,7 @@ public class Ticket2002 extends Application {
         this.long2 = long2;
     }
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java b/src/com/itmill/toolkit/tests/tickets/Ticket2009.java
index f9eebb02b7..a5f7782d30 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2009.java
@@ -17,6 +17,7 @@ public class Ticket2009 extends com.itmill.toolkit.Application {
 
     TextField f = new TextField();
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java b/src/com/itmill/toolkit/tests/tickets/Ticket2011.java
index eeabff0da2..4fc75fc1e6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2011.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2011 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java b/src/com/itmill/toolkit/tests/tickets/Ticket2014.java
index 4dfd5e7103..f6c66421d4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2014.java
@@ -17,6 +17,7 @@ public class Ticket2014 extends Application {
     private Button b1;
     private Panel panel;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
index aacdfad8aa..e8a2bb3f04 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
@@ -26,6 +26,7 @@ public class Ticket2021 extends Application {
 
     private OrderedLayout orderedLayout;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         w.setLayout(new GridLayout(2, 2));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java b/src/com/itmill/toolkit/tests/tickets/Ticket2022.java
index 1e133f8b4b..3bffd0a281 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2022.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2022 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java b/src/com/itmill/toolkit/tests/tickets/Ticket2023.java
index 5f2a7c4a37..ebcfd50448 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2023.java
@@ -11,6 +11,7 @@ public class Ticket2023 extends com.itmill.toolkit.Application implements
 
     AbstractComponent c = new Button();
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java b/src/com/itmill/toolkit/tests/tickets/Ticket2024.java
index 97aeafc87e..cbc19fdbc9 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2024.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2024 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java b/src/com/itmill/toolkit/tests/tickets/Ticket2026.java
index e4fd0f1b74..bc79cddce4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2026.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2026 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
index bd4f4bb407..98c80cdd53 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
@@ -19,6 +19,7 @@ public class Ticket2029 extends Application {
     int DIM1, DIM2;
     Random r = new Random();
 
+    @Override
     public void init() {
         COMPONENTS = 5;
         DIM1 = 504;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java b/src/com/itmill/toolkit/tests/tickets/Ticket2032.java
index be0098a884..e0bb9e9407 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2032.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2032 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java b/src/com/itmill/toolkit/tests/tickets/Ticket2033.java
index b1d2aae2a7..25dc8a6a33 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2033.java
@@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2033 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java b/src/com/itmill/toolkit/tests/tickets/Ticket2037.java
index 0392bd99c4..fa8c440a1d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2037.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket2037 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java b/src/com/itmill/toolkit/tests/tickets/Ticket2038.java
index b598405acf..34ad22f272 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2038.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window.Notification;
 
 public class Ticket2038 extends Application {
 
+    @Override
     public void init() {
         final Window w = new Window("Testing for #2038");
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java b/src/com/itmill/toolkit/tests/tickets/Ticket2040.java
index 0b38ceb734..1a5e96da2b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2040.java
@@ -9,6 +9,7 @@ public class Ticket2040 extends com.itmill.toolkit.Application {
 
     TextField f = new TextField();
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java b/src/com/itmill/toolkit/tests/tickets/Ticket2042.java
index 033e313265..dc81de7614 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2042.java
@@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window.Notification;
 
 public class Ticket2042 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java b/src/com/itmill/toolkit/tests/tickets/Ticket2043.java
index ba2f00fc98..e81fd9aea3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2043.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2043 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java b/src/com/itmill/toolkit/tests/tickets/Ticket2048.java
index 85c63b2446..4ca741edd2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2048.java
@@ -22,6 +22,7 @@ public class Ticket2048 extends Application {
     private GridLayout gridLayout;
     private OrderedLayout orderedLayout;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java b/src/com/itmill/toolkit/tests/tickets/Ticket2051.java
index 8a3014afa0..804b666b70 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2051.java
@@ -16,6 +16,7 @@ public class Ticket2051 extends Application {
     private static final Object P1 = new Object();
     private static final Object P2 = new Object();
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java b/src/com/itmill/toolkit/tests/tickets/Ticket2060.java
index 604edaf5b4..4fc1089225 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2060.java
@@ -14,6 +14,7 @@ public class Ticket2060 extends Application {
     private Button button2;
     private Button button3;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java b/src/com/itmill/toolkit/tests/tickets/Ticket2062.java
index 6545a5d1df..1bb2b285b5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2062.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 public class Ticket2062 extends Application {
     private static final Object P1 = new Object();
 
+    @Override
     public void init() {
         setMainWindow(new Window("Ticket2062"));
         getMainWindow().setSizeFull();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java b/src/com/itmill/toolkit/tests/tickets/Ticket2083.java
index 0a415bb498..735fe41677 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2083.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2083 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
index d0d471b190..02cb34b0c2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2095 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java b/src/com/itmill/toolkit/tests/tickets/Ticket2098.java
index ec19fecd04..1b3b8c82b7 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2098.java
@@ -9,6 +9,7 @@ public class Ticket2098 extends Application {
 
     private static final String info = "First tab hidden, second should initially be selected";
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java b/src/com/itmill/toolkit/tests/tickets/Ticket2099.java
index bf621de657..bf1f654eca 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2099.java
@@ -16,6 +16,7 @@ public class Ticket2099 extends Application {
     private OrderedLayout ol1, ol2, ol3;
     private Window popup;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java b/src/com/itmill/toolkit/tests/tickets/Ticket2101.java
index 431572f5a8..c6046b5ca0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2101.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2101 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java b/src/com/itmill/toolkit/tests/tickets/Ticket2103.java
index 3ea1757ad6..13d45c7aa2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2103.java
@@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Window;
 public class Ticket2103 extends Application {
     private Window mainWindow;
 
+    @Override
     public void init() {
         mainWindow = new Window(getClass().getSimpleName());
         mainWindow.setLayout(new ExpandLayout());
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java b/src/com/itmill/toolkit/tests/tickets/Ticket2104.java
index 7ed504c891..b4fe9ce7e9 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2104.java
@@ -22,6 +22,7 @@ public class Ticket2104 extends Application {
     Tree tree = new Tree();
     Table table = new Table();
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java b/src/com/itmill/toolkit/tests/tickets/Ticket2106.java
index 743aaf0969..667454c4c2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2106.java
@@ -22,6 +22,7 @@ public class Ticket2106 extends Application {
         return msgs;
     }
 
+    @Override
     public void init() {
         setMainWindow(new Window("#2106"));
         getMainWindow().addComponent(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java b/src/com/itmill/toolkit/tests/tickets/Ticket2107.java
index adba8aed27..765c3c274e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2107.java
@@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window.Notification;
 
 public class Ticket2107 extends Application {
 
+    @Override
     public void init() {
         final Window w = new Window("Testing for #2107");
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java b/src/com/itmill/toolkit/tests/tickets/Ticket2117.java
index 2bde267080..dd069b6ed4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2117.java
@@ -7,10 +7,12 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2117 extends Application {
 
+    @Override
     public void init() {
         setMainWindow(createWindow());
     }
 
+    @Override
     public Window getWindow(String name) {
 
         // If we already have the requested window, use it
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java b/src/com/itmill/toolkit/tests/tickets/Ticket2119.java
index 144b631ea4..6e24541b77 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2119.java
@@ -18,6 +18,7 @@ public class Ticket2119 extends Application {
 
     private ObjectProperty globalValue;
 
+    @Override
     public void init() {
         globalValue = new ObjectProperty(null, String.class);
         Window main = createWindow();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java b/src/com/itmill/toolkit/tests/tickets/Ticket2125.java
index 46ad984084..e98b34de32 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2125.java
@@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Table.ColumnGenerator;
 
 public class Ticket2125 extends Application {
 
+    @Override
     public void init() {
         setMainWindow(new MainWindow("Ticket2125"));
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java b/src/com/itmill/toolkit/tests/tickets/Ticket2126.java
index 11dfeddd15..47988502f0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2126.java
@@ -19,6 +19,7 @@ public class Ticket2126 extends com.itmill.toolkit.Application {
     Window main = new Window();
     Table table = new Table();
 
+    @Override
     public void init() {
         setMainWindow(main);
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java b/src/com/itmill/toolkit/tests/tickets/Ticket2151.java
index 52fbe2a9de..908ef2a35a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2151.java
@@ -12,6 +12,7 @@ public class Ticket2151 extends Application {
 
     private Label status;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java b/src/com/itmill/toolkit/tests/tickets/Ticket2157.java
index 2fd4aef8a2..313a38532c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2157.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2157 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java b/src/com/itmill/toolkit/tests/tickets/Ticket2178.java
index 29bbdad04c..d64bbea790 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2178.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2178 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java b/src/com/itmill/toolkit/tests/tickets/Ticket2181.java
index cef4aa2f8d..ec58671105 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2181.java
@@ -38,6 +38,7 @@ public class Ticket2181 extends Application implements Button.ClickListener {
         icons.add("icons/64/arrow-up.png");
     }
 
+    @Override
     public void init() {
         setMainWindow(main);
         OrderedLayout ol;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java b/src/com/itmill/toolkit/tests/tickets/Ticket2186.java
index 463a356363..82d0574533 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2186.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2186 extends Application {
 
+    @Override
     public void init() {
         Window main = new Window("Quick test");
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
index 32f0546a56..02d53c4704 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
@@ -38,6 +38,7 @@ public class Ticket2204 extends Application {
     private final List<Class<? extends Component>> classes = new ArrayList<Class<? extends Component>>();
     protected RichTextArea formTextArea;
 
+    @Override
     public void init() {
         classes.add(OrderedLayout.class);
         classes.add(GridLayout.class);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java b/src/com/itmill/toolkit/tests/tickets/Ticket2221.java
index c830b541fd..3f1d60d30d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2221.java
@@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Button.ClickListener;
 
 public class Ticket2221 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java b/src/com/itmill/toolkit/tests/tickets/Ticket2222.java
index 628f793351..4cb71e5503 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2222.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2222 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java b/src/com/itmill/toolkit/tests/tickets/Ticket2231.java
index 5d993b739d..5958d6f79b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2231.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2231 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java b/src/com/itmill/toolkit/tests/tickets/Ticket2234.java
index 97f51c6af7..32febb1e40 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2234.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2234 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java b/src/com/itmill/toolkit/tests/tickets/Ticket2235.java
index bd557d98e0..2a0b508fae 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2235.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2235 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java b/src/com/itmill/toolkit/tests/tickets/Ticket2240.java
index a016b2ca1b..c5e7dd9f9b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2240.java
@@ -23,6 +23,7 @@ public class Ticket2240 extends Application {
             + " (and state) between several browser windows (the latter is most useful"
             + " for read-only views).</p><br/><p>This is the end.</p>";
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java b/src/com/itmill/toolkit/tests/tickets/Ticket2242.java
index cd5f75dd98..398b95a367 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2242.java
@@ -20,6 +20,7 @@ public class Ticket2242 extends Application implements ValueChangeListener {
     private String valueDataSource = "-";
     private ObjectProperty prop;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java b/src/com/itmill/toolkit/tests/tickets/Ticket2244.java
index 4b03e9f87c..aa3c38182b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2244.java
@@ -14,6 +14,7 @@ public class Ticket2244 extends Application {
 
     Form form;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java b/src/com/itmill/toolkit/tests/tickets/Ticket2267.java
index 54eb73a560..85502a01af 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2267.java
@@ -12,6 +12,7 @@ public class Ticket2267 extends Application {
 
     Label l = new Label("0");
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java b/src/com/itmill/toolkit/tests/tickets/Ticket2271.java
index d338d9f52a..93fec7c053 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2271.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2271 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java b/src/com/itmill/toolkit/tests/tickets/Ticket2279.java
index b6c71a6f72..530ee035d0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2279.java
@@ -57,6 +57,7 @@ public class Ticket2279 extends Application {
 
     }
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java b/src/com/itmill/toolkit/tests/tickets/Ticket2282.java
index 0b0426aa9b..45025bb947 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2282.java
@@ -12,6 +12,7 @@ public class Ticket2282 extends Application {
     private FormLayout layout1;
     private FormLayout layout2;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
index 7eddbc983e..56c542ceaf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2287 extends Ticket2292 {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java b/src/com/itmill/toolkit/tests/tickets/Ticket2289.java
index 10e1fba679..abce7f512f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2289.java
@@ -17,6 +17,7 @@ public class Ticket2289 extends Application {
     TabSheet ts = null;
     Accordion acc = null;
 
+    @Override
     public void init() {
 
         Window w = new Window();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
index c77ee155b5..8ee96c8827 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Layout.AlignmentHandler;
 
 public class Ticket2294 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java b/src/com/itmill/toolkit/tests/tickets/Ticket2296.java
index cddc2116a2..99d61acc79 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2296.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2296 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
index 48584a9a30..c8e91d6e2a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2297 extends Ticket2292 {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java b/src/com/itmill/toolkit/tests/tickets/Ticket2304.java
index 8ae9ea6b1f..2a5e4a31e1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2304.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2304 extends Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java b/src/com/itmill/toolkit/tests/tickets/Ticket2310.java
index a640b94af4..d00a63ea3a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2310.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket2310 extends Application {
 
+    @Override
     public void init() {
         final Window main = new Window(getClass().getName().substring(
                 getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java b/src/com/itmill/toolkit/tests/tickets/Ticket2323.java
index 2347f418d4..e1dd789b9e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2323.java
@@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2323 extends Application {
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java b/src/com/itmill/toolkit/tests/tickets/Ticket2325.java
index 5fa5eb50b8..e4b57e2cbb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2325.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2325 extends Application {
 
+    @Override
     public void init() {
         Window main = new Window("Testing....");
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java b/src/com/itmill/toolkit/tests/tickets/Ticket2329.java
index b03ebc2715..5ca919cc6f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2329.java
@@ -12,6 +12,7 @@ public class Ticket2329 extends Application {
     private Table table;
     private VerticalLayout mainLo;
 
+    @Override
     public void init() {
         Window mainw = new Window();
         setMainWindow(mainw);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java b/src/com/itmill/toolkit/tests/tickets/Ticket2337.java
index 6747968482..648c88a391 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2337.java
@@ -11,6 +11,7 @@ public class Ticket2337 extends Application {
 
     GridLayout gl = new GridLayout(3, 1);
 
+    @Override
     public void init() {
         Window w = new Window();
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java b/src/com/itmill/toolkit/tests/tickets/Ticket2339.java
index e6aace8c2c..f9b3ee4d5a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2339.java
@@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2339 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window(getClass().getSimpleName());
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java b/src/com/itmill/toolkit/tests/tickets/Ticket2341.java
index be795549d9..0bc40e51cf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2341.java
@@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Table;
 import com.itmill.toolkit.ui.Window;
 
 public class Ticket2341 extends com.itmill.toolkit.Application {
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java b/src/com/itmill/toolkit/tests/tickets/Ticket2344.java
index 892ece1a78..ec4bb14a86 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2344.java
@@ -13,6 +13,7 @@ public class Ticket2344 extends Application {
 
     private Panel p;
 
+    @Override
     public void init() {
         Window main = new Window("Quick test");
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java b/src/com/itmill/toolkit/tests/tickets/Ticket2347.java
index 1b5a6c34bd..6a0ccbea7d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2347.java
@@ -12,6 +12,7 @@ public class Ticket2347 extends Application {
 
     private Button b1;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java b/src/com/itmill/toolkit/tests/tickets/Ticket2364.java
index 5be2e34d73..814f424fa4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2364.java
@@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket2364 extends Application {
 
+    @Override
     public void init() {
 
         Window main = new Window("The Main Window!!!");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java b/src/com/itmill/toolkit/tests/tickets/Ticket2365.java
index c37d5a8495..e02a6636f5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2365.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class Ticket2365 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window(getClass().getSimpleName());
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java b/src/com/itmill/toolkit/tests/tickets/Ticket2406.java
index 4f33b59a1b..e2239a92e8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2406.java
@@ -11,6 +11,7 @@ public class Ticket2406 extends Application {
 
     private Window w;
 
+    @Override
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
@@ -39,7 +40,7 @@ public class Ticket2406 extends Application {
         l.addComponent(b);
 
         for (int i = 0; i < 5; i++) {
-            b = new Button("Button number "+(i+2));
+            b = new Button("Button number " + (i + 2));
             b.setSizeFull();
             l.addComponent(b);
         }
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
index b0f194ceb7..ee8c090f47 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
@@ -1,13 +1,13 @@
 package com.itmill.toolkit.tests.tickets;
 
 import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.TextField;
 import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Window;
 
 public class Ticket2407 extends com.itmill.toolkit.Application {
 
+    @Override
     public void init() {
         final Window main = new Window("Ticket2407");
         setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java b/src/com/itmill/toolkit/tests/tickets/Ticket2411.java
index edf4ee0798..b7690c375f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2411.java
@@ -11,15 +11,16 @@ public class Ticket2411 extends Application {
     public void init() {
         Window w = new Window(getClass().getSimpleName());
         setMainWindow(w);
-        
-//        VerticalLayout l = new VerticalLayout();
+
+        // VerticalLayout l = new VerticalLayout();
         GridLayout l = new GridLayout();
         w.setLayout(l);
-        
+
         l.setHeight("504px");
-        
-        for (int i=1; i <= 5; i++) {
-            Button b = new Button("Button "+i+" should be 100px or 101px high");
+
+        for (int i = 1; i <= 5; i++) {
+            Button b = new Button("Button " + i
+                    + " should be 100px or 101px high");
             b.setHeight("100%");
             l.addComponent(b);
         }
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket677.java b/src/com/itmill/toolkit/tests/tickets/Ticket677.java
index 7f542f395f..bba928173a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket677.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket677.java
@@ -38,6 +38,7 @@ public class Ticket677 extends Application {
     Form form;
     Table table;
 
+    @Override
     public void init() {
         Window main = new Window();
         setMainWindow(main);
@@ -110,6 +111,7 @@ public class Ticket677 extends Application {
         form.setCaption("Enabled");
         form.setFieldFactory(new BaseFieldFactory() {
 
+            @Override
             public Field createField(Item item, Object propertyId,
                     Component uiContext) {
                 Field f = super.createField(item, propertyId, uiContext);
@@ -132,6 +134,7 @@ public class Ticket677 extends Application {
 
         table.setFieldFactory(new BaseFieldFactory() {
 
+            @Override
             public Field createField(Container container, Object itemId,
                     Object propertyId, Component uiContext) {
                 Field f = super.createField(container, itemId, propertyId,
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket736.java b/src/com/itmill/toolkit/tests/tickets/Ticket736.java
index ecdd86f61c..8c4993f7ae 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket736.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket736.java
@@ -18,6 +18,7 @@ public class Ticket736 extends Application {
 
     Address address = new Address();
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app for #736");
@@ -139,6 +140,7 @@ public class Ticket736 extends Application {
             this.country = country;
         }
 
+        @Override
         public String toString() {
             return name + "; " + street + "; " + city + " " + zip
                     + (state != null ? " " + state : "") + " " + country;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
index ea10dcc020..d7c72b8d86 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket846.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
@@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket846 extends Application {
 
+    @Override
     public void init() {
 
         final Window mainWin = new Window("Test app for #846");