Global code cleanup

24 files changed, 80 insertions, 80 deletions

diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 1883910b7b..05edc506a9 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -33,14 +33,14 @@ import com.vaadin.LegacyApplication;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.LegacyVaadinServlet;
 import com.vaadin.server.ServiceException;
+import com.vaadin.server.SessionInitEvent;
+import com.vaadin.server.SessionInitListener;
 import com.vaadin.server.UIClassSelectionEvent;
 import com.vaadin.server.UIProvider;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServletRequest;
 import com.vaadin.server.VaadinServletService;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.SessionInitListener;
-import com.vaadin.server.SessionInitEvent;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.UI;
 
@@ -76,16 +76,13 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     @Override
     protected void servletInitialized() {
         super.servletInitialized();
-        getService().addSessionInitListener(
-                new SessionInitListener() {
-                    @Override
-                    public void sessionInit(
-                            SessionInitEvent event)
-                            throws ServiceException {
-                        onVaadinSessionStarted(event.getRequest(),
-                                event.getSession());
-                    }
-                });
+        getService().addSessionInitListener(new SessionInitListener() {
+            @Override
+            public void sessionInit(SessionInitEvent event)
+                    throws ServiceException {
+                onVaadinSessionStarted(event.getRequest(), event.getSession());
+            }
+        });
     }
 
     private void addDirectories(File parent, LinkedHashSet<String> packages,
diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java
index 300573424e..45a3ae311a 100644
--- a/uitest/src/com/vaadin/tests/Parameters.java
+++ b/uitest/src/com/vaadin/tests/Parameters.java
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.Link;
@@ -106,9 +106,8 @@ public class Parameters extends com.vaadin.LegacyApplication implements
     }
 
     @Override
-    public boolean handleRequest(VaadinSession session,
-            VaadinRequest request, VaadinResponse response)
-            throws IOException {
+    public boolean handleRequest(VaadinSession session, VaadinRequest request,
+            VaadinResponse response) throws IOException {
         context.setValue("Context not available");
         relative.setValue(request.getRequestPathInfo());
 
diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
index deeb22cb5b..b81b14365c 100644
--- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
@@ -41,8 +41,8 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends com.vaadin.LegacyApplication implements
-        Listener {
+public class TreeFilesystemContainer extends com.vaadin.LegacyApplication
+        implements Listener {
 
     // Filesystem explorer panel and it's components
     private final Panel explorerPanel = new Panel("Filesystem explorer");
diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
index 1307e6eab8..c2fc4936d4 100644
--- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
@@ -27,8 +27,8 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class UsingObjectsInSelect extends com.vaadin.LegacyApplication implements
-        ValueChangeListener {
+public class UsingObjectsInSelect extends com.vaadin.LegacyApplication
+        implements ValueChangeListener {
 
     private final Select select = new Select();
     private final Label selectedTask = new Label("Selected task",
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
index 7d755a942b..f2d2c2f595 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.application;
 
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.PaintException;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.integration.FlagSeResource;
 import com.vaadin.tests.util.Log;
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index 4c4dff572a..480fd2df57 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.server.WebBrowser;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
index e420278148..8a15d83121 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
@@ -48,6 +48,7 @@ public class DateFieldExtendedRange extends TestBase {
         addComponent(layout);
 
         addComponent(new Button("Change date", new ClickListener() {
+            @Override
             public void buttonClick(ClickEvent event) {
                 date.set(2010, 1, 16);
                 for (DateField f : fields) {
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
index 8914daf390..d4ec16da4e 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
@@ -17,6 +17,7 @@ public class LabelPropertySourceValue extends AbstractTestUI {
         addComponent(label);

         Button button = new Button("Give label a new property data source...");

         button.addClickListener(new ClickListener() {

+            @Override

             public void buttonClick(ClickEvent event) {

                 ObjectProperty<String> p = new ObjectProperty<String>(

                         "This text should appear on the label after clicking the button.");

diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 1ffa1cad88..ba5701e699 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -121,40 +121,40 @@ public class BoxLayoutTest extends AbstractTestUI {
 
         Button addComponent = new Button("Add Component",
                 new Button.ClickListener() {
-            @Override
-            public void buttonClick(ClickEvent event) {
-                GridLayout grid = new GridLayout(2, 2);
-                Button grow = new Button("Grow Me",
-                        new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        if (event.getButton().getWidth() == -1) {
-                            event.getButton().setHeight("50px");
-                            event.getButton().setWidth("200px");
-                        } else {
-                            event.getButton()
-                            .setSizeUndefined();
-                        }
+                        GridLayout grid = new GridLayout(2, 2);
+                        Button grow = new Button("Grow Me",
+                                new Button.ClickListener() {
+                                    @Override
+                                    public void buttonClick(ClickEvent event) {
+                                        if (event.getButton().getWidth() == -1) {
+                                            event.getButton().setHeight("50px");
+                                            event.getButton().setWidth("200px");
+                                        } else {
+                                            event.getButton()
+                                                    .setSizeUndefined();
+                                        }
+                                    }
+                                });
+                        grid.addComponent(new Label("Grid cell 1"));
+                        grid.addComponent(new Label("Grid cell 2"));
+                        grid.addComponent(grow);
+                        grid.addComponent(new Label("Grid cell 4"));
+                        l.addComponent(grid);
+                        // l.addComponent(new TextField("Some field"));
                     }
                 });
-                grid.addComponent(new Label("Grid cell 1"));
-                grid.addComponent(new Label("Grid cell 2"));
-                grid.addComponent(grow);
-                grid.addComponent(new Label("Grid cell 4"));
-                l.addComponent(grid);
-                // l.addComponent(new TextField("Some field"));
-            }
-        });
         header.addComponent(addComponent);
 
         Button removeComponent = new Button("Remove Component",
                 new Button.ClickListener() {
-            @Override
-            public void buttonClick(ClickEvent event) {
-                Component last = l.getComponent(l.getComponentCount() - 1);
-                l.removeComponent(last);
-            }
-        });
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        Component last = l.getComponent(l.getComponentCount() - 1);
+                        l.removeComponent(last);
+                    }
+                });
         header.addComponent(removeComponent);
 
         // Second row
@@ -430,15 +430,15 @@ public class BoxLayoutTest extends AbstractTestUI {
                 if (target != null) {
                     if (target.getWidth() > -1) {
                         componentWidth.select(new Float(target.getWidth())
-                        .intValue()
-                        + target.getWidthUnits().getSymbol());
+                                .intValue()
+                                + target.getWidthUnits().getSymbol());
                     } else {
                         componentWidth.select(null);
                     }
                     if (target.getHeight() > -1) {
                         componentHeight.select(new Float(target.getHeight())
-                        .intValue()
-                        + target.getHeightUnits().getSymbol());
+                                .intValue()
+                                + target.getHeightUnits().getSymbol());
                     } else {
                         componentHeight.select(null);
                     }
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 82fc8933a0..fcc9792a7d 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -256,7 +256,7 @@ public class VaadinTunesLayout extends AbstractTestUI {
                 "Bullet For My Valentine", "Chasing Victory", "Chimaira",
                 "Danko Jones", "Deadlock", "Deftones", "From Autumn To Ashes",
                 "Haste The Day", "Four Year Strong", "In Flames", "Kemopetrol",
-        "John Legend" };
+                "John Legend" };
         String[] albums = new String[] { "Once Again", "The Caitiff Choir",
                 "The Devil And God", "Light Grenades", "Dicthonomy",
                 "Back In Black", "Dreamer", "Come Clarity", "Year Zero",
@@ -265,7 +265,7 @@ public class VaadinTunesLayout extends AbstractTestUI {
         String[] genres = new String[] { "Rock", "Metal", "Hardcore", "Indie",
                 "Pop", "Alternative", "Blues", "Jazz", "Hip Hop",
                 "Electronica", "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel",
-        "Country" };
+                "Country" };
         for (int i = 0; i < 1000; i++) {
             NativeSelect s = new NativeSelect();
             s.addItem("1 star");
diff --git a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java
index bc729ef042..30db12371d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java
@@ -26,11 +26,13 @@ public class TableReduceContainerSize extends TestBase {
     }
 
     private static class DecimateFilter implements Filter {
+        @Override
         public boolean passesFilter(Object itemId, Item item)
                 throws UnsupportedOperationException {
             return ((((TestObject) itemId).property3 % 10) == 0);
         }
 
+        @Override
         public boolean appliesToProperty(Object propertyId) {
             return true;
         }
@@ -63,6 +65,7 @@ public class TableReduceContainerSize extends TestBase {
             addComponent(label);
             Button button = new Button("Click");
             button.addListener(new Button.ClickListener() {
+                @Override
                 public void buttonClick(ClickEvent event) {
                     try {
                         reduceData = !reduceData;
@@ -78,6 +81,7 @@ public class TableReduceContainerSize extends TestBase {
             addComponent(button);
             Button button2 = new Button("Filter");
             button2.addListener(new Button.ClickListener() {
+                @Override
                 public void buttonClick(ClickEvent event) {
                     try {
                         if (filter != null) {
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java
index 754b359dbf..2d77354174 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java
+++ b/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java
@@ -72,6 +72,7 @@ public class TablesCssTest extends GridLayout {
 
         // Actions (a.k.a context menu)
         t.addActionHandler(new Action.Handler() {
+            @Override
             public Action[] getActions(Object target, Object sender) {
                 if (markedRows.contains(target)) {
                     return ACTIONS_MARKED;
diff --git a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index 33eb310822..686daca27e 100644
--- a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.window;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinService;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index 5b3b91da63..287d772901 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
@@ -4,8 +4,8 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.TableQuery;
diff --git a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index af51560593..897649fcc2 100644
--- a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -11,7 +11,8 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * See ticket #5521.
  */
-public class PortletSizeInLiferayFreeformLayoutApplication extends LegacyApplication {
+public class PortletSizeInLiferayFreeformLayoutApplication extends
+        LegacyApplication {
     @Override
     public void init() {
         LegacyWindow mainWindow = new LegacyWindow("Portlet5521 Application");
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index eb9b0f1dcf..0d5f187136 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -114,8 +114,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         source.addComponent(new Label("OTHER LABEL 2"));
 
         final AbstractComponent c1 = new Button("BUTTON");
-        final AbstractComponent c2 = new Label("<b>LABEL</b>",
-                ContentMode.HTML);
+        final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML);
         final AbstractComponent c3 = new Table("TABLE");
         c3.setHeight("100px");
         c3.setWidth("100%");
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 73af3e4a5e..bd3f2b2543 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -115,8 +115,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         source.addComponent(new Label("OTHER LABEL 2"));
 
         final AbstractComponent c1 = new Button("BUTTON");
-        final AbstractComponent c2 = new Label("<b>LABEL</b>",
-                ContentMode.HTML);
+        final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML);
         final AbstractComponent c3 = new Table("TABLE");
         c3.setHeight("100px");
         c3.setWidth("100%");
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index 8ab2796da4..3d73c3fe98 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
@@ -9,9 +9,9 @@ import javax.imageio.ImageIO;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Embedded;
 
@@ -56,9 +56,8 @@ class DynamicImageRequestHandler implements RequestHandler {
     public static final String IMAGE_URL = "myimage.png";
 
     @Override
-    public boolean handleRequest(VaadinSession session,
-            VaadinRequest request, VaadinResponse response)
-            throws IOException {
+    public boolean handleRequest(VaadinSession session, VaadinRequest request,
+            VaadinResponse response) throws IOException {
         String pathInfo = request.getRequestPathInfo();
         if (("/" + IMAGE_URL).equals(pathInfo)) {
             // Create an image, draw the "text" parameter to it and output it to
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index cc1bc8c77b..2df38d7b33 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index 2facf44268..62ceceeefb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -14,9 +14,9 @@ import com.vaadin.LegacyApplication;
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI.LegacyWindow;
 
@@ -52,9 +52,8 @@ class MyDynamicResource implements RequestHandler {
      * stream that contains the response from the server.
      */
     @Override
-    public boolean handleRequest(VaadinSession session,
-            VaadinRequest request, VaadinResponse response)
-            throws IOException {
+    public boolean handleRequest(VaadinSession session, VaadinRequest request,
+            VaadinResponse response) throws IOException {
         String relativeUri = request.getRequestPathInfo();
         // Catch the given URI that identifies the resource, otherwise let other
         // URI handlers or the Application to handle the response.
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
index f18406ede3..976bebd7cb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -5,9 +5,9 @@ import java.util.Map;
 
 import com.vaadin.LegacyApplication;
 import com.vaadin.server.RequestHandler;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -94,9 +94,8 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler {
     }
 
     @Override
-    public boolean handleRequest(VaadinSession session,
-            VaadinRequest request, VaadinResponse response)
-            throws IOException {
+    public boolean handleRequest(VaadinSession session, VaadinRequest request,
+            VaadinResponse response) throws IOException {
         Map<String, String[]> parameters = request.getParameterMap();
         String[] s = parameters.get("state");
         if (s == null || s.length != 1) {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
index 6b8b40abc1..ae758884b1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
@@ -16,7 +16,8 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket2181 extends LegacyApplication implements Button.ClickListener {
+public class Ticket2181 extends LegacyApplication implements
+        Button.ClickListener {
 
     // private static final Object PROPERTY_VALUE = new Object();
     // private static final Object PROPERTY_CAPTION = new Object();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
index 408d7ae789..0b9185c379 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
@@ -13,7 +13,8 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.UI.LegacyWindow;
 
-public class Ticket2242 extends LegacyApplication implements ValueChangeListener {
+public class Ticket2242 extends LegacyApplication implements
+        ValueChangeListener {
 
     private Object tableValue = null;
     private Table t;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index e67e83b501..20047df2ee 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -12,9 +12,9 @@ import javax.imageio.ImageIO;
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.RequestHandler;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
@@ -48,9 +48,8 @@ public class Ticket2292 extends com.vaadin.LegacyApplication implements
     }
 
     @Override
-    public boolean handleRequest(VaadinSession session,
-            VaadinRequest request, VaadinResponse response)
-            throws IOException {
+    public boolean handleRequest(VaadinSession session, VaadinRequest request,
+            VaadinResponse response) throws IOException {
         String relativeUri = request.getRequestPathInfo();
 
         if (!relativeUri.contains("icon.png")) {