Format using Eclipse Neon

Change-Id: I33f1cc33969ff74a95b1b8cc0f2add589be5aae0

690 files changed, 3963 insertions, 3739 deletions

diff --git a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
index e03e970048..ce0c8f1286 100755
--- a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
@@ -101,8 +101,7 @@ public class SQLTestsConstants {
             versionStatements = new String[] {
                     "create table VERSIONED (\"ID\" serial primary key, \"TEXT\" VARCHAR(255), \"VERSION\" INTEGER DEFAULT 0)",
                     "CREATE OR REPLACE FUNCTION zz_row_version() RETURNS TRIGGER AS $$"
-                            + "BEGIN"
-                            + "   IF TG_OP = 'UPDATE'"
+                            + "BEGIN" + "   IF TG_OP = 'UPDATE'"
                             + "       AND NEW.\"VERSION\" = old.\"VERSION\""
                             + "       AND ROW(NEW.*) IS DISTINCT FROM ROW (old.*)"
                             + "   THEN"
@@ -125,7 +124,8 @@ public class SQLTestsConstants {
             dbPwd = "sa";
             peopleFirst = "create table PEOPLE (\"ID\" int identity(1,1) primary key, \"NAME\" VARCHAR(32), \"AGE\" INTEGER)";
             peopleSecond = null;
-            versionStatements = new String[] { "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" };
+            versionStatements = new String[] {
+                    "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" };
             sqlGen = new MSSQLGenerator();
             break;
         case ORACLE:
diff --git a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
index 34c82ae4ed..716a44a54c 100644
--- a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -66,8 +66,8 @@ import com.vaadin.util.CurrentInstance;
 @SuppressWarnings("serial")
 public class ApplicationRunnerServlet extends LegacyVaadinServlet {
 
-    private static class ApplicationRunnerRedirectException extends
-            RuntimeException {
+    private static class ApplicationRunnerRedirectException
+            extends RuntimeException {
         private final String target;
 
         public ApplicationRunnerRedirectException(String target) {
@@ -205,8 +205,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
         try {
             final Class<?> classToRun = getClassToRun();
             if (UI.class.isAssignableFrom(classToRun)) {
-                session.addUIProvider(new ApplicationRunnerUIProvider(
-                        classToRun));
+                session.addUIProvider(
+                        new ApplicationRunnerUIProvider(classToRun));
             } else if (LegacyApplication.class.isAssignableFrom(classToRun)) {
                 // Avoid using own UIProvider for legacy Application
             } else if (UIProvider.class.isAssignableFrom(classToRun)) {
@@ -220,10 +220,10 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
         } catch (final InstantiationException e) {
             throw new ServiceException(e);
         } catch (final ClassNotFoundException e) {
-            throw new ServiceException(
-                    new InstantiationException(
-                            "Failed to load application class: "
-                                    + getApplicationRunnerApplicationClassName((VaadinServletRequest) request)));
+            throw new ServiceException(new InstantiationException(
+                    "Failed to load application class: "
+                            + getApplicationRunnerApplicationClassName(
+                                    (VaadinServletRequest) request)));
         }
     }
 
@@ -232,8 +232,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
         return getApplicationRunnerURIs(request).applicationClassname;
     }
 
-    private final static class ProxyDeploymentConfiguration implements
-            InvocationHandler, Serializable {
+    private final static class ProxyDeploymentConfiguration
+            implements InvocationHandler, Serializable {
         private final DeploymentConfiguration originalConfiguration;
 
         private ProxyDeploymentConfiguration(
@@ -246,7 +246,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                 throws Throwable {
             if (method.getDeclaringClass() == DeploymentConfiguration.class) {
                 // Find the configuration instance to delegate to
-                DeploymentConfiguration configuration = findDeploymentConfiguration(originalConfiguration);
+                DeploymentConfiguration configuration = findDeploymentConfiguration(
+                        originalConfiguration);
 
                 return method.invoke(configuration, args);
             } else {
@@ -351,8 +352,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                         String className = file.getPath()
                                 .substring(uitestDir.getPath().length() + 1)
                                 .replace(File.separatorChar, '.');
-                        className = className.substring(0, className.length()
-                                - ".java".length());
+                        className = className.substring(0,
+                                className.length() - ".java".length());
                         if (isSupportedClass(className)) {
                             lastModifiedTimestamp = file.lastModified();
                             lastModifiedClassName = className;
@@ -394,8 +395,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
 
         Class<?> appClass = null;
 
-        String baseName = getApplicationRunnerApplicationClassName(request
-                .get());
+        String baseName = getApplicationRunnerApplicationClassName(
+                request.get());
         try {
             appClass = getClass().getClassLoader().loadClass(baseName);
             return appClass;
@@ -403,16 +404,16 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
             //
             for (String pkg : defaultPackages) {
                 try {
-                    appClass = getClass().getClassLoader().loadClass(
-                            pkg + "." + baseName);
+                    appClass = getClass().getClassLoader()
+                            .loadClass(pkg + "." + baseName);
                 } catch (ClassNotFoundException ee) {
                     // Ignore as this is expected for many packages
                 } catch (Exception e2) {
                     // TODO: handle exception
-                    getLogger().log(
-                            Level.FINE,
+                    getLogger().log(Level.FINE,
                             "Failed to find application class " + pkg + "."
-                                    + baseName, e2);
+                                    + baseName,
+                            e2);
                 }
                 if (appClass != null) {
                     return appClass;
@@ -432,8 +433,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     protected DeploymentConfiguration createDeploymentConfiguration(
             Properties initParameters) {
         // Get the original configuration from the super class
-        final DeploymentConfiguration originalConfiguration = super
-                .createDeploymentConfiguration(initParameters);
+        final DeploymentConfiguration originalConfiguration = super.createDeploymentConfiguration(
+                initParameters);
 
         // And then create a proxy instance that delegates to the original
         // configuration or a customized version
@@ -447,8 +448,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     protected VaadinServletService createServletService(
             DeploymentConfiguration deploymentConfiguration)
             throws ServiceException {
-        VaadinServletService service = super
-                .createServletService(deploymentConfiguration);
+        VaadinServletService service = super.createServletService(
+                deploymentConfiguration);
         final SystemMessagesProvider provider = service
                 .getSystemMessagesProvider();
         service.setSystemMessagesProvider(new SystemMessagesProvider() {
@@ -459,8 +460,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                 if (systemMessagesInfo.getRequest() == null) {
                     return provider.getSystemMessages(systemMessagesInfo);
                 }
-                Object messages = systemMessagesInfo.getRequest().getAttribute(
-                        CUSTOM_SYSTEM_MESSAGES_PROPERTY);
+                Object messages = systemMessagesInfo.getRequest()
+                        .getAttribute(CUSTOM_SYSTEM_MESSAGES_PROPERTY);
                 if (messages instanceof SystemMessages) {
                     return (SystemMessages) messages;
                 }
@@ -500,9 +501,9 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                         try {
                             VaadinServletService service = (VaadinServletService) VaadinService
                                     .getCurrent();
-                            session = service
-                                    .findVaadinSession(new VaadinServletRequest(
-                                            currentRequest, service));
+                            session = service.findVaadinSession(
+                                    new VaadinServletRequest(currentRequest,
+                                            service));
                         } finally {
                             /*
                              * Clear some state set by findVaadinSession to
@@ -510,8 +511,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                              * e.g. static request handling.
                              */
                             CurrentInstance.restoreInstances(oldCurrent);
-                            currentRequest.removeAttribute(VaadinSession.class
-                                    .getName());
+                            currentRequest.removeAttribute(
+                                    VaadinSession.class.getName());
                         }
                     }
                 }
@@ -542,7 +543,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                         }
 
                         CustomDeploymentConfiguration customDeploymentConfiguration = classToRun
-                                .getAnnotation(CustomDeploymentConfiguration.class);
+                                .getAnnotation(
+                                        CustomDeploymentConfiguration.class);
                         if (customDeploymentConfiguration != null) {
                             Properties initParameters = new Properties(
                                     originalConfiguration.getInitParameters());
diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
index 5861ede412..6e6b3964ab 100644
--- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -154,14 +154,10 @@ public class DevelopmentServerLauncher {
         }
 
         // Add help for System.out
-        System.out
-                .println("-------------------------------------------------\n"
-                        + "Starting Vaadin in "
-                        + mode
-                        + ".\n"
-                        + "Running in http://localhost:"
-                        + port
-                        + "\n-------------------------------------------------\n");
+        System.out.println("-------------------------------------------------\n"
+                + "Starting Vaadin in " + mode + ".\n"
+                + "Running in http://localhost:" + port
+                + "\n-------------------------------------------------\n");
 
         final Server server = new Server();
 
@@ -240,8 +236,8 @@ public class DevelopmentServerLauncher {
                 }
             }
             if (!classFolders.isEmpty()) {
-                System.out
-                        .println("Enabling context auto-reload.\n Scan interval: "
+                System.out.println(
+                        "Enabling context auto-reload.\n Scan interval: "
                                 + interval + " secs.\n Scanned folders: ");
                 for (File f : classFolders) {
                     System.out.println("  " + f.getAbsolutePath());
@@ -284,16 +280,16 @@ public class DevelopmentServerLauncher {
             server.start();
 
             if (serverArgs.containsKey("shutdownPort")) {
-                int shutdownPort = Integer.parseInt(serverArgs
-                        .get("shutdownPort"));
-                final ServerSocket serverSocket = new ServerSocket(
-                        shutdownPort, 1, InetAddress.getByName("127.0.0.1"));
+                int shutdownPort = Integer
+                        .parseInt(serverArgs.get("shutdownPort"));
+                final ServerSocket serverSocket = new ServerSocket(shutdownPort,
+                        1, InetAddress.getByName("127.0.0.1"));
                 new Thread() {
                     @Override
                     public void run() {
                         try {
-                            System.out
-                                    .println("Waiting for shutdown signal on port "
+                            System.out.println(
+                                    "Waiting for shutdown signal on port "
                                             + serverSocket.getLocalPort());
                             // Start waiting for a close signal
                             Socket accept = serverSocket.accept();
@@ -308,8 +304,8 @@ public class DevelopmentServerLauncher {
                                     try {
                                         Thread.sleep(5000);
                                         if (!server.isStopped()) {
-                                            System.out
-                                                    .println("Jetty still running. Closing JVM.");
+                                            System.out.println(
+                                                    "Jetty still running. Closing JVM.");
                                             dumpThreadStacks();
                                             System.exit(-1);
                                         }
@@ -442,8 +438,8 @@ public class DevelopmentServerLauncher {
                 FilterChain chain) throws IOException, ServletException {
 
             String path = ((HttpServletRequest) request).getPathInfo();
-            System.out.println("Caching " + path + " for " + CACHE_MINUTES
-                    + " minutes");
+            System.out.println(
+                    "Caching " + path + " for " + CACHE_MINUTES + " minutes");
 
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.MINUTE, CACHE_MINUTES);
diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
index a3fc282131..42866558c8 100644
--- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
+++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
@@ -121,7 +121,8 @@ public class ScreenshotBrowser extends UI {
             return new File(screenshotDir, "reference");
         }
 
-        private static File getAlternative(File baseFile, int alternativeNumber) {
+        private static File getAlternative(File baseFile,
+                int alternativeNumber) {
             assert alternativeNumber >= 1;
             String alternativeName = baseFile.getName().replaceFirst("\\.png",
                     "_" + alternativeNumber + ".png");
@@ -198,18 +199,18 @@ public class ScreenshotBrowser extends UI {
             left.setSpacing(true);
             left.setSizeFull();
 
-            left.addComponent(createActionButton("Accept changes", 'j',
-                    Action.ACCEPT));
-            left.addComponent(createActionButton("Ignore changes", 'k',
-                    Action.IGNORE));
+            left.addComponent(
+                    createActionButton("Accept changes", 'j', Action.ACCEPT));
+            left.addComponent(
+                    createActionButton("Ignore changes", 'k', Action.IGNORE));
             left.addComponent(createActionButton("Use as alternative", 'l',
                     Action.ALTERNATIVE));
-            left.addComponent(new Button("Clear action",
-                    createSetActionListener(null)));
+            left.addComponent(
+                    new Button("Clear action", createSetActionListener(null)));
 
             left.addComponent(createSpacer());
-            left.addComponent(new Button("Commit actions",
-                    new Button.ClickListener() {
+            left.addComponent(
+                    new Button("Commit actions", new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
                             commitActions();
@@ -241,8 +242,9 @@ public class ScreenshotBrowser extends UI {
 
         private Button createActionButton(String caption, char shortcut,
                 Action action) {
-            Button button = new Button(caption + " <strong>" + shortcut
-                    + "</strong>", createSetActionListener(action));
+            Button button = new Button(
+                    caption + " <strong>" + shortcut + "</strong>",
+                    createSetActionListener(action));
             button.setCaptionAsHtml(true);
             return button;
         }
@@ -300,12 +302,12 @@ public class ScreenshotBrowser extends UI {
             }
         });
 
-        table.addShortcutListener(createShortcutListener(KeyCode.J,
-                Action.ACCEPT));
-        table.addShortcutListener(createShortcutListener(KeyCode.K,
-                Action.IGNORE));
-        table.addShortcutListener(createShortcutListener(KeyCode.L,
-                Action.ALTERNATIVE));
+        table.addShortcutListener(
+                createShortcutListener(KeyCode.J, Action.ACCEPT));
+        table.addShortcutListener(
+                createShortcutListener(KeyCode.K, Action.IGNORE));
+        table.addShortcutListener(
+                createShortcutListener(KeyCode.L, Action.ALTERNATIVE));
 
         refreshTableContainer();
 
@@ -320,7 +322,8 @@ public class ScreenshotBrowser extends UI {
     }
 
     private void commitActions() {
-        for (ComparisonFailure comparisonFailure : getContainer().getItemIds()) {
+        for (ComparisonFailure comparisonFailure : getContainer()
+                .getItemIds()) {
             Action action = comparisonFailure.getAction();
             if (action != null) {
                 action.commit(comparisonFailure.getFile());
@@ -400,8 +403,8 @@ public class ScreenshotBrowser extends UI {
         File propertiesFile = new File(
                 "../work/eclipse-run-selected-test.properties");
         if (!propertiesFile.exists()) {
-            throw new RuntimeException("File "
-                    + propertiesFile.getAbsolutePath() + " not found.");
+            throw new RuntimeException(
+                    "File " + propertiesFile.getAbsolutePath() + " not found.");
         }
 
         FileInputStream in = null;
@@ -412,7 +415,8 @@ public class ScreenshotBrowser extends UI {
             properties.load(in);
             String screenShotDirName = properties
                     .getProperty("com.vaadin.testbench.screenshot.directory");
-            if (screenShotDirName == null || screenShotDirName.startsWith("<")) {
+            if (screenShotDirName == null
+                    || screenShotDirName.startsWith("<")) {
                 throw new RuntimeException(
                         "com.vaadin.testbench.screenshot.directory has not been configred in "
                                 + propertiesFile.getAbsolutePath());
diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 7f024e774a..10c204135f 100644
--- a/uitest/src/main/java/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
@@ -93,10 +93,9 @@ public class Components extends LegacyApplication {
         sp = new HorizontalSplitPanel();
         sp.setSizeFull();
         VerticalLayout naviLayout = new VerticalLayout();
-        naviLayout
-                .addComponent(new Label(
-                        "Click to open a test case.<br/>Right click to open test in a new window<br/><br/>",
-                        ContentMode.HTML));
+        naviLayout.addComponent(new Label(
+                "Click to open a test case.<br/>Right click to open test in a new window<br/><br/>",
+                ContentMode.HTML));
         naviLayout.addComponent(createMenu());
         naviLayout.addComponent(createMissingTestsList());
 
@@ -104,10 +103,9 @@ public class Components extends LegacyApplication {
         sp.setSplitPosition(250, Sizeable.UNITS_PIXELS);
         VerticalLayout embeddingLayout = new VerticalLayout();
         embeddingLayout.setSizeFull();
-        embeddingLayout
-                .addComponent(new Label(
-                        "<b>Do not use the embedded version for creating automated tests. Open the test in a new window before recording.</b><br/>",
-                        ContentMode.HTML));
+        embeddingLayout.addComponent(new Label(
+                "<b>Do not use the embedded version for creating automated tests. Open the test in a new window before recording.</b><br/>",
+                ContentMode.HTML));
         applicationEmbedder.setSizeFull();
         embeddingLayout.addComponent(applicationEmbedder);
         embeddingLayout.setExpandRatio(applicationEmbedder, 1);
@@ -129,8 +127,9 @@ public class Components extends LegacyApplication {
             missingTests += "<font class=\"" + cls + "\">"
                     + component.getSimpleName() + "</font><br/>";
         }
-        return new Label("<b>Components without a test:</B><br/>"
-                + missingTests, ContentMode.HTML);
+        return new Label(
+                "<b>Components without a test:</B><br/>" + missingTests,
+                ContentMode.HTML);
     }
 
     private Component createMenu() {
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 85c1229169..b1df9f2976 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -113,8 +113,8 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication
         setBody("Welcome");
 
         // Add heading label and custom layout panel to main window
-        mainWindow.addComponent(new Label("<h3>Custom layout demo</h3>",
-                ContentMode.HTML));
+        mainWindow.addComponent(
+                new Label("<h3>Custom layout demo</h3>", ContentMode.HTML));
         mainWindow.addComponent(customLayoutPanel);
     }
 
@@ -129,8 +129,9 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication
         if (username.getValue().toString().length() < 1) {
             username.setValue("Anonymous");
         }
-        mainLayout.replaceComponent(loginButton, new Label("Welcome user <em>"
-                + username.getValue() + "</em>", ContentMode.HTML));
+        mainLayout.replaceComponent(loginButton,
+                new Label("Welcome user <em>" + username.getValue() + "</em>",
+                        ContentMode.HTML));
     }
 
     /**
diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
index c62a9ea51b..a7759e9e08 100644
--- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
@@ -87,7 +87,8 @@ public class LayoutDemo extends com.vaadin.server.LegacyApplication {
         // Create TabSheet
         //
         final TabSheet tabsheet = new TabSheet();
-        tabsheet.setCaption("Tabsheet, above layouts are added to this component");
+        tabsheet.setCaption(
+                "Tabsheet, above layouts are added to this component");
         tabsheet.addTab(layoutA, "Horizontal ordered layout", null);
         tabsheet.addTab(layoutB, "Vertical ordered layout", null);
         tabsheet.addTab(layoutG, "First grid layout", null);
@@ -108,13 +109,15 @@ public class LayoutDemo extends com.vaadin.server.LegacyApplication {
                 "<br /><h3>Grid Layout (4 x 4)</h3>Added 16 components.",
                 ContentMode.HTML));
         mainWindow.addComponent(layoutG);
-        mainWindow.addComponent(new Label("<br /><h3>Grid Layout (4 x 4)</h3>"
-                + "Added four panels and four embedded components "
-                + "diagonally with absolute coordinates.", ContentMode.HTML));
-        mainWindow.addComponent(layoutG2);
         mainWindow.addComponent(new Label(
-                "<br /><h3>TabSheet</h3>Added above layouts as tabs.",
+                "<br /><h3>Grid Layout (4 x 4)</h3>"
+                        + "Added four panels and four embedded components "
+                        + "diagonally with absolute coordinates.",
                 ContentMode.HTML));
+        mainWindow.addComponent(layoutG2);
+        mainWindow.addComponent(
+                new Label("<br /><h3>TabSheet</h3>Added above layouts as tabs.",
+                        ContentMode.HTML));
         mainWindow.addComponent(tabsheet);
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
index 8375b75f4b..b24ba1e99c 100644
--- a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
@@ -89,7 +89,8 @@ public class ListenerOrder extends com.vaadin.server.LegacyApplication
         s1.addListener((ValueChangeListener) this);
 
         Item i = s1.getItem("second");
-        for (Iterator<?> it = i.getItemPropertyIds().iterator(); it.hasNext();) {
+        for (Iterator<?> it = i.getItemPropertyIds().iterator(); it
+                .hasNext();) {
             Object o = it.next();
             System.out.println("[" + o + "]");
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
index 045000a090..2f81d7c641 100644
--- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
@@ -35,8 +35,8 @@ import com.vaadin.ui.Window;
  * @see com.vaadin.ui.Window
  * @see com.vaadin.ui.Label
  */
-public class ModalWindow extends com.vaadin.server.LegacyApplication implements
-        ClickListener {
+public class ModalWindow extends com.vaadin.server.LegacyApplication
+        implements ClickListener {
 
     private Window test;
     private Button reopen;
diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
index b646655c35..cad6051072 100644
--- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
@@ -37,14 +37,14 @@ public class NativeWindowing extends LegacyApplication {
 
         setMainWindow(main);
 
-        main.addComponent(new Button("Add new subwindow",
-                new Button.ClickListener() {
+        main.addComponent(
+                new Button("Add new subwindow", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         VerticalLayout layout = new VerticalLayout();
                         layout.setMargin(true);
-                        final Window w = new Window("sw "
-                                + System.currentTimeMillis(), layout);
+                        final Window w = new Window(
+                                "sw " + System.currentTimeMillis(), layout);
                         main.addWindow(w);
                         w.setPositionX(100);
                         w.setPositionY(100);
@@ -54,14 +54,15 @@ public class NativeWindowing extends LegacyApplication {
                         w.setWidth("100px");
                         w.setHeight("400px");
 
-                        final Button closebutton = new Button("Close "
-                                + w.getCaption(), new Button.ClickListener() {
-                            @Override
-                            public void buttonClick(ClickEvent event) {
-                                main.removeWindow(w);
-                            }
+                        final Button closebutton = new Button(
+                                "Close " + w.getCaption(),
+                                new Button.ClickListener() {
+                                    @Override
+                                    public void buttonClick(ClickEvent event) {
+                                        main.removeWindow(w);
+                                    }
 
-                        });
+                                });
                         layout.addComponent(closebutton);
 
                         layout.addComponent(new Label(
@@ -98,13 +99,12 @@ public class NativeWindowing extends LegacyApplication {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         try {
-                            main.open(
-                                    new com.vaadin.server.ExternalResource(
-                                            new URL(
-                                                    getURL(),
-                                                    "mainwin-"
-                                                            + System.currentTimeMillis()
-                                                            + "/")), null);
+                            main.open(new com.vaadin.server.ExternalResource(
+                                    new URL(getURL(),
+                                            "mainwin-"
+                                                    + System.currentTimeMillis()
+                                                    + "/")),
+                                    null);
                         } catch (final MalformedURLException e) {
                         }
                     }
@@ -134,8 +134,8 @@ public class NativeWindowing extends LegacyApplication {
 
                 @Override
                 public void buttonClick(ClickEvent event) {
-                    ww.addComponent(new Label("Button clicked " + (++state)
-                            + " times"));
+                    ww.addComponent(new Label(
+                            "Button clicked " + (++state) + " times"));
                 }
             }));
             addWindow(ww);
diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 7e71c4dc76..92ad0051f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
@@ -40,8 +40,8 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @since 3.1.1
  */
-public class Parameters extends com.vaadin.server.LegacyApplication implements
-        RequestHandler {
+public class Parameters extends com.vaadin.server.LegacyApplication
+        implements RequestHandler {
 
     private final Label context = new Label();
 
@@ -65,14 +65,14 @@ public class Parameters extends com.vaadin.server.LegacyApplication implements
         try {
             final URL u1 = new URL(getURL(), "test/uri?test=1&test=2");
             final URL u2 = new URL(getURL(), "foo/bar?mary=john&count=3");
-            layout.addComponent(new Link(u1.toString(),
-                    new ExternalResource(u1)));
+            layout.addComponent(
+                    new Link(u1.toString(), new ExternalResource(u1)));
             layout.addComponent(new Label("Or this: "));
-            layout.addComponent(new Link(u2.toString(),
-                    new ExternalResource(u2)));
+            layout.addComponent(
+                    new Link(u2.toString(), new ExternalResource(u2)));
         } catch (final Exception e) {
-            System.out.println("Couldn't get hostname for this machine: "
-                    + e.toString());
+            System.out.println(
+                    "Couldn't get hostname for this machine: " + e.toString());
             e.printStackTrace();
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 08f8bc4d7a..879f6fe14a 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
@@ -48,8 +48,8 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent {
         result = new Label();
         main.addComponent(result);
 
-        main.addComponent(new Button("click when rendered",
-                new ClickListener() {
+        main.addComponent(
+                new Button("click when rendered", new ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -57,14 +57,14 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent {
                     }
                 }));
 
-        main.addComponent(new Button(
-                "Click for layout repaint (cached components)",
-                new ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        testContainer.markAsDirty();
-                    }
-                }));
+        main.addComponent(
+                new Button("Click for layout repaint (cached components)",
+                        new ClickListener() {
+                            @Override
+                            public void buttonClick(ClickEvent event) {
+                                testContainer.markAsDirty();
+                            }
+                        }));
 
         testContainer = new VerticalLayout();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index a6f112cff0..910408dbba 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
@@ -56,7 +56,8 @@ public class PerformanceTestSubTreeCaching extends CustomComponent {
                 startTest();
             }
         });
-        b.setDescription("Push this button to start test. A test label will be rendered above existing components.");
+        b.setDescription(
+                "Push this button to start test. A test label will be rendered above existing components.");
         main.addComponent(b);
         b = new Button("end test", new Button.ClickListener() {
             @Override
@@ -64,7 +65,8 @@ public class PerformanceTestSubTreeCaching extends CustomComponent {
                 endTest();
             }
         });
-        b.setDescription("Push this button as soon as test componenet is rendered.");
+        b.setDescription(
+                "Push this button as soon as test componenet is rendered.");
         main.addComponent(b);
 
         result = new Label();
diff --git a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
index 84c9d70299..287da60c9c 100644
--- a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
@@ -76,10 +76,10 @@ public class StressComponentsInTable extends CustomComponent {
             "Charles", "Aaron", "Lucas", "Luis", "Owen", "Landon", "Diego",
             "Brian", "Adam", "Adrian", "Kyle", "Eric", "Ian", "Nathaniel",
             "Carlos", "Alex", "Bryan", "Jesus", "Julian", "Sean", "Carter",
-            "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase",
-            "Steven", "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden",
-            "Jesse", "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin",
-            "Cody", "Alejandro", "Caden", "Blake", "Carson" };
+            "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", "Steven",
+            "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", "Jesse",
+            "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", "Cody",
+            "Alejandro", "Caden", "Blake", "Carson" };
 
     public static String rndString() {
         return testString[(int) (Math.random() * testString.length)];
diff --git a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
index 162c850fb5..ce3240c9fa 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class TableChangingDatasource extends CustomComponent implements
-        ClickListener {
+public class TableChangingDatasource extends CustomComponent
+        implements ClickListener {
     Table t;
     Table[] ta = new Table[4];
     private int mode = 0;
@@ -33,22 +33,22 @@ public class TableChangingDatasource extends CustomComponent implements
     public TableChangingDatasource() {
         final VerticalLayout main = new VerticalLayout();
 
-        main.addComponent(new Label(
-                "Table should look sane after data source changes"));
+        main.addComponent(
+                new Label("Table should look sane after data source changes"));
 
         t = new Table();
 
         t.setWidth("500px");
         t.setHeight("300px");
 
-        ta[0] = TestForTablesInitialColumnWidthLogicRendering
-                .getTestTable(3, 0);
-        ta[1] = TestForTablesInitialColumnWidthLogicRendering
-                .getTestTable(3, 7);
-        ta[2] = TestForTablesInitialColumnWidthLogicRendering
-                .getTestTable(3, 5);
-        ta[3] = TestForTablesInitialColumnWidthLogicRendering
-                .getTestTable(3, 1);
+        ta[0] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3,
+                0);
+        ta[1] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3,
+                7);
+        ta[2] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3,
+                5);
+        ta[3] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3,
+                1);
 
         main.addComponent(t);
         main.addComponent(new Button("switch DS", this));
diff --git a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
index 61c93d0eae..c54a733da8 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
@@ -22,8 +22,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class TableSelectTest extends CustomComponent implements
-        Table.ValueChangeListener {
+public class TableSelectTest extends CustomComponent
+        implements Table.ValueChangeListener {
 
     public TableSelectTest() {
         final VerticalLayout main = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java
index bd01fa2087..f1d4be0d8c 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
@@ -51,8 +51,8 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class TestBench extends com.vaadin.server.LegacyApplication implements
-        Property.ValueChangeListener {
+public class TestBench extends com.vaadin.server.LegacyApplication
+        implements Property.ValueChangeListener {
 
     // Add here packages which are used for finding testable classes
     String[] testablePackages = { "com.vaadin.tests",
@@ -79,9 +79,10 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
         for (int p = 0; p < testablePackages.length; p++) {
             testables.addItem(testablePackages[p]);
             try {
-                final List<Class<?>> testableClasses = getTestableClassesForPackage(testablePackages[p]);
-                for (final Iterator<Class<?>> it = testableClasses.iterator(); it
-                        .hasNext();) {
+                final List<Class<?>> testableClasses = getTestableClassesForPackage(
+                        testablePackages[p]);
+                for (final Iterator<Class<?>> it = testableClasses
+                        .iterator(); it.hasNext();) {
                     final Class<?> t = it.next();
                     // ignore TestBench itself
                     if (t.equals(TestBench.class)) {
@@ -116,12 +117,13 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
                 .hasNext();) {
             final Class<?> testable = i.next();
             // simplify captions
-            final String name = testable.getName().substring(
-                    testable.getName().lastIndexOf('.') + 1);
+            final String name = testable.getName()
+                    .substring(testable.getName().lastIndexOf('.') + 1);
             menu.setItemCaption(testable, name);
         }
         // expand all root items
-        for (final Iterator<?> i = menu.rootItemIds().iterator(); i.hasNext();) {
+        for (final Iterator<?> i = menu.rootItemIds().iterator(); i
+                .hasNext();) {
             menu.expandItemsRecursively(i.next());
         }
 
@@ -189,8 +191,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
                         if (next instanceof Class) {
                             Class<?> c = (Class<?>) next;
                             String string = c.getSimpleName();
-                            if (string.toLowerCase().contains(
-                                    fragment.toLowerCase())) {
+                            if (string.toLowerCase()
+                                    .contains(fragment.toLowerCase())) {
                                 menu.setValue(c);
                                 mainLayout.setSplitPosition(0);
                                 return;
@@ -274,8 +276,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
      * @return
      * @throws ClassNotFoundException
      */
-    public static List<Class<?>> getTestableClassesForPackage(String packageName)
-            throws Exception {
+    public static List<Class<?>> getTestableClassesForPackage(
+            String packageName) throws Exception {
         final ArrayList<File> directories = new ArrayList<File>();
         try {
             final ClassLoader cld = Thread.currentThread()
@@ -291,8 +293,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
                 directories.add(new File(url.getFile()));
             }
         } catch (final Exception x) {
-            throw new Exception(packageName
-                    + " does not appear to be a valid package.");
+            throw new Exception(
+                    packageName + " does not appear to be a valid package.");
         }
 
         final ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
@@ -310,11 +312,11 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
                                 + files[j].substring(0, files[j].length() - 6);
                         final Class<?> c = Class.forName(p);
                         if (c.getSuperclass() != null) {
-                            if ((c.getSuperclass()
-                                    .equals(com.vaadin.server.VaadinSession.class))) {
+                            if ((c.getSuperclass().equals(
+                                    com.vaadin.server.VaadinSession.class))) {
                                 classes.add(c);
-                            } else if ((c.getSuperclass()
-                                    .equals(com.vaadin.ui.CustomComponent.class))) {
+                            } else if ((c.getSuperclass().equals(
+                                    com.vaadin.ui.CustomComponent.class))) {
                                 classes.add(c);
                             }
                         }
@@ -329,9 +331,9 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
                     }
                 }
             } else {
-                throw new ClassNotFoundException(packageName + " ("
-                        + directory.getPath()
-                        + ") does not appear to be a valid package");
+                throw new ClassNotFoundException(
+                        packageName + " (" + directory.getPath()
+                                + ") does not appear to be a valid package");
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
index d431562c8e..6b7701454f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
@@ -108,12 +108,12 @@ public class TestComponentAddAndRecursion extends CustomComponent {
                 try {
                     p3l.addComponent(p2);
                     new Notification("ERROR", "This should have failed",
-                            Notification.TYPE_ERROR_MESSAGE).show(Page
-                            .getCurrent());
+                            Notification.TYPE_ERROR_MESSAGE)
+                                    .show(Page.getCurrent());
                 } catch (Exception e) {
                     new Notification("OK", "threw, as expected",
-                            Notification.TYPE_ERROR_MESSAGE).show(Page
-                            .getCurrent());
+                            Notification.TYPE_ERROR_MESSAGE)
+                                    .show(Page.getCurrent());
                 }
             }
 
@@ -129,12 +129,12 @@ public class TestComponentAddAndRecursion extends CustomComponent {
                 try {
                     p3l.addComponent(p);
                     new Notification("ERROR", "This should have failed",
-                            Notification.TYPE_ERROR_MESSAGE).show(Page
-                            .getCurrent());
+                            Notification.TYPE_ERROR_MESSAGE)
+                                    .show(Page.getCurrent());
                 } catch (Exception e) {
                     new Notification("OK", "threw, as expected",
-                            Notification.TYPE_ERROR_MESSAGE).show(Page
-                            .getCurrent());
+                            Notification.TYPE_ERROR_MESSAGE)
+                                    .show(Page.getCurrent());
                 }
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
index 0e03606cd8..12d6828395 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
@@ -72,8 +72,8 @@ public class TestContainerChanges extends CustomComponent {
         tbl2.addListener(new Table.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                System.err.println("Value now "
-                        + event.getProperty().getValue());
+                System.err
+                        .println("Value now " + event.getProperty().getValue());
 
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index d6c72ee8e9..c2bbc5a54f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends
-        LegacyApplication {
+public class TestForApplicationLayoutThatUsesWholeBrosersSpace
+        extends LegacyApplication {
 
     LegacyWindow main = new LegacyWindow("Windowing test");
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index 6e44d13843..623d7d8cef 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
@@ -59,10 +59,10 @@ public class TestForContainerFilterable extends CustomComponent {
         filterLayout.addComponent(fooFilter);
         filterLayout.addComponent(barFilter);
         filterLayout.addComponent(filterButton);
-        fooFilter
-                .setDescription("Filters foo column in case-sensitive contains manner.");
-        barFilter
-                .setDescription("Filters bar column in case-insensitive prefix manner.");
+        fooFilter.setDescription(
+                "Filters foo column in case-sensitive contains manner.");
+        barFilter.setDescription(
+                "Filters bar column in case-insensitive prefix manner.");
         filterLayout.addComponent(count);
 
         // Table
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
index a4f2dcd106..fbaf6208dc 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -35,8 +35,8 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @author Vaadin Ltd.
  */
-public class TestForMultipleStyleNames extends CustomComponent implements
-        ValueChangeListener {
+public class TestForMultipleStyleNames extends CustomComponent
+        implements ValueChangeListener {
 
     private final VerticalLayout main = new VerticalLayout();
 
@@ -53,8 +53,8 @@ public class TestForMultipleStyleNames extends CustomComponent implements
 
     public void createNewView() {
         main.removeAllComponents();
-        main.addComponent(new Label(
-                "TK5 supports multiple stylenames for components."));
+        main.addComponent(
+                new Label("TK5 supports multiple stylenames for components."));
         main.addComponent(new Label("Note you need to add Theme under"
                 + " WebContent/VAADIN/Themes/mytheme"
                 + " in order to see actual visible results"
@@ -91,7 +91,8 @@ public class TestForMultipleStyleNames extends CustomComponent implements
 
         final Collection<?> styles = (Collection<?>) s.getValue();
 
-        for (final Iterator<?> iterator = styles.iterator(); iterator.hasNext();) {
+        for (final Iterator<?> iterator = styles.iterator(); iterator
+                .hasNext();) {
             final String styleName = (String) iterator.next();
             if (curStyles.contains(styleName)) {
                 // already added
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
index a9faeb8f38..2d2811989b 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
@@ -37,14 +37,14 @@ public class TestForNativeWindowing extends LegacyApplication {
 
         setMainWindow(main);
 
-        main.addComponent(new Button("Add new subwindow",
-                new Button.ClickListener() {
+        main.addComponent(
+                new Button("Add new subwindow", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         VerticalLayout layout = new VerticalLayout();
                         layout.setMargin(true);
-                        final Window w = new Window("sw "
-                                + System.currentTimeMillis(), layout);
+                        final Window w = new Window(
+                                "sw " + System.currentTimeMillis(), layout);
                         main.addWindow(w);
                         w.setPositionX(100);
                         w.setPositionY(100);
@@ -54,14 +54,15 @@ public class TestForNativeWindowing extends LegacyApplication {
                         w.setWidth("100px");
                         w.setHeight("400px");
 
-                        final Button closebutton = new Button("Close "
-                                + w.getCaption(), new Button.ClickListener() {
-                            @Override
-                            public void buttonClick(ClickEvent event) {
-                                main.removeWindow(w);
-                            }
+                        final Button closebutton = new Button(
+                                "Close " + w.getCaption(),
+                                new Button.ClickListener() {
+                                    @Override
+                                    public void buttonClick(ClickEvent event) {
+                                        main.removeWindow(w);
+                                    }
 
-                        });
+                                });
                         layout.addComponent(closebutton);
 
                         layout.addComponent(new Label(
@@ -98,13 +99,12 @@ public class TestForNativeWindowing extends LegacyApplication {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         try {
-                            main.open(
-                                    new com.vaadin.server.ExternalResource(
-                                            new URL(
-                                                    getURL(),
-                                                    "mainwin-"
-                                                            + System.currentTimeMillis()
-                                                            + "/")), null);
+                            main.open(new com.vaadin.server.ExternalResource(
+                                    new URL(getURL(),
+                                            "mainwin-"
+                                                    + System.currentTimeMillis()
+                                                    + "/")),
+                                    null);
                         } catch (final MalformedURLException e) {
                         }
                     }
@@ -134,8 +134,8 @@ public class TestForNativeWindowing extends LegacyApplication {
 
                 @Override
                 public void buttonClick(ClickEvent event) {
-                    ww.addComponent(new Label("Button clicked " + (++state)
-                            + " times"));
+                    ww.addComponent(new Label(
+                            "Button clicked " + (++state) + " times"));
                 }
             }));
             addWindow(ww);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
index e054b69916..87d032df17 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -89,7 +89,8 @@ public class TestForPreconfiguredComponents extends CustomComponent {
         fillSelect(s, 20);
         s.setMultiSelect(true);
         test = createTestBench(s);
-        test.setCaption("OptionGroup + multiselect manually (configured from select)");
+        test.setCaption(
+                "OptionGroup + multiselect manually (configured from select)");
         main.addComponent(test);
 
         final Button b = new Button("refresh view", new Button.ClickListener() {
@@ -104,8 +105,8 @@ public class TestForPreconfiguredComponents extends CustomComponent {
 
     public static void fillSelect(AbstractSelect s, int items) {
         for (int i = 0; i < items; i++) {
-            final String name = firstnames[(int) (Math.random() * (firstnames.length - 1))]
-                    + " "
+            final String name = firstnames[(int) (Math.random()
+                    * (firstnames.length - 1))] + " "
                     + lastnames[(int) (Math.random() * (lastnames.length - 1))];
             s.addItem(name);
         }
@@ -115,8 +116,8 @@ public class TestForPreconfiguredComponents extends CustomComponent {
         Tree t = new Tree("Tree");
         final String[] names = new String[100];
         for (int i = 0; i < names.length; i++) {
-            names[i] = firstnames[(int) (Math.random() * (firstnames.length - 1))]
-                    + " "
+            names[i] = firstnames[(int) (Math.random()
+                    * (firstnames.length - 1))] + " "
                     + lastnames[(int) (Math.random() * (lastnames.length - 1))];
         }
 
@@ -124,7 +125,8 @@ public class TestForPreconfiguredComponents extends CustomComponent {
         t = new Tree("Organization Structure");
         for (int i = 0; i < 100; i++) {
             t.addItem(names[i]);
-            final String parent = names[(int) (Math.random() * (names.length - 1))];
+            final String parent = names[(int) (Math.random()
+                    * (names.length - 1))];
             if (t.containsId(parent)) {
                 t.setParent(names[i], parent);
             }
@@ -171,8 +173,8 @@ public class TestForPreconfiguredComponents extends CustomComponent {
                 statusLayout
                         .addComponent(new Label(event.getClass().getName()));
                 // TODO should not use LegacyField.toString()
-                statusLayout.addComponent(new Label("selected: "
-                        + event.getSource().toString()));
+                statusLayout.addComponent(
+                        new Label("selected: " + event.getSource().toString()));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
index af2cceedec..23e0d472f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
@@ -30,8 +30,8 @@ import com.vaadin.ui.VerticalLayout;
  *
  * @author Vaadin Ltd.
  */
-public class TestForRichTextEditor extends CustomComponent implements
-        ValueChangeListener {
+public class TestForRichTextEditor extends CustomComponent
+        implements ValueChangeListener {
 
     private final VerticalLayout main = new VerticalLayout();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index de79dba2f6..75a2df2666 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -48,8 +48,8 @@ import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestForStyledUpload extends LegacyApplication implements
-        Upload.FinishedListener, FailedListener, SucceededListener,
+public class TestForStyledUpload extends LegacyApplication
+        implements Upload.FinishedListener, FailedListener, SucceededListener,
         StartedListener {
 
     Layout main = new VerticalLayout();
@@ -89,8 +89,8 @@ public class TestForStyledUpload extends LegacyApplication implements
 
                 refreshMemUsage();
 
-                transferred.setValue("Transferred " + readBytes + " of "
-                        + contentLenght);
+                transferred.setValue(
+                        "Transferred " + readBytes + " of " + contentLenght);
             }
 
         });
@@ -165,8 +165,8 @@ public class TestForStyledUpload extends LegacyApplication implements
             sb.append("/");
             sb.append(up.getUploadSize());
             sb.append(" ");
-            sb.append(Math.round(100 * up.getBytesRead()
-                    / (double) up.getUploadSize()));
+            sb.append(Math.round(
+                    100 * up.getBytesRead() / (double) up.getUploadSize()));
             sb.append("%");
         } else {
             sb.append("Idle");
@@ -180,26 +180,28 @@ public class TestForStyledUpload extends LegacyApplication implements
         statusLayout.removeAllComponents();
         final InputStream stream = buffer.getStream();
         if (stream == null) {
-            statusLayout.addComponent(new Label(
-                    "Upload finished, but output buffer is null!!"));
+            statusLayout.addComponent(
+                    new Label("Upload finished, but output buffer is null!!"));
         } else {
-            statusLayout.addComponent(new Label("<b>Name:</b> "
-                    + event.getFilename(), ContentMode.HTML));
-            statusLayout.addComponent(new Label("<b>Mimetype:</b> "
-                    + event.getMIMEType(), ContentMode.HTML));
-            statusLayout.addComponent(new Label("<b>Size:</b> "
-                    + event.getLength() + " bytes.", ContentMode.HTML));
-
-            statusLayout.addComponent(new Link("Download "
-                    + buffer.getFileName(), new StreamResource(buffer, buffer
-                    .getFileName())));
+            statusLayout.addComponent(new Label(
+                    "<b>Name:</b> " + event.getFilename(), ContentMode.HTML));
+            statusLayout.addComponent(
+                    new Label("<b>Mimetype:</b> " + event.getMIMEType(),
+                            ContentMode.HTML));
+            statusLayout.addComponent(
+                    new Label("<b>Size:</b> " + event.getLength() + " bytes.",
+                            ContentMode.HTML));
+
+            statusLayout
+                    .addComponent(new Link("Download " + buffer.getFileName(),
+                            new StreamResource(buffer, buffer.getFileName())));
 
             status.setVisible(true);
         }
     }
 
-    public interface Buffer extends StreamResource.StreamSource,
-            Upload.Receiver {
+    public interface Buffer
+            extends StreamResource.StreamSource, Upload.Receiver {
 
         String getFileName();
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java
index 8d5fe71ed3..4dfa1b96a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
-public class TestForTabSheet extends CustomComponent implements
-        Button.ClickListener, TabSheet.SelectedTabChangeListener {
+public class TestForTabSheet extends CustomComponent
+        implements Button.ClickListener, TabSheet.SelectedTabChangeListener {
     TabSheet tabsheet = new TabSheet();
     Button tab1_root = new Button("Push this button");
     Label tab2_root = new Label("Contents of Second Tab");
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index cfd7f58866..ca9764e919 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -35,8 +35,8 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @author Vaadin Ltd.
  */
-public class TestForTablesInitialColumnWidthLogicRendering extends
-        CustomComponent {
+public class TestForTablesInitialColumnWidthLogicRendering
+        extends CustomComponent {
 
     private final VerticalLayout main = new VerticalLayout();
 
@@ -75,7 +75,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         main.addComponent(t);
 
         t = getTestTable(5, 5);
-        t.setCaption("Table with  some cols and rows rows, some col widths fixed");
+        t.setCaption(
+                "Table with  some cols and rows rows, some col widths fixed");
 
         Iterator<?> it = t.getContainerPropertyIds().iterator();
         it.next();
@@ -90,7 +91,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         main.addComponent(t);
 
         t = getTestTable(3, 40);
-        t.setCaption("Table with some columns and wide explicit width. (Ought to widen columns to use all space)");
+        t.setCaption(
+                "Table with some columns and wide explicit width. (Ought to widen columns to use all space)");
         t.setWidth("1000px");
         main.addComponent(t);
 
@@ -100,7 +102,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         main.addComponent(t);
 
         t = getTestTable(12, 100);
-        t.setCaption("Table with  lot of rows and lot of columns, width == 50%");
+        t.setCaption(
+                "Table with  lot of rows and lot of columns, width == 50%");
         t.setWidth(50, Table.UNITS_PERCENTAGE);
         main.addComponent(t);
 
@@ -164,10 +167,10 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
             "Charles", "Aaron", "Lucas", "Luis", "Owen", "Landon", "Diego",
             "Brian", "Adam", "Adrian", "Kyle", "Eric", "Ian", "Nathaniel",
             "Carlos", "Alex", "Bryan", "Jesus", "Julian", "Sean", "Carter",
-            "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase",
-            "Steven", "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden",
-            "Jesse", "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin",
-            "Cody", "Alejandro", "Caden", "Blake", "Carson" };
+            "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", "Steven",
+            "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", "Jesse",
+            "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", "Cody",
+            "Alejandro", "Caden", "Blake", "Carson" };
 
     public static String rndString() {
         return testString[(int) (Math.random() * testString.length)];
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
index 00fc2d54c2..f77245a47e 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
@@ -92,7 +92,8 @@ public class TestForTrees extends CustomComponent implements Handler {
         t.setCaption("with actions");
         t.setImmediate(true);
         t.addActionHandler(this);
-        final AbstractOrderedLayout ol = (AbstractOrderedLayout) createTestBench(t);
+        final AbstractOrderedLayout ol = (AbstractOrderedLayout) createTestBench(
+                t);
         al = new VerticalLayout();
         al.setMargin(true);
         ol.addComponent(new Panel("action log", al));
@@ -113,8 +114,8 @@ public class TestForTrees extends CustomComponent implements Handler {
         Tree t = new Tree("Tree");
         final String[] names = new String[100];
         for (int i = 0; i < names.length; i++) {
-            names[i] = firstnames[(int) (Math.random() * (firstnames.length - 1))]
-                    + " "
+            names[i] = firstnames[(int) (Math.random()
+                    * (firstnames.length - 1))] + " "
                     + lastnames[(int) (Math.random() * (lastnames.length - 1))];
         }
 
@@ -122,7 +123,8 @@ public class TestForTrees extends CustomComponent implements Handler {
         t = new Tree("Organization Structure");
         for (int i = 0; i < 100; i++) {
             t.addItem(names[i]);
-            final String parent = names[(int) (Math.random() * (names.length - 1))];
+            final String parent = names[(int) (Math.random()
+                    * (names.length - 1))];
             if (t.containsId(parent)) {
                 t.setParent(names[i], parent);
             }
@@ -166,8 +168,8 @@ public class TestForTrees extends CustomComponent implements Handler {
                 statusLayout
                         .addComponent(new Label(event.getClass().getName()));
                 // TODO should not use LegacyField.toString()
-                statusLayout.addComponent(new Label("selected: "
-                        + event.getSource().toString()));
+                statusLayout.addComponent(
+                        new Label("selected: " + event.getSource().toString()));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index cfea229f68..f98ac5ea26 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -50,8 +50,8 @@ import com.vaadin.ui.Upload.StartedEvent;
 import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestForUpload extends CustomComponent implements
-        Upload.ProgressListener {
+public class TestForUpload extends CustomComponent
+        implements Upload.ProgressListener {
 
     private static final long serialVersionUID = -3400119871764256575L;
 
@@ -86,8 +86,8 @@ public class TestForUpload extends CustomComponent implements
 
     public TestForUpload() {
         setCompositionRoot(main);
-        main.addComponent(new Label(
-                "This is a simple test for upload application. "
+        main.addComponent(
+                new Label("This is a simple test for upload application. "
                         + "Upload should work with big files and concurrent "
                         + "requests should not be blocked. Button 'b' reads "
                         + "current state into label below it. Memory receiver "
@@ -139,8 +139,8 @@ public class TestForUpload extends CustomComponent implements
                 pi2.setVisible(false);
                 if (event instanceof Upload.FailedEvent) {
                     Exception reason = ((Upload.FailedEvent) event).getReason();
-                    l.setValue("Finished with failure ( " + reason
-                            + "  ), idle");
+                    l.setValue(
+                            "Finished with failure ( " + reason + "  ), idle");
                 } else if (event instanceof Upload.SucceededEvent) {
                     l.setValue("Finished with succes, idle");
                 } else {
@@ -153,16 +153,19 @@ public class TestForUpload extends CustomComponent implements
                     statusLayout.addComponent(new Label(
                             "Upload finished, but output buffer is null"));
                 } else {
-                    statusLayout.addComponent(new Label("<b>Name:</b> "
-                            + event.getFilename(), ContentMode.HTML));
-                    statusLayout.addComponent(new Label("<b>Mimetype:</b> "
-                            + event.getMIMEType(), ContentMode.HTML));
-                    statusLayout.addComponent(new Label("<b>Size:</b> "
-                            + event.getLength() + " bytes.", ContentMode.HTML));
+                    statusLayout.addComponent(
+                            new Label("<b>Name:</b> " + event.getFilename(),
+                                    ContentMode.HTML));
+                    statusLayout.addComponent(
+                            new Label("<b>Mimetype:</b> " + event.getMIMEType(),
+                                    ContentMode.HTML));
+                    statusLayout.addComponent(new Label(
+                            "<b>Size:</b> " + event.getLength() + " bytes.",
+                            ContentMode.HTML));
 
-                    statusLayout.addComponent(new Link("Download "
-                            + buffer.getFileName(), new StreamResource(buffer,
-                            buffer.getFileName())));
+                    statusLayout.addComponent(new Link(
+                            "Download " + buffer.getFileName(),
+                            new StreamResource(buffer, buffer.getFileName())));
 
                     statusLayout.setVisible(true);
                 }
@@ -278,8 +281,8 @@ public class TestForUpload extends CustomComponent implements
             sb.append("/");
             sb.append(up.getUploadSize());
             sb.append(" ");
-            sb.append(Math.round(100 * up.getBytesRead()
-                    / (double) up.getUploadSize()));
+            sb.append(Math.round(
+                    100 * up.getBytesRead() / (double) up.getUploadSize()));
             sb.append("%");
         } else {
             sb.append("Idle");
@@ -288,8 +291,8 @@ public class TestForUpload extends CustomComponent implements
         refreshMemUsage();
     }
 
-    public interface Buffer extends StreamResource.StreamSource,
-            Upload.Receiver {
+    public interface Buffer
+            extends StreamResource.StreamSource, Upload.Receiver {
 
         String getFileName();
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
index 5de80fd833..5a97924417 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
@@ -29,8 +29,8 @@ public class TestForWindowOpen extends CustomComponent {
         final VerticalLayout main = new VerticalLayout();
         setCompositionRoot(main);
 
-        main.addComponent(new Button("Open in this window",
-                new Button.ClickListener() {
+        main.addComponent(
+                new Button("Open in this window", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -46,8 +46,8 @@ public class TestForWindowOpen extends CustomComponent {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        UI.getCurrent().getPage()
-                                .open("http://www.google.com", "mytarget");
+                        UI.getCurrent().getPage().open("http://www.google.com",
+                                "mytarget");
 
                     }
 
@@ -58,8 +58,8 @@ public class TestForWindowOpen extends CustomComponent {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        UI.getCurrent().getPage()
-                                .open("http://www.google.com", "secondtarget");
+                        UI.getCurrent().getPage().open("http://www.google.com",
+                                "secondtarget");
 
                     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
index 02d1e21d5a..eb4c2bf21c 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
@@ -40,8 +40,8 @@ public class TestForWindowing extends CustomComponent {
 
         final VerticalLayout main = new VerticalLayout();
 
-        main.addComponent(new Label(
-                "Click the button to create a new inline window."));
+        main.addComponent(
+                new Label("Click the button to create a new inline window."));
 
         final CheckBox asModal = new CheckBox("As modal");
         main.addComponent(asModal);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
index b8ade0d8b6..d0439a6e3a 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestSetVisibleAndCaching extends
-        com.vaadin.server.LegacyApplication {
+public class TestSetVisibleAndCaching
+        extends com.vaadin.server.LegacyApplication {
 
     Panel panelA = new Panel("Panel A");
     Panel panelB = new Panel("Panel B");
@@ -42,20 +42,19 @@ public class TestSetVisibleAndCaching extends
                 "TestSetVisibleAndCaching");
         setMainWindow(mainWindow);
 
-        panelA.setContent(wrapInPanelLayout(new Label(
-                "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")));
-        panelB.setContent(wrapInPanelLayout(new Label(
-                "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")));
-        panelC.setContent(wrapInPanelLayout(new Label(
-                "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC")));
+        panelA.setContent(wrapInPanelLayout(
+                new Label("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")));
+        panelB.setContent(wrapInPanelLayout(
+                new Label("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")));
+        panelC.setContent(wrapInPanelLayout(
+                new Label("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC")));
 
-        mainWindow
-                .addComponent(new Label(
-                        "Inspect transfered data from server to "
-                                + "client using firebug (http request / response cycles)."
-                                + " See how widgets are re-used,"
-                                + " after each panel is once shown in GUI then"
-                                + " their contents are not resend."));
+        mainWindow.addComponent(
+                new Label("Inspect transfered data from server to "
+                        + "client using firebug (http request / response cycles)."
+                        + " See how widgets are re-used,"
+                        + " after each panel is once shown in GUI then"
+                        + " their contents are not resend."));
         mainWindow.addComponent(buttonNextPanel);
         mainWindow.addComponent(panelA);
         mainWindow.addComponent(panelB);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
index 90b9088f76..cb1b77d6cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
@@ -267,8 +267,8 @@ public class TestSizeableIncomponents extends LegacyApplication {
          * @throws InstantiationException
          * @throws IllegalAccessException
          */
-        public Component getComponent() throws InstantiationException,
-                IllegalAccessException {
+        public Component getComponent()
+                throws InstantiationException, IllegalAccessException {
             Component c = (Component) classToTest.newInstance();
 
             if (c instanceof Button) {
@@ -277,21 +277,24 @@ public class TestSizeableIncomponents extends LegacyApplication {
             if (AbstractSelect.class.isAssignableFrom(c.getClass())) {
                 if (c instanceof Table) {
                     Table new_name = (Table) c;
-                    new_name.setContainerDataSource(TestForTablesInitialColumnWidthLogicRendering
-                            .getTestTable(5, 100).getContainerDataSource());
+                    new_name.setContainerDataSource(
+                            TestForTablesInitialColumnWidthLogicRendering
+                                    .getTestTable(5, 100)
+                                    .getContainerDataSource());
 
                 } else {
                     AbstractSelect new_name = (AbstractSelect) c;
                     Container cont = TestForTablesInitialColumnWidthLogicRendering
                             .getTestTable(2, 8).getContainerDataSource();
                     new_name.setContainerDataSource(cont);
-                    new_name.setItemCaptionPropertyId(cont
-                            .getContainerPropertyIds().iterator().next());
+                    new_name.setItemCaptionPropertyId(
+                            cont.getContainerPropertyIds().iterator().next());
 
                 }
             } else if (c instanceof ComponentContainer) {
                 ComponentContainer new_name = (ComponentContainer) c;
-                new_name.addComponent(new Label("component 1 in test container"));
+                new_name.addComponent(
+                        new Label("component 1 in test container"));
                 new_name.addComponent(new Button("component 2"));
             } else if (c instanceof Embedded) {
                 Embedded em = (Embedded) c;
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index 238e7bf317..1a6f15c068 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
@@ -66,8 +66,8 @@ public class TreeFilesystem extends com.vaadin.server.LegacyApplication
         tree.addListener(this);
 
         // Get sample directory
-        final File sampleDir = SampleDirectory.getDirectory(
-                VaadinSession.getCurrent(), main);
+        final File sampleDir = SampleDirectory
+                .getDirectory(VaadinSession.getCurrent(), main);
         // populate tree's root node with example directory
         if (sampleDir != null) {
             populateNode(sampleDir.getAbsolutePath(), null);
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 7f79bce024..a61055a4b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -41,8 +41,8 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends
-        com.vaadin.server.LegacyApplication implements Listener {
+public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication
+        implements Listener {
 
     // Filesystem explorer panel and it's components
     private final Panel explorerPanel = new Panel("Filesystem explorer");
@@ -56,7 +56,8 @@ public class TreeFilesystemContainer extends
 
     @Override
     public void init() {
-        final LegacyWindow w = new LegacyWindow("Tree FilesystemContainer demo");
+        final LegacyWindow w = new LegacyWindow(
+                "Tree FilesystemContainer demo");
         setMainWindow(w);
         final VerticalLayout main = new VerticalLayout();
         w.setContent(main);
@@ -84,10 +85,11 @@ public class TreeFilesystemContainer extends
         propertyPanel.setEnabled(false);
 
         // Get sample directory
-        final File sampleDir = SampleDirectory.getDirectory(
-                VaadinSession.getCurrent(), w);
+        final File sampleDir = SampleDirectory
+                .getDirectory(VaadinSession.getCurrent(), w);
         // Populate tree with FilesystemContainer
-        final FilesystemContainer fsc = new FilesystemContainer(sampleDir, true);
+        final FilesystemContainer fsc = new FilesystemContainer(sampleDir,
+                true);
         filesystem.setContainerDataSource(fsc);
         // "this" handles all filesystem events
         // e.g. node clicked, expanded etc.
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index 833087029d..d60acea61e 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
@@ -59,9 +59,8 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent {
         for (int j = 0; j < 4; j++) {
             Integer id = new Integer(sequence++);
             Item item = select.addItem(id);
-            item.getItemProperty("CAPTION").setValue(
-                    id.toString() + ": "
-                            + names[random.nextInt() % names.length]);
+            item.getItemProperty("CAPTION").setValue(id.toString() + ": "
+                    + names[random.nextInt() % names.length]);
         }
     }
 
@@ -71,8 +70,8 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent {
             // here could be db insert or other backend operation
             Integer id = new Integer(sequence++);
             Item item = select.addItem(id);
-            item.getItemProperty("CAPTION").setValue(
-                    id.toString() + ": " + newItemCaption);
+            item.getItemProperty("CAPTION")
+                    .setValue(id.toString() + ": " + newItemCaption);
             select.setValue(id);
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
index 85da6d671f..907f1a2846 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
@@ -66,12 +66,13 @@ public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
     public void createExampleTasks() {
         final String[] assignedTo = new String[] { "John", "Mary", "Joe",
                 "Sarah", "Jeff", "Jane", "Peter", "Marc", "Josie", "Linus" };
-        final String[] type = new String[] { "Enhancement", "Bugfix",
-                "Testing", "Task" };
+        final String[] type = new String[] { "Enhancement", "Bugfix", "Testing",
+                "Task" };
         for (int j = 0; j < 100; j++) {
             final Task task = new Task(
                     type[(int) (random.nextDouble() * (type.length - 1))],
-                    assignedTo[(int) (random.nextDouble() * (assignedTo.length - 1))],
+                    assignedTo[(int) (random.nextDouble()
+                            * (assignedTo.length - 1))],
                     random.nextInt(100));
             select.addItem(task);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java
index 99416cfff1..dc09e7cc0c 100644
--- a/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java
+++ b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java
@@ -37,7 +37,7 @@ public class VaadinClasses {
             return null;
         }
     }
-    
+
     public static List<Class<? extends ComponentContainer>> getComponentContainers() {
         try {
             return findClasses(ComponentContainer.class, "com.vaadin.ui");
@@ -73,7 +73,8 @@ public class VaadinClasses {
         try {
             // Given as name to avoid dependencies on testbench source folder
             return (List) findClasses(
-                    Class.forName("com.vaadin.tests.components.AbstractComponentTest"),
+                    Class.forName(
+                            "com.vaadin.tests.components.AbstractComponentTest"),
                     "com.vaadin.tests.components");
         } catch (Exception e) {
             e.printStackTrace();
@@ -96,8 +97,8 @@ public class VaadinClasses {
             try {
                 File f = new File(location.toURI());
                 if (!f.exists()) {
-                    throw new IOException("Directory " + f.toString()
-                            + " does not exist");
+                    throw new IOException(
+                            "Directory " + f.toString() + " does not exist");
                 }
                 findPackages(f, basePackage, baseClass, classes,
                         ignoredPackages);
diff --git a/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java
index 1b21f08aa7..febe483e0e 100644
--- a/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java
@@ -12,8 +12,8 @@ public class VerifyBrowserVersion extends TestBase {
         Label userAgent = new Label(browser.getBrowserApplication());
         userAgent.setId("userAgent");
         addComponent(userAgent);
-        Label touchDevice = new Label("Touch device? "
-                + (browser.isTouchDevice() ? "YES" : "No"));
+        Label touchDevice = new Label(
+                "Touch device? " + (browser.isTouchDevice() ? "YES" : "No"));
         touchDevice.setId("touchDevice");
         addComponent(touchDevice);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
index ec8e48ef64..8fc887b36e 100644
--- a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
@@ -12,7 +12,8 @@ public class ActionsWithoutKeyCode extends AbstractTestUIWithLog {
     protected void setup(VaadinRequest request) {
         LegacyTextField tf = new LegacyTextField();
         tf.setWidth("100%");
-        tf.setInputPrompt("Enter text with å,ä or ä or press windows key while textfield is focused");
+        tf.setInputPrompt(
+                "Enter text with å,ä or ä or press windows key while textfield is focused");
         addComponent(tf);
 
         addActionHandler(new Action.Handler() {
@@ -28,7 +29,8 @@ public class ActionsWithoutKeyCode extends AbstractTestUIWithLog {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 log("action " + action.getCaption() + " triggered by "
                         + sender.getClass().getSimpleName() + " on "
                         + target.getClass().getSimpleName());
diff --git a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
index 936eca147b..ec9b07ac4d 100644
--- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
@@ -34,8 +34,8 @@ public class GAESyncTest extends LegacyApplication {
         // Was this caused by a GAE timeout?
         while (t != null) {
             if (t instanceof DeadlineExceededException) {
-                getMainWindow().showNotification("Bugger!",
-                        "Deadline Exceeded", Notification.TYPE_ERROR_MESSAGE);
+                getMainWindow().showNotification("Bugger!", "Deadline Exceeded",
+                        Notification.TYPE_ERROR_MESSAGE);
                 return;
             }
             t = t.getCause();
@@ -61,8 +61,8 @@ public class GAESyncTest extends LegacyApplication {
             tf.addListener(new Property.ValueChangeListener() {
                 @Override
                 public void valueChange(ValueChangeEvent event) {
-                    IntrWindow.this.showNotification((String) event
-                            .getProperty().getValue());
+                    IntrWindow.this.showNotification(
+                            (String) event.getProperty().getValue());
 
                 }
 
@@ -94,8 +94,8 @@ public class GAESyncTest extends LegacyApplication {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         if (getUI() == getMainWindow()) {
-                            getUI().getPage().showNotification(
-                                    new Notification("main"));
+                            getUI().getPage()
+                                    .showNotification(new Notification("main"));
                             try {
                                 Thread.sleep((5000));
                             } catch (InterruptedException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
index f1548ea6c2..c3ba0adb0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -16,8 +16,8 @@ public class ApplicationCloseTest extends TestBase {
         Label applications = new Label("Applications in session: <br/>",
                 ContentMode.HTML);
         if (getContext() != null) {
-            applications.setValue(applications.getValue() + "App: "
-                    + getContext() + "<br/>");
+            applications.setValue(
+                    applications.getValue() + "App: " + getContext() + "<br/>");
         }
         applications.setValue(applications.getValue() + "<br/><br/>");
 
@@ -46,12 +46,10 @@ public class ApplicationCloseTest extends TestBase {
         long totalUsage = Runtime.getRuntime().totalMemory();
         String totalUsageString = totalUsage / 1000 / 1000 + "MiB";
         Label memoryUsage = new Label(
-                "Using about "
-                        + memoryConsumer.length()
-                        / 1000
-                        / 1000
+                "Using about " + memoryConsumer.length() / 1000 / 1000
                         + "MiB memory for this application.<br/>Total memory usage reported as "
-                        + totalUsageString + "<br/>", ContentMode.HTML);
+                        + totalUsageString + "<br/>",
+                ContentMode.HTML);
 
         addComponent(thisApp);
         addComponent(memoryUsage);
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
index 116ef1c1f2..e93c681131 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
@@ -106,9 +106,9 @@ public class CommErrorEmulatorServlet extends VaadinServlet {
     public void setUIDLResponseCode(final UI ui, int responseCode,
             final int delay) {
         uidlResponseCode.put(ui, responseCode);
-        System.out.println("Responding with " + responseCode
-                + " to UIDL requests for " + ui + " for the next " + delay
-                + "s");
+        System.out.println(
+                "Responding with " + responseCode + " to UIDL requests for "
+                        + ui + " for the next " + delay + "s");
 
         new Thread(new Runnable() {
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
index 379e80ef0e..0f95a7ffcf 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
@@ -98,7 +98,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         vl.setSpacing(true);
         vl.setMargin(true);
         p.setContent(vl);
-        vl.addComponent(createTemporaryResponseCodeSetters("UIDL", uidlResponse));
+        vl.addComponent(
+                createTemporaryResponseCodeSetters("UIDL", uidlResponse));
         vl.addComponent(createTemporaryResponseCodeSetters("Heartbeat",
                 heartbeatResponse));
         vl.addComponent(new Button("Activate", new ClickListener() {
@@ -132,8 +133,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         final LegacyTextField reconnectDialogMessage = new LegacyTextField(
                 "Reconnect message");
         reconnectDialogMessage.setWidth("50em");
-        reconnectDialogMessage.setValue(getReconnectDialogConfiguration()
-                .getDialogText());
+        reconnectDialogMessage
+                .setValue(getReconnectDialogConfiguration().getDialogText());
         reconnectDialogMessage
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -147,8 +148,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
                 "Reconnect gave up message");
         reconnectDialogGaveUpMessage.setWidth("50em");
 
-        reconnectDialogGaveUpMessage.setValue(getReconnectDialogConfiguration()
-                .getDialogTextGaveUp());
+        reconnectDialogGaveUpMessage.setValue(
+                getReconnectDialogConfiguration().getDialogTextGaveUp());
         reconnectDialogGaveUpMessage
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -160,9 +161,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         final LegacyTextField reconnectDialogReconnectAttempts = new LegacyTextField(
                 "Reconnect attempts");
         reconnectDialogReconnectAttempts.setConverter(Integer.class);
-        reconnectDialogReconnectAttempts
-                .setConvertedValue(getReconnectDialogConfiguration()
-                        .getReconnectAttempts());
+        reconnectDialogReconnectAttempts.setConvertedValue(
+                getReconnectDialogConfiguration().getReconnectAttempts());
         reconnectDialogReconnectAttempts
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -175,9 +175,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         final LegacyTextField reconnectDialogReconnectInterval = new LegacyTextField(
                 "Reconnect interval (ms)");
         reconnectDialogReconnectInterval.setConverter(Integer.class);
-        reconnectDialogReconnectInterval
-                .setConvertedValue(getReconnectDialogConfiguration()
-                        .getReconnectInterval());
+        reconnectDialogReconnectInterval.setConvertedValue(
+                getReconnectDialogConfiguration().getReconnectInterval());
         reconnectDialogReconnectInterval
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -191,9 +190,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         final LegacyTextField reconnectDialogGracePeriod = new LegacyTextField(
                 "Reconnect dialog grace period (ms)");
         reconnectDialogGracePeriod.setConverter(Integer.class);
-        reconnectDialogGracePeriod
-                .setConvertedValue(getReconnectDialogConfiguration()
-                        .getDialogGracePeriod());
+        reconnectDialogGracePeriod.setConvertedValue(
+                getReconnectDialogConfiguration().getDialogGracePeriod());
         reconnectDialogGracePeriod
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -206,8 +204,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
 
         final CheckBox reconnectDialogModal = new CheckBox(
                 "Reconnect dialog modality");
-        reconnectDialogModal.setValue(getReconnectDialogConfiguration()
-                .isDialogModal());
+        reconnectDialogModal
+                .setValue(getReconnectDialogConfiguration().isDialogModal());
         reconnectDialogModal.addValueChangeListener(
                 event -> getReconnectDialogConfiguration()
                         .setDialogModal(reconnectDialogModal.getValue()));
@@ -230,11 +228,13 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
         hl.setSpacing(true);
         hl.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT);
         Label l1 = new Label("Respond to " + type + " requests with code");
-        final LegacyTextField responseCode = new LegacyTextField(null, "" + response.code);
+        final LegacyTextField responseCode = new LegacyTextField(null,
+                "" + response.code);
         responseCode.setConverter(Integer.class);
         responseCode.setWidth("5em");
         Label l2 = new Label("for the following");
-        final LegacyTextField timeField = new LegacyTextField(null, "" + response.time);
+        final LegacyTextField timeField = new LegacyTextField(null,
+                "" + response.time);
         timeField.setConverter(Integer.class);
         timeField.setWidth("5em");
         Label l3 = new Label("seconds");
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
index 3d3d84f9bd..2be7bb93cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
@@ -38,8 +38,8 @@ public class ConfirmBrowserTabClose extends AbstractTestUIWithLog {
             }
         });
         addComponent(b);
-        getPage().getJavaScript().eval(
-                "window.addEventListener('beforeunload', function (e) {"
+        getPage().getJavaScript()
+                .eval("window.addEventListener('beforeunload', function (e) {"
                         + "var confirmationMessage = 'Please stay!';"
                         + "e.returnValue = confirmationMessage;"
                         + "return confirmationMessage;" + "});");
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
index 14b4cb62e9..ba1c192172 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
@@ -35,8 +35,8 @@ public class CriticalNotifications extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        systemMessages = VaadinService.getCurrent().getSystemMessages(
-                getLocale(), request);
+        systemMessages = VaadinService.getCurrent()
+                .getSystemMessages(getLocale(), request);
 
         includeDetails = new CheckBox("Include details");
         addComponent(includeDetails);
@@ -137,9 +137,9 @@ public class CriticalNotifications extends AbstractTestUI {
 
         try {
             service.writeStringResponse(response,
-                    JsonConstants.JSON_CONTENT_TYPE, VaadinService
-                            .createCriticalNotificationJSON(caption, message,
-                                    details, url));
+                    JsonConstants.JSON_CONTENT_TYPE,
+                    VaadinService.createCriticalNotificationJSON(caption,
+                            message, details, url));
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java
index 9c95479bec..91fadbf9a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java
@@ -15,8 +15,8 @@ public class DeploymentConfiguration extends AbstractTestUI {
         getLayout().setMargin(new MarginInfo(true, false, false, false));
 
         for (Object key : params.keySet()) {
-            addComponent(new Label(key + ": "
-                    + params.getProperty((String) key)));
+            addComponent(
+                    new Label(key + ": " + params.getProperty((String) key)));
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
index a7c9239fae..b917ccd18d 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
@@ -51,8 +51,8 @@ public class DetachOldUIOnReload extends AbstractTestUIWithLog {
 
     private List<String> getSessionMessages(boolean storeIfNeeded) {
         @SuppressWarnings("unchecked")
-        List<String> messages = (List<String>) getSession().getAttribute(
-                PERSISTENT_MESSAGES_ATTRIBUTE);
+        List<String> messages = (List<String>) getSession()
+                .getAttribute(PERSISTENT_MESSAGES_ATTRIBUTE);
         if (messages == null) {
             messages = new ArrayList<String>();
             if (storeIfNeeded) {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
index 508ac818f6..4d538da9f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
@@ -29,10 +29,11 @@ public class MissingHierarchyDetection extends AbstractTestUI {
     private boolean isChildRendered = true;
     private BrokenCssLayout brokenLayout = new BrokenCssLayout();
 
-    private CssLayout normalLayout = new CssLayout(new Label(
-            "Normal layout child"));
+    private CssLayout normalLayout = new CssLayout(
+            new Label("Normal layout child"));
 
-    public class BrokenCssLayout extends CssLayout implements SelectiveRenderer {
+    public class BrokenCssLayout extends CssLayout
+            implements SelectiveRenderer {
         public BrokenCssLayout() {
             setCaption("Broken layout");
             Label label = new Label("Child component");
@@ -56,8 +57,8 @@ public class MissingHierarchyDetection extends AbstractTestUI {
                 toggle(true);
             }
         }));
-        addComponent(new Button("Toggle improperly",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Toggle improperly", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         toggle(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
index d32ecb583d..1f255652d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
@@ -85,10 +85,10 @@ public class NavigateWithOngoingXHR extends AbstractTestUI {
         });
 
         // Hacky URLs that are might not work in all deployment scenarios
-        addComponent(new Link("Navigate away", new ExternalResource(
-                "slowRequestHandler")));
-        addComponent(new Link("Start download", new ExternalResource(
-                "slowRequestHandler?download")));
+        addComponent(new Link("Navigate away",
+                new ExternalResource("slowRequestHandler")));
+        addComponent(new Link("Start download",
+                new ExternalResource("slowRequestHandler?download")));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
index de45d2bccb..83a8ac3438 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
@@ -23,7 +23,8 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
 @PreserveOnRefresh
-@CustomDeploymentConfiguration({ @Conf(name = "heartbeatInterval", value = "5") })
+@CustomDeploymentConfiguration({
+        @Conf(name = "heartbeatInterval", value = "5") })
 public class PreserveWithExpiredHeartbeat extends AbstractTestUI {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
index 62de2d49c5..4627756e16 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
@@ -26,10 +26,8 @@ public class ReconnectDialogUI extends AbstractTestUIWithLog {
     @Override
     protected void setup(VaadinRequest request) {
         if (request.getParameter("reconnectAttempts") != null) {
-            getReconnectDialogConfiguration()
-                    .setReconnectAttempts(
-                            Integer.parseInt(request
-                                    .getParameter("reconnectAttempts")));
+            getReconnectDialogConfiguration().setReconnectAttempts(Integer
+                    .parseInt(request.getParameter("reconnectAttempts")));
         }
         Button b = new Button("Say hello");
         b.addClickListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java
index e7f81167d9..a6773c201e 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java
@@ -20,7 +20,8 @@ public class RefreshStatePreserve extends AbstractTestUIWithLog {
         getPage().addUriFragmentChangedListener(
                 new UriFragmentChangedListener() {
                     @Override
-                    public void uriFragmentChanged(UriFragmentChangedEvent event) {
+                    public void uriFragmentChanged(
+                            UriFragmentChangedEvent event) {
                         log("Fragment changed to " + event.getUriFragment());
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
index bc6ef22c9a..2e76ed460e 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
@@ -40,8 +40,8 @@ public class ResynchronizeAfterAsyncRemoval extends AbstractTestUIWithLog {
             public void buttonClick(ClickEvent event) {
                 log("Window removed: " + (window.getParent() == null));
 
-                boolean dirty = getUI().getConnectorTracker().isDirty(
-                        event.getButton());
+                boolean dirty = getUI().getConnectorTracker()
+                        .isDirty(event.getButton());
                 log("Dirty: " + dirty);
             }
         }));
@@ -69,8 +69,8 @@ public class ResynchronizeAfterAsyncRemoval extends AbstractTestUIWithLog {
     private Map<Integer, Set<String>> getUnregisterIdMap() {
         try {
             ConnectorTracker tracker = getConnectorTracker();
-            Field field = tracker.getClass().getDeclaredField(
-                    "syncIdToUnregisteredConnectorIds");
+            Field field = tracker.getClass()
+                    .getDeclaredField("syncIdToUnregisteredConnectorIds");
             field.setAccessible(true);
             return (Map<Integer, Set<String>>) field.get(tracker);
         } catch (Exception e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
index c8fc96f596..832637e641 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
@@ -31,15 +31,14 @@ public class VaadinSessionAttribute extends AbstractTestUI {
         getSession().setAttribute(ATTR_NAME, Integer.valueOf(42));
         getSession().setAttribute(Integer.class, Integer.valueOf(42 * 2));
 
-        addComponent(new Button("Show attribute values",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Show attribute values", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Notification notification = new Notification(
-                                getSession().getAttribute(ATTR_NAME)
-                                        + " & "
-                                        + getSession().getAttribute(
-                                                Integer.class));
+                                getSession().getAttribute(ATTR_NAME) + " & "
+                                        + getSession()
+                                                .getAttribute(Integer.class));
                         notification.setDelayMsec(Notification.DELAY_FOREVER);
                         notification.show(getPage());
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java
index 52d61c89c9..b591635a73 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java
@@ -17,10 +17,12 @@ public class WebBrowserTimeZone extends AbstractTestUI {
 
         final Label offsetLabel = addLabel("Browser offset");
         final Label rawOffsetLabel = addLabel("Browser raw offset");
-        final Label dstDiffLabel = addLabel("Difference between raw offset and DST");
+        final Label dstDiffLabel = addLabel(
+                "Difference between raw offset and DST");
         final Label dstInEffectLabel = addLabel("Is DST currently active?");
         final Label curDateLabel = addLabel("Current date in the browser");
-        final Label diffLabel = addLabel("Browser to Europe/Helsinki offset difference");
+        final Label diffLabel = addLabel(
+                "Browser to Europe/Helsinki offset difference");
         final Label containsLabel = addLabel("Browser could be in Helsinki");
 
         addButton("Get TimeZone from browser", new Button.ClickListener() {
@@ -40,10 +42,10 @@ public class WebBrowserTimeZone extends AbstractTestUI {
                 rawOffsetLabel.setValue(String.valueOf(browserRawOffset));
                 diffLabel.setValue(String.valueOf(browserOffset - hkiOffset));
                 containsLabel.setValue(contains ? "Yes" : "No");
-                dstDiffLabel.setValue(String.valueOf(getBrowser()
-                        .getDSTSavings()));
-                dstInEffectLabel.setValue(getBrowser().isDSTInEffect() ? "Yes"
-                        : "No");
+                dstDiffLabel
+                        .setValue(String.valueOf(getBrowser().getDSTSavings()));
+                dstInEffectLabel
+                        .setValue(getBrowser().isDSTInEffect() ? "Yes" : "No");
                 curDateLabel.setValue(getBrowser().getCurrentDate().toString());
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 93e9464054..fc1d249e26 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
@@ -19,8 +19,8 @@ public class ChangeSessionId extends AbstractTestCase {
         LegacyWindow mainWindow = new LegacyWindow("Sestest Application");
         mainWindow.addComponent(log);
         mainWindow.addComponent(loginButton);
-        mainWindow.addComponent(new Button("Show session id",
-                new Button.ClickListener() {
+        mainWindow.addComponent(
+                new Button("Show session id", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -33,8 +33,8 @@ public class ChangeSessionId extends AbstractTestCase {
             @Override
             public void buttonClick(ClickEvent event) {
                 String oldSessionId = getSessionId();
-                VaadinService.reinitializeSession(VaadinService
-                        .getCurrentRequest());
+                VaadinService
+                        .reinitializeSession(VaadinService.getCurrentRequest());
                 String newSessionId = getSessionId();
                 if (oldSessionId.equals(newSessionId)) {
                     log.log("FAILED! Both old and new session id is "
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
index cca76cc9e3..252f5a8318 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
@@ -56,7 +56,8 @@ public class CloseSession extends AbstractTestUI {
         String oldSessionId = request.getParameter(OLD_SESSION_ID_PARAM);
         if (oldSessionId != null) {
             log.log("Old WrappedSession id: " + oldSessionId);
-            log.log("Same WrappedSession id? " + oldSessionId.equals(sessionId));
+            log.log("Same WrappedSession id? "
+                    + oldSessionId.equals(sessionId));
         }
 
         // Add parameters to help see what has changed
@@ -65,16 +66,18 @@ public class CloseSession extends AbstractTestUI {
                 + OLD_SESSION_ID_PARAM + "=" + sessionId;
 
         addComponent(log);
-        addComponent(new Button(
-                "Close VaadinServiceSession and redirect elsewhere",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        // Assuming Vaadin is deployed to the root context
-                        getPage().setLocation("/statictestfiles/static.html");
-                        getSession().close();
-                    }
-                }));
+        addComponent(
+                new Button("Close VaadinServiceSession and redirect elsewhere",
+                        new Button.ClickListener() {
+                            @Override
+                            public void buttonClick(ClickEvent event) {
+                                // Assuming Vaadin is deployed to the root
+                                // context
+                                getPage().setLocation(
+                                        "/statictestfiles/static.html");
+                                getSession().close();
+                            }
+                        }));
         addComponent(new Button("Close VaadinServiceSession and reopen page",
                 new Button.ClickListener() {
                     @Override
@@ -106,8 +109,7 @@ public class CloseSession extends AbstractTestUI {
                         getPage().setLocation(reopenUrl);
                     }
                 }));
-        addComponent(new Button(
-                "Invalidate HttpSession and redirect elsewhere",
+        addComponent(new Button("Invalidate HttpSession and redirect elsewhere",
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -116,14 +118,13 @@ public class CloseSession extends AbstractTestUI {
                         getPage().setLocation("/statictestfiles/static.html");
                     }
                 }));
-        addComponent(new Button(
-                "Invalidate HttpSession in a background thread",
+        addComponent(new Button("Invalidate HttpSession in a background thread",
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         final HttpSession session = ((WrappedHttpSession) VaadinService
                                 .getCurrentRequest().getWrappedSession())
-                                .getHttpSession();
+                                        .getHttpSession();
                         Thread t = new Thread(new Runnable() {
 
                             @Override
@@ -133,12 +134,12 @@ public class CloseSession extends AbstractTestUI {
                                 } catch (InterruptedException e) {
                                     e.printStackTrace();
                                 }
-                                System.out
-                                        .println("Invalidating session from thread "
+                                System.out.println(
+                                        "Invalidating session from thread "
                                                 + session.getId());
                                 session.invalidate();
-                                System.out
-                                        .println("Invalidated session from thread "
+                                System.out.println(
+                                        "Invalidated session from thread "
                                                 + session.getId());
 
                             }
@@ -164,9 +165,10 @@ public class CloseSession extends AbstractTestUI {
         log.log("Detach of " + this + " (" + getUIId() + ")");
         boolean correctUI = (UI.getCurrent() == this);
         boolean correctPage = (Page.getCurrent() == getPage());
-        boolean correctVaadinSession = (VaadinSession.getCurrent() == getSession());
-        boolean correctVaadinService = (VaadinService.getCurrent() == getSession()
-                .getService());
+        boolean correctVaadinSession = (VaadinSession
+                .getCurrent() == getSession());
+        boolean correctVaadinService = (VaadinService
+                .getCurrent() == getSession().getService());
         log.log("UI.current correct in detach: " + correctUI);
         log.log("Page.current correct in detach: " + correctPage);
         log.log("VaadinSession.current correct in detach: "
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
index 8f2cddd529..69c6b673c5 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
@@ -120,9 +120,10 @@ public class CloseUI extends AbstractTestUIWithLog {
         log("Detach of " + this + " (" + getUIId() + ")");
         boolean correctUI = (UI.getCurrent() == this);
         boolean correctPage = (Page.getCurrent() == getPage());
-        boolean correctVaadinSession = (VaadinSession.getCurrent() == getSession());
-        boolean correctVaadinService = (VaadinService.getCurrent() == getSession()
-                .getService());
+        boolean correctVaadinSession = (VaadinSession
+                .getCurrent() == getSession());
+        boolean correctVaadinService = (VaadinService
+                .getCurrent() == getSession().getService());
         log("UI.current correct in detach: " + correctUI);
         log("Page.current correct in detach: " + correctPage);
         log("VaadinSession.current correct in detach: " + correctVaadinSession);
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
index 8ae7715a77..783635ec82 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
@@ -34,9 +34,8 @@ public class CustomDeploymentConf extends AbstractTestUI {
                 .getService().getDeploymentConfiguration();
         addComponent(new Label("Resource cache time: "
                 + deploymentConfiguration.getResourceCacheTime()));
-        addComponent(new Label("Custom config param: "
-                + deploymentConfiguration.getApplicationOrSystemProperty(
-                        "customParam", null)));
+        addComponent(new Label("Custom config param: " + deploymentConfiguration
+                .getApplicationOrSystemProperty("customParam", null)));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
index d398ead622..1f74c995ed 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
@@ -21,7 +21,8 @@ import com.vaadin.server.Constants;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 
-@CustomDeploymentConfiguration({ @Conf(name = Constants.SERVLET_PARAMETER_SENDURLSASPARAMETERS, value = "false") })
+@CustomDeploymentConfiguration({
+        @Conf(name = Constants.SERVLET_PARAMETER_SENDURLSASPARAMETERS, value = "false") })
 public class DisableSendUrlAsParameters extends AbstractTestUIWithLog {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
index d033443a2c..60c4ce969b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
@@ -26,9 +26,8 @@ import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
 import com.vaadin.ui.themes.BaseTheme;
 
-public abstract class AbstractComponentTest<T extends AbstractComponent>
-        extends AbstractComponentTestCase<T> implements FocusListener,
-        BlurListener {
+public abstract class AbstractComponentTest<T extends AbstractComponent> extends
+        AbstractComponentTestCase<T> implements FocusListener, BlurListener {
 
     protected static final String TEXT_SHORT = "Short";
     protected static final String TEXT_MEDIUM = "This is a semi-long text that might wrap.";
@@ -217,8 +216,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         try {
             return getTestClass().newInstance();
         } catch (Exception e) {
-            throw new RuntimeException("Failed to instantiate "
-                    + getTestClass(), e);
+            throw new RuntimeException(
+                    "Failed to instantiate " + getTestClass(), e);
         }
     }
 
@@ -227,7 +226,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
      * when overriding.
      */
     protected void createActions() {
-        createBooleanAction("Immediate", CATEGORY_STATE, true, immediateCommand);
+        createBooleanAction("Immediate", CATEGORY_STATE, true,
+                immediateCommand);
         createBooleanAction("Enabled", CATEGORY_STATE, true, enabledCommand);
         createBooleanAction("Readonly", CATEGORY_STATE, false, readonlyCommand);
         createBooleanAction("Visible", CATEGORY_STATE, true, visibleCommand);
@@ -299,7 +299,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
             createSelectAction("Tab index", "State", tabIndexes, "0",
                     new Command<T, Integer>() {
                         @Override
-                        public void execute(T c, Integer tabIndex, Object data) {
+                        public void execute(T c, Integer tabIndex,
+                                Object data) {
                             ((Focusable) c).setTabIndex(tabIndex);
                         }
                     });
@@ -356,8 +357,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
     }
 
     private void createCaptionSelect(String category) {
-        createSelectAction("Caption", category, createCaptionOptions(),
-                "Short", captionCommand);
+        createSelectAction("Caption", category, createCaptionOptions(), "Short",
+                captionCommand);
 
     }
 
@@ -429,14 +430,13 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         doCommand(caption, command, initialState, data);
     }
 
-    protected <DATATYPE> void createClickAction(String caption,
-            String category, final Command<T, DATATYPE> command, DATATYPE value) {
+    protected <DATATYPE> void createClickAction(String caption, String category,
+            final Command<T, DATATYPE> command, DATATYPE value) {
         createClickAction(caption, category, command, value, null);
     }
 
-    protected <DATATYPE> void createClickAction(String caption,
-            String category, final Command<T, DATATYPE> command,
-            DATATYPE value, Object data) {
+    protected <DATATYPE> void createClickAction(String caption, String category,
+            final Command<T, DATATYPE> command, DATATYPE value, Object data) {
         MenuItem categoryItem = getCategoryMenuItem(category);
         categoryItem.addItem(caption, menuClickCommand(command, value, data));
     }
@@ -484,8 +484,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
 
     protected void removeCategory(String categoryId) {
         if (!hasCategory(categoryId)) {
-            throw new IllegalArgumentException("Category '" + categoryId
-                    + "' does not exist");
+            throw new IllegalArgumentException(
+                    "Category '" + categoryId + "' does not exist");
         }
 
         MenuItem item = getCategoryMenuItem(categoryId);
@@ -511,7 +511,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
             @Override
             public void menuSelected(MenuItem selectedItem) {
                 boolean selected = !isSelected(selectedItem);
-                doCommand(getText(selectedItem), booleanCommand, selected, data);
+                doCommand(getText(selectedItem), booleanCommand, selected,
+                        data);
                 setSelected(selectedItem, selected);
             }
 
@@ -551,8 +552,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
             public void menuSelected(MenuItem selectedItem) {
                 doCommand(getText(selectedItem), cmd, object, data);
 
-                if (parentOfSelectableMenuItem.contains(selectedItem
-                        .getParent())) {
+                if (parentOfSelectableMenuItem
+                        .contains(selectedItem.getParent())) {
                     unselectChildren(selectedItem.getParent());
                     setSelected(selectedItem, true);
                 }
@@ -593,22 +594,16 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         return item.getParent() == mainMenu;
     }
 
-    protected <TYPE> void createSelectAction(
-            String caption,
-            String category,
-            LinkedHashMap<String, TYPE> options,
-            String initialValue,
+    protected <TYPE> void createSelectAction(String caption, String category,
+            LinkedHashMap<String, TYPE> options, String initialValue,
             com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command) {
         createSelectAction(caption, category, options, initialValue, command,
                 null);
 
     }
 
-    protected <TYPE extends Enum<TYPE>> void createSelectAction(
-            String caption,
-            String category,
-            Class<TYPE> enumType,
-            TYPE initialValue,
+    protected <TYPE extends Enum<TYPE>> void createSelectAction(String caption,
+            String category, Class<TYPE> enumType, TYPE initialValue,
             com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command) {
         LinkedHashMap<String, TYPE> options = new LinkedHashMap<String, TYPE>();
         for (TYPE value : EnumSet.allOf(enumType)) {
@@ -618,10 +613,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
                 command);
     }
 
-    protected <TYPE> void createMultiClickAction(
-            String caption,
-            String category,
-            LinkedHashMap<String, TYPE> options,
+    protected <TYPE> void createMultiClickAction(String caption,
+            String category, LinkedHashMap<String, TYPE> options,
             com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command,
             Object data) {
 
@@ -629,16 +622,14 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         MenuItem mainItem = categoryItem.addItem(caption, null);
 
         for (String option : options.keySet()) {
-            MenuBar.Command cmd = menuClickCommand(command,
-                    options.get(option), data);
+            MenuBar.Command cmd = menuClickCommand(command, options.get(option),
+                    data);
             mainItem.addItem(option, cmd);
         }
     }
 
-    protected <TYPE> void createMultiToggleAction(
-            String caption,
-            String category,
-            LinkedHashMap<String, TYPE> options,
+    protected <TYPE> void createMultiToggleAction(String caption,
+            String category, LinkedHashMap<String, TYPE> options,
             com.vaadin.tests.components.ComponentTestCase.Command<T, Boolean> command,
             boolean defaultValue) {
 
@@ -652,10 +643,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
                 defaultValues);
     }
 
-    protected <TYPE> void createMultiToggleAction(
-            String caption,
-            String category,
-            LinkedHashMap<String, TYPE> options,
+    protected <TYPE> void createMultiToggleAction(String caption,
+            String category, LinkedHashMap<String, TYPE> options,
             com.vaadin.tests.components.ComponentTestCase.Command<T, Boolean> command,
             LinkedHashMap<String, Boolean> defaultValues) {
 
@@ -668,11 +657,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         }
     }
 
-    protected <TYPE> void createSelectAction(
-            String caption,
-            String category,
-            LinkedHashMap<String, TYPE> options,
-            String initialValue,
+    protected <TYPE> void createSelectAction(String caption, String category,
+            LinkedHashMap<String, TYPE> options, String initialValue,
             com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command,
             Object data) {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java
index 56c04180b8..525e28b41d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java
@@ -10,8 +10,8 @@ import com.vaadin.ui.Layout.AlignmentHandler;
 import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.Layout.SpacingHandler;
 
-public abstract class AbstractLayoutTest<T extends AbstractLayout> extends
-        AbstractComponentContainerTest<T> {
+public abstract class AbstractLayoutTest<T extends AbstractLayout>
+        extends AbstractComponentContainerTest<T> {
 
     protected static final String CATEGORY_LAYOUT_FEATURES = "Layout features";
     private Command<T, MarginInfo> marginCommand = new Command<T, MarginInfo>() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
index 1d18cba952..b345414459 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
@@ -15,7 +15,8 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout>
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((LayoutClickListener) AbstractOrderedLayoutTest.this);
+                c.addListener(
+                        (LayoutClickListener) AbstractOrderedLayoutTest.this);
             } else {
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
index 33ff504d8d..61b3417d8c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
@@ -97,13 +97,12 @@ public abstract class AbstractTestUI extends UI {
         long currentWidgetsetTimestamp = currentWidgetsetFolder.lastModified();
         int halfHour = 30 * 60 * 1000;
         if (currentWidgetsetTimestamp + halfHour < newestWidgetsetTimestamp) {
-            Notification
-                    .show("The currently used widgetset ("
-                            + usedWidgetset
+            Notification.show(
+                    "The currently used widgetset (" + usedWidgetset
                             + ") was compiled long before the most recently compiled one ("
                             + newestWidgetsetName
                             + "). Are you sure you have compiled the right widgetset?",
-                            Type.WARNING_MESSAGE);
+                    Type.WARNING_MESSAGE);
         }
     }
 
@@ -185,7 +184,8 @@ public abstract class AbstractTestUI extends UI {
         getLayout().removeComponent(c);
     }
 
-    public void replaceComponent(Component oldComponent, Component newComponent) {
+    public void replaceComponent(Component oldComponent,
+            Component newComponent) {
         getLayout().replaceComponent(oldComponent, newComponent);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index b5a8384ff1..63184ed290 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
@@ -29,8 +29,9 @@ public class AddRemoveSetStyleNamesTest extends TestBase {
             @Override
             public void buttonClick(ClickEvent event) {
                 String style = (String) event.getButton().getData();
-                setComponentsStyle(style, !popupDateField.getStyleName()
-                        .contains(style), event.getButton());
+                setComponentsStyle(style,
+                        !popupDateField.getStyleName().contains(style),
+                        event.getButton());
             }
         };
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
index 323705f466..26da622f76 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
@@ -17,8 +17,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.NativeSelect;
 
-public abstract class ComponentTestCase<T extends AbstractComponent> extends
-        AbstractComponentTestCase<T> {
+public abstract class ComponentTestCase<T extends AbstractComponent>
+        extends AbstractComponentTestCase<T> {
 
     protected static final Object CAPTION = "caption";
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
index 568c484760..c5505699f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
@@ -155,8 +155,8 @@ public class DeclarativeTestUI extends AbstractTestUI {
         try {
             return (T) component;
         } catch (ClassCastException ex) {
-            getLogger().log(Level.SEVERE,
-                    "Component code/design type mismatch", ex);
+            getLogger().log(Level.SEVERE, "Component code/design type mismatch",
+                    ex);
         }
         return null;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java
index cd284224a0..95f3138e69 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java
@@ -70,13 +70,13 @@ public class DisableEnableCascade extends TestBase {
         if (target.isEnabled()) {
             target.setEnabled(false);
             button.setCaption(button.getCaption().replace("Disable", "Enable"));
-            target.setCaption(target.getCaption()
-                    .replace("enabled", "disabled"));
+            target.setCaption(
+                    target.getCaption().replace("enabled", "disabled"));
         } else {
             target.setEnabled(true);
             button.setCaption(button.getCaption().replace("Enable", "Disable"));
-            target.setCaption(target.getCaption()
-                    .replace("disabled", "enabled"));
+            target.setCaption(
+                    target.getCaption().replace("disabled", "enabled"));
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index 6942eb31e5..4df1c3094f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
@@ -36,7 +36,8 @@ public class DisableEnableCascadeStyles extends TestBase {
 
         button = new Button("Button, enabled");
         nativeButton = new NativeButton("NativeButton, enabled");
-        textField = new LegacyTextField("TextField with caption and value, enabled");
+        textField = new LegacyTextField(
+                "TextField with caption and value, enabled");
         textField.setValue("Text");
         textArea = new TextArea("TextArea with caption and value, enabled");
         textArea.setValue("Text");
@@ -101,15 +102,13 @@ public class DisableEnableCascadeStyles extends TestBase {
                             }
                         }
                         if (layout.getComponent(0).isEnabled()) {
-                            enableDisableComponentsButton
-                                    .setCaption(enableDisableComponentsButton
-                                            .getCaption().replace("Enable",
-                                                    "Disable"));
+                            enableDisableComponentsButton.setCaption(
+                                    enableDisableComponentsButton.getCaption()
+                                            .replace("Enable", "Disable"));
                         } else {
-                            enableDisableComponentsButton
-                                    .setCaption(enableDisableComponentsButton
-                                            .getCaption().replace("Disable",
-                                                    "Enable"));
+                            enableDisableComponentsButton.setCaption(
+                                    enableDisableComponentsButton.getCaption()
+                                            .replace("Disable", "Enable"));
                         }
                     }
                 });
@@ -123,13 +122,13 @@ public class DisableEnableCascadeStyles extends TestBase {
         if (target.isEnabled()) {
             target.setEnabled(false);
             button.setCaption(button.getCaption().replace("Disable", "Enable"));
-            target.setCaption(target.getCaption()
-                    .replace("enabled", "disabled"));
+            target.setCaption(
+                    target.getCaption().replace("enabled", "disabled"));
         } else {
             target.setEnabled(true);
             button.setCaption(button.getCaption().replace("Enable", "Disable"));
-            target.setCaption(target.getCaption()
-                    .replace("disabled", "enabled"));
+            target.setCaption(
+                    target.getCaption().replace("disabled", "enabled"));
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
index 15e89e1fd5..9cddbeb28b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
@@ -20,7 +20,8 @@ public class ErrorMessages extends TestBase {
         bb.setComponentError(new CompositeErrorMessage(errors));
         addComponent(bb);
 
-        LegacyTextField tf = new LegacyTextField("", "Textfield with UserError");
+        LegacyTextField tf = new LegacyTextField("",
+                "Textfield with UserError");
         tf.setComponentError(new UserError("This is a failure"));
         addComponent(tf);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
index b1379080e9..30e798e5f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
@@ -99,14 +99,14 @@ public class FileDownloaderUI extends AbstractTestUIWithLog {
         addComponents("Class resource pdf", resource, components);
 
         Button downloadUtf8File = new Button("Download UTF-8 named file");
-        FileDownloader fd = new FileDownloader(new ClassResource(
-                new EmbeddedPdf().getClass(), "åäö-日本語.pdf"));
+        FileDownloader fd = new FileDownloader(
+                new ClassResource(new EmbeddedPdf().getClass(), "åäö-日本語.pdf"));
         fd.setOverrideContentType(false);
         fd.extend(downloadUtf8File);
         addComponent(downloadUtf8File);
 
-        addComponent(new Button("Remove first download button",
-                new ClickListener() {
+        addComponent(
+                new Button("Remove first download button", new ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -115,18 +115,18 @@ public class FileDownloaderUI extends AbstractTestUIWithLog {
                         parent.removeComponent(firstDownloadComponent);
                     }
                 }));
-        addComponent(new Button(
-                "Detach FileDownloader from first download button",
-                new ClickListener() {
-
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        FileDownloader e = (FileDownloader) firstDownloadComponent
-                                .getExtensions().iterator().next();
-                        e.remove();
-                        log("FileDownload detached");
-                    }
-                }));
+        addComponent(
+                new Button("Detach FileDownloader from first download button",
+                        new ClickListener() {
+
+                            @Override
+                            public void buttonClick(ClickEvent event) {
+                                FileDownloader e = (FileDownloader) firstDownloadComponent
+                                        .getExtensions().iterator().next();
+                                e.remove();
+                                log("FileDownload detached");
+                            }
+                        }));
     }
 
     public void addComponents(String caption, ConnectorResource resource,
@@ -142,8 +142,8 @@ public class FileDownloaderUI extends AbstractTestUIWithLog {
 
                 c.setId(cls.getName() + caption.replace(" ", ""));
                 c.setCaption(cls.getName());
-                c.setDescription(resource.getMIMEType() + " / "
-                        + resource.getClass());
+                c.setDescription(
+                        resource.getMIMEType() + " / " + resource.getClass());
                 c.setWidth("100px");
                 c.setHeight("100px");
 
@@ -180,8 +180,8 @@ public class FileDownloaderUI extends AbstractTestUIWithLog {
             }
             BufferedImage bi = getImage(text);
             response.setContentType("image/png");
-            response.setHeader("Content-Disposition", "attachment; filename=\""
-                    + path + "\"");
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=\"" + path + "\"");
             ImageIO.write(bi, "png", response.getOutputStream());
 
             return true;
@@ -193,16 +193,16 @@ public class FileDownloaderUI extends AbstractTestUIWithLog {
     private BufferedImage getImage(String text) {
         BufferedImage bi = new BufferedImage(150, 30,
                 BufferedImage.TYPE_3BYTE_BGR);
-        bi.getGraphics()
-                .drawChars(text.toCharArray(), 0, text.length(), 10, 20);
+        bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), 10,
+                20);
         return bi;
     }
 
     private BufferedImage getImage2(String text) {
         BufferedImage bi = new BufferedImage(200, 200,
                 BufferedImage.TYPE_INT_RGB);
-        bi.getGraphics()
-                .drawChars(text.toCharArray(), 0, text.length(), 10, 20);
+        bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), 10,
+                20);
         return bi;
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
index 83d45f1545..59e79c96b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
@@ -13,8 +13,8 @@ public class FocusFromShortcutAction extends TestBase {
 
     @Override
     protected void setup() {
-        final Select select = new Select("Select", Arrays.asList("Option 1",
-                "Option 2"));
+        final Select select = new Select("Select",
+                Arrays.asList("Option 1", "Option 2"));
         final LegacyTextField text = new LegacyTextField("Text");
 
         addComponent(select);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index e118558528..9d2689810b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
@@ -22,8 +22,8 @@ public class LayoutAttachListenerInfo extends TestBase {
     @Override
     protected void setup() {
 
-        OptionGroup layouts = new OptionGroup("Layouts", Arrays.asList(
-                "AbsoluteLayout", "OrderedLayout", "GridLayout"));
+        OptionGroup layouts = new OptionGroup("Layouts",
+                Arrays.asList("AbsoluteLayout", "OrderedLayout", "GridLayout"));
         layouts.select("AbsoluteLayout");
         layouts.setImmediate(true);
         layouts.addValueChangeListener(new ValueChangeListener() {
@@ -34,7 +34,8 @@ public class LayoutAttachListenerInfo extends TestBase {
                 } else if (event.getProperty().getValue()
                         .equals("OrderedLayout")) {
                     testOrderedLayout();
-                } else if (event.getProperty().getValue().equals("GridLayout")) {
+                } else if (event.getProperty().getValue()
+                        .equals("GridLayout")) {
                     testGridLayout();
                 }
             }
@@ -66,7 +67,8 @@ public class LayoutAttachListenerInfo extends TestBase {
         a.setHeight("300px");
         a.addComponentAttachListener(new ComponentAttachListener() {
             @Override
-            public void componentAttachedToContainer(ComponentAttachEvent event) {
+            public void componentAttachedToContainer(
+                    ComponentAttachEvent event) {
                 AbsoluteLayout layout = (AbsoluteLayout) event.getContainer();
                 AbsoluteLayout.ComponentPosition position = layout
                         .getPosition(event.getAttachedComponent());
@@ -95,12 +97,12 @@ public class LayoutAttachListenerInfo extends TestBase {
         v.setHeight("300px");
         v.addComponentAttachListener(new ComponentAttachListener() {
             @Override
-            public void componentAttachedToContainer(ComponentAttachEvent event) {
+            public void componentAttachedToContainer(
+                    ComponentAttachEvent event) {
                 VerticalLayout layout = (VerticalLayout) event.getContainer();
                 getMainWindow().showNotification(
-                        "Attached to index "
-                                + layout.getComponentIndex(event
-                                        .getAttachedComponent()),
+                        "Attached to index " + layout.getComponentIndex(
+                                event.getAttachedComponent()),
                         Notification.TYPE_ERROR_MESSAGE);
             }
         });
@@ -125,10 +127,11 @@ public class LayoutAttachListenerInfo extends TestBase {
         g.setHideEmptyRowsAndColumns(true);
         g.addComponentAttachListener(new ComponentAttachListener() {
             @Override
-            public void componentAttachedToContainer(ComponentAttachEvent event) {
+            public void componentAttachedToContainer(
+                    ComponentAttachEvent event) {
                 GridLayout layout = (GridLayout) event.getContainer();
-                GridLayout.Area area = layout.getComponentArea(event
-                        .getAttachedComponent());
+                GridLayout.Area area = layout
+                        .getComponentArea(event.getAttachedComponent());
                 getMainWindow().showNotification(
                         "Attached to " + area.getColumn1() + ","
                                 + area.getRow1(),
diff --git a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
index 9f63970f85..39329d7341 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
@@ -75,8 +75,8 @@ public class NoLayoutUpdateWhichNeedsLayout extends UI {
                 w = new Window("test");
                 w.setWidth("300px");
                 w.setHeight("300px");
-                w.setContent(new VerticalLayout(new Label(
-                        "simple test label component")));
+                w.setContent(new VerticalLayout(
+                        new Label("simple test label component")));
                 w.center();
                 getUI().addWindow(w);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
index a38f9c274e..6a9ef2a034 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
@@ -9,13 +9,11 @@ public class TooltipsOnScrollingWindow extends TestBase {
     @Override
     protected void setup() {
 
-        TestUtils
-                .injectCSS(
-                        getMainWindow(),
-                        ".v-generated-body { overflow: auto; } "
-                                + ".v-app, .v-ui { overflow: visible !important;}"
-                                + ".hoverable-label { position: fixed; bottom: 10px; right: 10px;  }"
-                                + ".hidden-label { position: absolute; top: 2000px; left: 2000px;}");
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-generated-body { overflow: auto; } "
+                        + ".v-app, .v-ui { overflow: visible !important;}"
+                        + ".hoverable-label { position: fixed; bottom: 10px; right: 10px;  }"
+                        + ".hidden-label { position: absolute; top: 2000px; left: 2000px;}");
 
         getLayout().getParent().setHeight("4000px");
         getLayout().getParent().setWidth("4000px");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
index 1af1cc82e9..691f93b09e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
@@ -49,16 +49,14 @@ public class TouchScrollables extends TestBase {
         addTest(getAccordionTest());
         addTest(getSubWindowTest());
 
-        TestUtils
-                .injectCSS(
-                        getLayout().getUI(),
-                        "body * {-webkit-user-select: none;} .v-table-row-drag-middle .v-table-cell-content {"
-                                + "        background-color: inherit ; border-bottom: 1px solid cyan;"
-                                + "}"
-                                + ".v-table-row-drag-middle .v-table-cell-wrapper {"
-                                + "        margin-bottom: -1px;" + "}" + ""
-
-                );
+        TestUtils.injectCSS(getLayout().getUI(),
+                "body * {-webkit-user-select: none;} .v-table-row-drag-middle .v-table-cell-content {"
+                        + "        background-color: inherit ; border-bottom: 1px solid cyan;"
+                        + "}"
+                        + ".v-table-row-drag-middle .v-table-cell-wrapper {"
+                        + "        margin-bottom: -1px;" + "}" + ""
+
+        );
     }
 
     private Component getPanelTest() {
@@ -200,7 +198,8 @@ public class TouchScrollables extends TestBase {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show(action.getCaption());
 
             }
@@ -239,7 +238,8 @@ public class TouchScrollables extends TestBase {
                 IndexedContainer containerDataSource = (IndexedContainer) table
                         .getContainerDataSource();
                 int newIndex = containerDataSource.indexOfId(itemIdOver) - 1;
-                if (dropTargetData.getDropLocation() != VerticalDropLocation.TOP) {
+                if (dropTargetData
+                        .getDropLocation() != VerticalDropLocation.TOP) {
                     newIndex++;
                 }
                 if (newIndex < 0) {
@@ -296,8 +296,8 @@ public class TouchScrollables extends TestBase {
         for (int i = 0; i < 40; i++) {
             Item addItem = table.addItem("Item" + i);
             Person p = testData.getIdByIndex(i);
-            addItem.getItemProperty("Name").setValue(
-                    p.getFirstName() + " " + p.getLastName());
+            addItem.getItemProperty("Name")
+                    .setValue(p.getFirstName() + " " + p.getLastName());
             addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60));
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
index 1d72bdf5d5..ac5ec79dea 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
@@ -89,8 +89,8 @@ public class AbsoluteLayoutHideComponent extends AbstractTestUI {
         // =====> THIS CODE generates error
         // WITHOUT THIS CODE works fine
 
-        Embedded e = new Embedded("", new ThemeResource(
-                "../runo/icons/64/ok.png"));
+        Embedded e = new Embedded("",
+                new ThemeResource("../runo/icons/64/ok.png"));
         // e.setMimeType("image/jpg");
         e.setWidth("100%");
         e.setHeight("100%");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
index 4e1c8f5ca2..8570d76f54 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
@@ -36,8 +36,8 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         HorizontalLayout level1 = new HorizontalLayout(
                 createComparisonTableOnFixed(), createTableOnFixed(),
-                createHalfTableOnFixed(),
-                createHalfTableAndFixedTableOnFixed(), createHalfTableOnFull());
+                createHalfTableOnFixed(), createHalfTableAndFixedTableOnFixed(),
+                createHalfTableOnFull());
         level1.setSpacing(true);
         level1.setWidth(100, Unit.PERCENTAGE);
         level1.setExpandRatio(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
index 810a583ba5..e7ed64d263 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
@@ -15,9 +15,11 @@ public class AbsoluteLayoutResizing extends TestBase {
         AbsoluteLayout al = new AbsoluteLayout();
 
         TextArea ta = new TextArea();
-        ta.setValue("When resizing the layout this text area should also get resized");
+        ta.setValue(
+                "When resizing the layout this text area should also get resized");
         ta.setSizeFull();
-        al.addComponent(ta, "left: 10px; right: 10px; top: 10px; bottom: 10px;");
+        al.addComponent(ta,
+                "left: 10px; right: 10px; top: 10px; bottom: 10px;");
 
         HorizontalSplitPanel horizPanel = new HorizontalSplitPanel();
         horizPanel.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
index eb84f689a5..5424efc2cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
@@ -27,15 +27,18 @@ public class EnableState extends AbstractTestCase {
         enable.setImmediate(true);
 
         CheckBox caption = new CheckBox("Toggle button caption", true);
-        caption.addValueChangeListener(event -> button.setCaption(button.getCaption() + "+"));
+        caption.addValueChangeListener(
+                event -> button.setCaption(button.getCaption() + "+"));
         caption.setImmediate(true);
 
         CheckBox visible = new CheckBox("Toggle panel visibility", true);
-        visible.addValueChangeListener(event -> panel.setVisible(event.getValue()));
+        visible.addValueChangeListener(
+                event -> panel.setVisible(event.getValue()));
         visible.setImmediate(true);
 
         CheckBox panelEnable = new CheckBox("Toggle panel enabled", true);
-        panelEnable.addValueChangeListener(event -> panel.setEnabled(event.getValue()));
+        panelEnable.addValueChangeListener(
+                event -> panel.setEnabled(event.getValue()));
         panelEnable.setImmediate(true);
 
         mainWindow.addComponent(enable);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index 27126a5117..ea41be4789 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
@@ -38,11 +38,11 @@ public abstract class AbstractComponentDataBindingTest extends TestBase
         cb.setNullSelectionAllowed(false);
         for (Locale l : Locale.getAvailableLocales()) {
             Item i = cb.addItem(l);
-            i.getItemProperty(CAPTION).setValue(
-                    l.getDisplayName(Locale.ENGLISH));
+            i.getItemProperty(CAPTION)
+                    .setValue(l.getDisplayName(Locale.ENGLISH));
         }
-        ((Container.Sortable) cb.getContainerDataSource()).sort(
-                new Object[] { CAPTION }, new boolean[] { true });
+        ((Container.Sortable) cb.getContainerDataSource())
+                .sort(new Object[] { CAPTION }, new boolean[] { true });
         cb.setImmediate(true);
         cb.addListener(new ValueChangeListener() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index ff6db2d88d..0533b7c02a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
@@ -10,8 +10,9 @@ public class DateFieldBackedByString extends AbstractComponentDataBindingTest {
     protected void createFields() {
         LegacyDateField df = new LegacyDateField("Date field");
         addComponent(df);
-        df.setPropertyDataSource(new com.vaadin.data.util.ObjectProperty<String>(
-                s, String.class));
+        df.setPropertyDataSource(
+                new com.vaadin.data.util.ObjectProperty<String>(s,
+                        String.class));
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index b195a9a2ae..2f25bf8ce2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
@@ -15,15 +15,17 @@ public class DoubleInTextField extends AbstractComponentDataBindingTest {
                 new Address("Dovestreet 12", 12233, "Johnston",
                         Country.SOUTH_AFRICA));
 
-        LegacyTextField salary = new LegacyTextField("Vaadin 7 - TextField with Double");
+        LegacyTextField salary = new LegacyTextField(
+                "Vaadin 7 - TextField with Double");
         addComponent(salary);
-        salary.setPropertyDataSource(new MethodProperty<Double>(person,
-                "salaryDouble"));
+        salary.setPropertyDataSource(
+                new MethodProperty<Double>(person, "salaryDouble"));
 
-        LegacyTextField salary6 = new LegacyTextField("Vaadin 6 - TextField with Double");
+        LegacyTextField salary6 = new LegacyTextField(
+                "Vaadin 6 - TextField with Double");
         addComponent(salary6);
-        salary6.setPropertyDataSource(new MethodProperty<Double>(person,
-                "salaryDouble"));
+        salary6.setPropertyDataSource(
+                new MethodProperty<Double>(person, "salaryDouble"));
         salary6.setConverter(new Vaadin6ImplicitDoubleConverter());
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
index 75248c93ae..c30edc1bf6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
@@ -15,8 +15,8 @@ public class FieldFocusOnClick extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         addComponent(new LegacyTextField(null, "TextField"));
         addComponent(new CheckBox("CheckBox"));
-        addComponent(new OptionGroup(null,
-                Arrays.asList("Option 1", "Option 2")));
+        addComponent(
+                new OptionGroup(null, Arrays.asList("Option 1", "Option 2")));
         addComponent(new NativeButton("NativeButton"));
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index 67daa98b67..4af04293cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
@@ -4,8 +4,8 @@ import java.util.Locale;
 
 import com.vaadin.legacy.data.util.converter.LegacyConverter;
 
-public class Vaadin6ImplicitDoubleConverter implements
-        LegacyConverter<String, Double> {
+public class Vaadin6ImplicitDoubleConverter
+        implements LegacyConverter<String, Double> {
 
     @Override
     public Double convertToModel(String value,
diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
index bd7f047fc7..32124372fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
@@ -16,8 +16,8 @@ public class AccordionPrimaryStylenames extends TestBase {
         acc.setPrimaryStyleName("my-accordion");
         addComponent(acc);
 
-        addComponent(new Button("Set primary stylename",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Set primary stylename", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         acc.setPrimaryStyleName("my-second-accordion");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 605ab676b6..877f521332 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
@@ -23,8 +23,8 @@ public class BeanItemContainerNullValues extends TestBase {
     protected void setup() {
         table = new Table();
         table.setSortDisabled(false);
-        table.setContainerDataSource(BeanItemContainerGenerator
-                .createContainer(100, 1));
+        table.setContainerDataSource(
+                BeanItemContainerGenerator.createContainer(100, 1));
         table.setColumnCollapsingAllowed(true);
 
         Button b = new Button("Disable sorting", new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
index 4e9c133bea..e0ebc9bf37 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
@@ -101,8 +101,8 @@ public class BrowserFrameIsVisible extends TestBase {
 
             ByteArrayInputStream istream;
             try {
-                istream = new ByteArrayInputStream(sb.toString().getBytes(
-                        "UTF-8"));
+                istream = new ByteArrayInputStream(
+                        sb.toString().getBytes("UTF-8"));
             } catch (UnsupportedEncodingException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
index 0d4981a441..cbb0be14d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
@@ -18,7 +18,8 @@ public class ButtonEnterWithWindowShortcut extends TestBase {
             private static final long serialVersionUID = -4976129418325394913L;
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 log.log(action.getCaption() + " pressed in window");
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java
index 5cdc34e8e8..1c3070f38b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java
@@ -21,8 +21,8 @@ public class ButtonHtml extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                swapButton.setHtmlContentAllowed(!swapButton
-                        .isHtmlContentAllowed());
+                swapButton.setHtmlContentAllowed(
+                        !swapButton.isHtmlContentAllowed());
             }
         });
         addComponent(swapButton);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
index 807e88c7e4..67fd4ee8f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
@@ -26,7 +26,8 @@ public class ButtonTabIndex extends TestBase {
     protected void setup() {
         LegacyTextField tf1 = new LegacyTextField("Tab index 0");
         tf1.setTabIndex(0);
-        LegacyTextField tf2 = new LegacyTextField("Tab index -1, focused initially");
+        LegacyTextField tf2 = new LegacyTextField(
+                "Tab index -1, focused initially");
         tf2.setTabIndex(-1);
         tf2.focus();
         addComponent(tf1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java
index 9e37fef7d9..1e0f85446e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java
@@ -33,6 +33,7 @@ public class ButtonToggleIcons extends UI {
         };
 
         layout.addComponent(new Button("Toggle icon", iconToggleListener));
-        layout.addComponent(new NativeButton("Toggle icon", iconToggleListener));
+        layout.addComponent(
+                new NativeButton("Toggle icon", iconToggleListener));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java
index 573c95c2b8..a6c4e326fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java
@@ -42,7 +42,8 @@ public class Buttons extends ComponentTestCase<Button> {
 
             l = createButton(
                     "This is a 100% wide button with fixed 65px height. "
-                            + LoremIpsum.get(5000), nat);
+                            + LoremIpsum.get(5000),
+                    nat);
             l.setWidth("100%");
             l.setHeight("65px");
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java
index b20effad97..12e4ef9a4b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java
@@ -4,8 +4,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 
-public class Buttons3<T extends Button> extends Buttons2<T> implements
-        ClickListener {
+public class Buttons3<T extends Button> extends Buttons2<T>
+        implements ClickListener {
 
     @Override
     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java
index 9cdd803fe0..025dfbb9c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 @SuppressWarnings("serial")
-public class ShortCutListenerModification extends TestBase implements
-        ClickListener {
+public class ShortCutListenerModification extends TestBase
+        implements ClickListener {
 
     @Override
     protected String getDescription() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
index ec40ef4649..dff7d2b71e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
@@ -49,8 +49,9 @@ public class CalendarActionEventSource extends AbstractTestUI {
 
                 CalendarEvent event = null;
                 try {
-                    event = new BasicEvent("NAME", null, new SimpleDateFormat(
-                            "yyyy-MM-dd hh:mm").parse("2013-01-01 07:00"),
+                    event = new BasicEvent("NAME", null,
+                            new SimpleDateFormat("yyyy-MM-dd hh:mm")
+                                    .parse("2013-01-01 07:00"),
                             new SimpleDateFormat("yyyy-MM-dd hh:mm")
                                     .parse("2013-01-01 11:00"));
                 } catch (ParseException e) {
@@ -63,10 +64,10 @@ public class CalendarActionEventSource extends AbstractTestUI {
 
         });
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-01-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-01-31"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-31"));
         } catch (ParseException e) {
             // Nothing to do
         }
@@ -79,7 +80,8 @@ public class CalendarActionEventSource extends AbstractTestUI {
         setEnabled(true);
         calendar.addActionHandler(new Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Label label1 = new Label(calendar.toString());
                 label1.setId("calendarlabel");
                 addComponent(label1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
index 5b05d188bd..6f2dc818cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
@@ -79,10 +79,10 @@ public class CalendarActionsMenuTest extends AbstractTestUI {
 
         });
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-01-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-01-31"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-31"));
         } catch (ParseException e) {
             // Nothing to do
         }
@@ -95,7 +95,8 @@ public class CalendarActionsMenuTest extends AbstractTestUI {
         setEnabled(true);
         calendar.addActionHandler(new Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("ACTION CLICKED");
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
index ee898e0790..c7188e45fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
@@ -58,7 +58,8 @@ public class CalendarActionsUI extends UI {
              * .Action, java.lang.Object, java.lang.Object)
              */
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Date date = (Date) target;
                 if (action == NEW_EVENT) {
                     BasicEvent event = new BasicEvent("New event",
@@ -96,8 +97,8 @@ public class CalendarActionsUI extends UI {
 
         content.addComponent(calendar);
 
-        content.addComponent(new Button("Set week view",
-                new Button.ClickListener() {
+        content.addComponent(
+                new Button("Set week view", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         calendar.setEndDate(new Date(100, 1, 7));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
index 5a21353d7d..de896bb699 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
@@ -50,32 +50,35 @@ public class CalendarBackwardForward extends AbstractTestUI {
 
         try {
 
-            BasicEvent event = new BasicEvent("EVENT NAME 1",
-                    "EVENT TOOLTIP 1",
+            BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 15:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-07 22:20"));
+                            .parse("2013-09-05 15:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-07 22:20"));
             event.setStyleName("color1");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 2", "EVENT TOOLTIP 2",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 12:10"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-05 13:20"));
+                            .parse("2013-09-05 12:10"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-05 13:20"));
             event.setStyleName("color2");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 3", "EVENT TOOLTIP 3",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-01 11:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-29 15:20"));
+                            .parse("2013-09-01 11:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-29 15:20"));
             event.setStyleName("color3");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 4", "EVENT TOOLTIP 4",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-01 11:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-01 15:20"));
+                            .parse("2013-09-01 11:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-01 15:20"));
             event.setStyleName("color4");
             event.setAllDay(true);
             calendar.addEvent(event);
@@ -84,10 +87,10 @@ public class CalendarBackwardForward extends AbstractTestUI {
         }
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30"));
         } catch (ParseException e) { // Nothing to do
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
index 56c4eacba1..0eddfb5926 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
@@ -52,9 +52,9 @@ public class CalendarDragAndDrop extends AbstractTestUI {
             TableTransferable transferable = (TableTransferable) event
                     .getTransferable();
 
-            calendar.addEvent(new BasicEvent(transferable.getItemId()
-                    .toString(), "This event was dragged here", details
-                    .getDropTime()));
+            calendar.addEvent(new BasicEvent(
+                    transferable.getItemId().toString(),
+                    "This event was dragged here", details.getDropTime()));
 
             table.removeItem(transferable.getItemId());
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
index 8d0950cc61..8537af3d99 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
@@ -58,11 +58,10 @@ public class CalendarHtmlInEvents extends AbstractTestUIWithLog {
         ns.setValue("Month");
         final CheckBox allowHtml = new CheckBox("Allow HTML in event caption");
         allowHtml.setValue(calendar.isEventCaptionAsHtml());
-        allowHtml.addValueChangeListener(
-                event -> {
-                    calendar.setEventCaptionAsHtml(event.getValue());
-                    log("HTML in event caption: " + event.getValue());
-                });
+        allowHtml.addValueChangeListener(event -> {
+            calendar.setEventCaptionAsHtml(event.getValue());
+            log("HTML in event caption: " + event.getValue());
+        });
         HorizontalLayout hl = new HorizontalLayout();
         hl.setDefaultComponentAlignment(Alignment.BOTTOM_LEFT);
         hl.addComponents(ns, allowHtml);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
index b36b4d200e..2d0059f878 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
@@ -74,8 +74,8 @@ public class CalendarMonthViewDndEvent extends AbstractTestUI {
 
             @Override
             public void eventSetChange(EventSetChangeEvent event) {
-                List<CalendarEvent> events = event.getProvider().getEvents(
-                        new Date(0), new Date(Long.MAX_VALUE));
+                List<CalendarEvent> events = event.getProvider()
+                        .getEvents(new Date(0), new Date(Long.MAX_VALUE));
                 CalendarEvent calEvent = events.get(0);
                 Date startEvent = calEvent.getStart();
                 Date endEvent = calEvent.getEnd();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
index 9b9a64624a..ad61135e84 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
@@ -68,8 +68,8 @@ public class CalendarNotifications extends AbstractTestUIWithLog {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        Notification
-                                .show("This will disappear when you move your mouse!");
+                        Notification.show(
+                                "This will disappear when you move your mouse!");
                     }
                 });
         content.addComponent(btn);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
index 8e82555e87..b8e1dd4ba5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
@@ -35,16 +35,16 @@ public class CalendarReadOnly extends AbstractTestUI {
         calendar.setSizeFull();
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30"));
 
-            BasicEvent event = new BasicEvent("EVENT NAME 1",
-                    "EVENT TOOLTIP 1",
+            BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 15:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-05 22:20"));
+                            .parse("2013-09-05 15:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-05 22:20"));
             event.setStyleName("color1");
 
             calendar.addEvent(event);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
index 824ad0941f..f36955f38d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
@@ -68,8 +68,8 @@ public class CalendarRescheduleEvent extends AbstractTestUI {
 
             @Override
             public void eventSetChange(EventSetChangeEvent event) {
-                List<CalendarEvent> events = event.getProvider().getEvents(
-                        new Date(0), new Date(Long.MAX_VALUE));
+                List<CalendarEvent> events = event.getProvider()
+                        .getEvents(new Date(0), new Date(Long.MAX_VALUE));
                 CalendarEvent calEvent = events.get(0);
                 Date startEvent = calEvent.getStart();
                 Date endEvent = calEvent.getEnd();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
index 98c5c08095..50825ef22a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
@@ -35,8 +35,8 @@ import com.vaadin.ui.components.calendar.event.BasicEvent;
  *         out of view (#7261)
  */
 @Theme("tests-calendar")
-public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends
-        AbstractTestUI {
+public class CalendarShownNotCorrectlyWhenPartiallyOutOfView
+        extends AbstractTestUI {
 
     private static final long serialVersionUID = 1L;
     private Calendar calendar;
@@ -52,11 +52,11 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends
         calendar = new Calendar();
 
         try {
-            BasicEvent event = new BasicEvent("EVENT NAME 1",
-                    "EVENT TOOLTIP 1",
+            BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 09:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-05 14:00"));
+                            .parse("2013-09-05 09:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-05 14:00"));
             event.setStyleName("color1");
             calendar.addEvent(event);
         } catch (ParseException e1) { // Nothing to do
@@ -64,10 +64,10 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends
         }
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30"));
         } catch (ParseException e) { // Nothing to do
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
index 65e5502686..ed30c56c5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
@@ -52,32 +52,35 @@ public class CalendarVisibleHours extends AbstractTestUI {
 
         try {
 
-            BasicEvent event = new BasicEvent("EVENT NAME 1",
-                    "EVENT TOOLTIP 1",
+            BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 15:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-07 22:20"));
+                            .parse("2013-09-05 15:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-07 22:20"));
             event.setStyleName("color1");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 2", "EVENT TOOLTIP 2",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 12:10"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-05 13:20"));
+                            .parse("2013-09-05 12:10"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-05 13:20"));
             event.setStyleName("color2");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 3", "EVENT TOOLTIP 3",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-01 11:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-29 15:20"));
+                            .parse("2013-09-01 11:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-29 15:20"));
             event.setStyleName("color3");
             calendar.addEvent(event);
 
             event = new BasicEvent("EVENT NAME 4", "EVENT TOOLTIP 4",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-01 11:30"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-01 15:20"));
+                            .parse("2013-09-01 11:30"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-01 15:20"));
             event.setStyleName("color4");
             event.setAllDay(true);
             calendar.addEvent(event);
@@ -86,10 +89,10 @@ public class CalendarVisibleHours extends AbstractTestUI {
         }
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30"));
         } catch (ParseException e) { // Nothing to do
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
index c74f2a53e3..732899e85e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
@@ -15,10 +15,10 @@ public class CalendarWeekSelection extends AbstractTestUI {
         calendar.setLocale(Locale.US);
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-12-15"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2014-01-15"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-12-15"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-15"));
         } catch (ParseException e) {
             e.printStackTrace();
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
index 2313ad891a..38599277b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
@@ -67,8 +67,8 @@ public class NotificationTestUI extends UI {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        Notification
-                                .show("This will disappear when you move your mouse!");
+                        Notification.show(
+                                "This will disappear when you move your mouse!");
                     }
                 });
         content.addComponent(btn);
@@ -81,8 +81,8 @@ public class NotificationTestUI extends UI {
             @Override
             public void dateClick(DateClickEvent event) {
                 provider.addEvent(event.getDate());
-                Notification
-                        .show("This should disappear, but if wont unless clicked.");
+                Notification.show(
+                        "This should disappear, but if wont unless clicked.");
 
                 // this requestRepaint call interferes with the notification
                 cal.markAsDirty();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
index 40dd43abb2..896078d1c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
@@ -35,10 +35,10 @@ public class NullEventMoveHandler extends AbstractTestUIWithLog {
         calendar.setLocale(Locale.US);
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2014-06-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2014-06-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-30"));
 
             BasicEvent event = new BasicEvent("foo", "bar",
                     new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-01"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
index 4a792bc670..e7c9828c6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
@@ -36,11 +36,11 @@ public class SetFirstVisibleHourOfDay extends AbstractTestUI {
         calendar = new Calendar();
 
         try {
-            BasicEvent event = new BasicEvent("EVENT NAME 1",
-                    "EVENT TOOLTIP 1",
+            BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1",
                     new SimpleDateFormat("yyyy-MM-dd HH:mm")
-                            .parse("2013-09-05 00:00"), new SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm").parse("2013-09-05 13:00"));
+                            .parse("2013-09-05 00:00"),
+                    new SimpleDateFormat("yyyy-MM-dd HH:mm")
+                            .parse("2013-09-05 13:00"));
             event.setStyleName("color1");
             calendar.addEvent(event);
         } catch (ParseException e) {
@@ -48,10 +48,10 @@ public class SetFirstVisibleHourOfDay extends AbstractTestUI {
         }
 
         try {
-            calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-01"));
-            calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd")
-                    .parse("2013-09-30"));
+            calendar.setStartDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01"));
+            calendar.setEndDate(
+                    new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30"));
         } catch (ParseException e) {
             e.printStackTrace();
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
index daf472914b..80e010da08 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
@@ -109,8 +109,8 @@ public class IconsInCaption extends TestBase {
                     ContentMode.HTML);
             container.addComponent(title);
             for (String icon : icons) {
-                ThemeResource res = new ThemeResource("../runo/icons/" + size
-                        + "/" + icon);
+                ThemeResource res = new ThemeResource(
+                        "../runo/icons/" + size + "/" + icon);
                 if (TYPE_CAPTION.equals(iconType)) {
                     Label name = new Label();
                     name.setCaption(icon);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 14bea90206..14a9a995d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
@@ -5,8 +5,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 
-public class CheckBoxes2 extends AbstractFieldTest<CheckBox, Boolean> implements
-        ClickListener {
+public class CheckBoxes2 extends AbstractFieldTest<CheckBox, Boolean>
+        implements ClickListener {
 
     @Override
     protected Class<CheckBox> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
index 463d53a4a8..ecaea55eef 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
@@ -28,8 +28,8 @@ public class CheckboxCaptionWrapping extends TestBase {
         mainLayout.setStyleName("borders");
         mainLayout.setWidth("300px");
         mainLayout.addComponent(cb);
-        mainLayout.addComponent(new Label(
-                "Lorem ipsum dolor sit amet, consectetur adipisicing"
+        mainLayout.addComponent(
+                new Label("Lorem ipsum dolor sit amet, consectetur adipisicing"
                         + " elit, sed do eiusmod tempor."));
 
         addComponent(mainLayout);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
index 9b37db10b1..dbe24a2856 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
@@ -25,12 +25,13 @@ public class CheckboxContextClick extends AbstractTestUIWithLog {
     @Override
     protected void setup(VaadinRequest request) {
         final CheckBox cb = new CheckBox("Right-click me", true);
-        cb.addContextClickListener(new ContextClickEvent.ContextClickListener() {
-            @Override
-            public void contextClick(ContextClickEvent event) {
-                log("checkbox context clicked");
-            }
-        });
+        cb.addContextClickListener(
+                new ContextClickEvent.ContextClickListener() {
+                    @Override
+                    public void contextClick(ContextClickEvent event) {
+                        log("checkbox context clicked");
+                    }
+                });
 
         addComponent(cb);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
index daae6bc2e5..6319a7e511 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
@@ -45,8 +45,8 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
 import com.vaadin.ui.components.colorpicker.ColorChangeListener;
 
-public class ColorPickerTestUI extends AbstractTestUI implements
-        ColorChangeListener {
+public class ColorPickerTestUI extends AbstractTestUI
+        implements ColorChangeListener {
 
     @Override
     public String getTestDescription() {
@@ -129,14 +129,12 @@ public class ColorPickerTestUI extends AbstractTestUI implements
             drawable.setColor(java.awt.Color.blue);
             drawable.drawRect(0, 0, 269, 269);
             drawable.setColor(java.awt.Color.black);
-            drawable.drawString(
-                    "r=" + String.valueOf(fgColor.getRed()) + ",g="
-                            + String.valueOf(fgColor.getGreen()) + ",b="
-                            + String.valueOf(fgColor.getBlue()), 50, 100);
-            drawable.drawString(
-                    "r=" + String.valueOf(bgColor.getRed()) + ",g="
-                            + String.valueOf(bgColor.getGreen()) + ",b="
-                            + String.valueOf(bgColor.getBlue()), 5, 15);
+            drawable.drawString("r=" + String.valueOf(fgColor.getRed()) + ",g="
+                    + String.valueOf(fgColor.getGreen()) + ",b="
+                    + String.valueOf(fgColor.getBlue()), 50, 100);
+            drawable.drawString("r=" + String.valueOf(bgColor.getRed()) + ",g="
+                    + String.valueOf(bgColor.getGreen()) + ",b="
+                    + String.valueOf(bgColor.getBlue()), 5, 15);
 
             try {
                 /* Write the image to a buffer. */
@@ -333,7 +331,8 @@ public class ColorPickerTestUI extends AbstractTestUI implements
         layout3.addComponent(colorpicker6);
         layout3.setComponentAlignment(colorpicker6, Alignment.MIDDLE_CENTER);
 
-        Panel panel3 = new Panel("Color area colorpicker with caption", layout3);
+        Panel panel3 = new Panel("Color area colorpicker with caption",
+                layout3);
         panel3.setWidth("100%");
         panel3.setHeight(null);
         layoutLeft.addComponent(panel3);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
index 731e23188e..a084d1019d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
@@ -14,8 +14,8 @@ public class ComboBoxBorder extends TestBase {
     protected void setup() {
         setTheme("tests-tickets");
 
-        final ComboBox cb = new ComboBox("All errors", Arrays.asList("Error",
-                "Error 2"));
+        final ComboBox cb = new ComboBox("All errors",
+                Arrays.asList("Error", "Error 2"));
         cb.setStyleName("ComboBoxBorder");
         cb.setImmediate(true);
         cb.setWidth("200px"); // must have with to reproduce
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index dea1deb9b5..204093bbf4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
@@ -86,8 +86,8 @@ public class ComboBoxDataSourceChange extends TestBase {
         cb2.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                currentValue.setValue(String.valueOf(event.getProperty()
-                        .getValue()));
+                currentValue.setValue(
+                        String.valueOf(event.getProperty().getValue()));
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index 07cd1f046c..e119571e20 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
@@ -34,9 +34,9 @@ public class ComboBoxLargeIcons extends TestBase {
                 "document-ppt", "document-txt", "document-web", "document" };
         for (String icon : icons) {
             Item item = cb.addItem(icon);
-            item.getItemProperty("icon").setValue(
-                    new ThemeResource("../runo/icons/32/" + icon + ".png?"
-                            + new Date().getTime()));
+            item.getItemProperty("icon")
+                    .setValue(new ThemeResource("../runo/icons/32/" + icon
+                            + ".png?" + new Date().getTime()));
         }
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
index 044214cecf..d367aeb1aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
@@ -64,9 +64,8 @@ public class ComboBoxOnSmallScreen extends AbstractTestUI {
             Item item = cb.getItem(itemId);
             item.getItemProperty(PID).setValue(v);
             int flagIndex = i % 3;
-            cb.setItemIcon(itemId, new ClassResource(
-                    flagIndex == 0 ? "fi_small.png" : flagIndex == 1 ? "fi.gif"
-                            : "se.gif"));
+            cb.setItemIcon(itemId, new ClassResource(flagIndex == 0
+                    ? "fi_small.png" : flagIndex == 1 ? "fi.gif" : "se.gif"));
         }
 
         cb.select(selectId);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
index 6807b21424..6e4546920b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
@@ -15,8 +15,9 @@ public class ComboBoxPageLength extends ComboBoxes2<ComboBox> {
             public void valueChange(ValueChangeEvent event) {
                 if (event.getProperty() != null) {
                     if (event.getProperty().getValue() != null) {
-                        Integer value = Integer.parseInt(((String) event
-                                .getProperty().getValue()).split(" ")[1]);
+                        Integer value = Integer.parseInt(
+                                ((String) event.getProperty().getValue())
+                                        .split(" ")[1]);
                         getComponent().setPageLength(value);
                     } else {
                         getComponent().setPageLength(0);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
index d1adeaaf88..22f0379343 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
@@ -62,7 +62,8 @@ public class ComboBoxParentDisable extends AbstractTestUIWithLog {
 
     }
 
-    private class MyValueChangeListener implements Property.ValueChangeListener {
+    private class MyValueChangeListener
+            implements Property.ValueChangeListener {
         @Override
         public void valueChange(Property.ValueChangeEvent event) {
             log.log("you made a selection change");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
index ed8212b231..87ea0847be 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
@@ -24,11 +24,10 @@ public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
+        getPage().getStyles()
+                .add("body.v-generated-body { overflow: auto;height:auto;}");
         getPage().getStyles().add(
-                "body.v-generated-body { overflow: auto;height:auto;}");
-        getPage()
-                .getStyles()
-                .add("body.v-generated-body .v-ui.v-scrollable{ overflow: visible;height:auto !important;}");
+                "body.v-generated-body .v-ui.v-scrollable{ overflow: visible;height:auto !important;}");
         ComboBox cb = new ComboBox();
         for (int i = 0; i < 10; i++) {
             cb.addItem("Item " + i);
@@ -43,9 +42,7 @@ public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI {
         addComponent(spacer);
         // Chrome requires document.scrollTop (<body>)
         // Firefox + IE wants document.documentElement.scrollTop (<html>)
-        getPage()
-                .getJavaScript()
-                .execute(
-                        "document.body.scrollTop=1800;document.documentElement.scrollTop=1800;");
+        getPage().getJavaScript().execute(
+                "document.body.scrollTop=1800;document.documentElement.scrollTop=1800;");
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 2187c24e91..82cb6b440d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 @SuppressWarnings("serial")
-public class ComboBoxReapperingOldValue extends LegacyApplication implements
-        ValueChangeListener {
+public class ComboBoxReapperingOldValue extends LegacyApplication
+        implements ValueChangeListener {
 
     ComboBox cbox1 = new ComboBox();
     ComboBox cbox2 = new ComboBox();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
index 9f07d81cc9..a5022e3d51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
@@ -55,8 +55,8 @@ public class ComboBoxSQLContainerFilteredValueChange extends TestBase {
         myCombo.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                selectedLabel.setValue("Selected: "
-                        + event.getProperty().getValue());
+                selectedLabel.setValue(
+                        "Selected: " + event.getProperty().getValue());
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
index a8a66b64ec..1b0675c914 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
@@ -8,8 +8,8 @@ import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Notification;
 
-public class ComboBoxScrollingToPageDisabled extends
-        ComponentTestCase<ComboBox> {
+public class ComboBoxScrollingToPageDisabled
+        extends ComponentTestCase<ComboBox> {
 
     private static final Object CAPTION = "caption";
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
index d941c153c3..60b6817ba3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
@@ -26,8 +26,8 @@ public class ComboBoxSelectingWithNewItemsAllowed extends ComboBoxSelecting {
         super.setup(request);
         comboBox.setNewItemsAllowed(true);
 
-        final Label label = new Label(String.valueOf(comboBox.getItemIds()
-                .size()));
+        final Label label = new Label(
+                String.valueOf(comboBox.getItemIds().size()));
         label.setCaption("Item count:");
         label.setId("count");
         comboBox.addValueChangeListener(new Property.ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index d98997d28f..2efa1c3991 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
@@ -30,8 +30,8 @@ public class ComboBoxSlowInFF extends TestBase {
                 for (int i = 0; i < 200; i++) {
                     Item item = t.addItem(i);
                     for (int j = 0; j < 5; j++) {
-                        item.getItemProperty("test" + j).setValue(
-                                createComponent(i, j));
+                        item.getItemProperty("test" + j)
+                                .setValue(createComponent(i, j));
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index 8ee08532cc..800e31c0de 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
@@ -20,8 +20,8 @@ public class ComboBoxSuggestionOnDetach extends TestBase {
         layout.setSizeUndefined();
         popup.setContent(layout);
 
-        ComboBox comboBox = new ComboBox("Combo box", Arrays.asList("Option 1",
-                "Option 2", "Option 3"));
+        ComboBox comboBox = new ComboBox("Combo box",
+                Arrays.asList("Option 1", "Option 2", "Option 3"));
         comboBox.addFocusListener(new FieldEvents.FocusListener() {
             @Override
             public void focus(FocusEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
index 86e5b54cb6..b21a082dcc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
@@ -9,24 +9,15 @@ import com.vaadin.ui.ComboBox;
 
 public class ComboBoxSuggestionPopupWidth extends AbstractTestUI {
 
-    private static List<String> items = Arrays
-            .asList("abc",
-                    "cde",
-                    "efg",
-                    "ghi",
-                    "ijk",
-                    "more items 1",
-                    "more items 2",
-                    "more items 3",
-                    "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
-                    "more items 4", "more items 5", "more items 6",
-                    "more items 7");
+    private static List<String> items = Arrays.asList("abc", "cde", "efg",
+            "ghi", "ijk", "more items 1", "more items 2", "more items 3",
+            "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
+            "more items 4", "more items 5", "more items 6", "more items 7");
 
     @Override
     protected void setup(VaadinRequest request) {
         ComboBox cb = new ComboBox(
-                "200px wide ComboBox with 100% wide suggestion popup",
-                items);
+                "200px wide ComboBox with 100% wide suggestion popup", items);
         cb.setPopupWidth("100%");
         cb.setWidth("200px");
         cb.addStyleName("width-as-percentage");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
index 091b5f9aab..2ce4450590 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
@@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox;
 
 public class ComboBoxSuggestionPopupWidthLegacy extends AbstractTestUI {
 
-    private static List<String> items = Arrays
-            .asList("abc",
-                    "cde",
-                    "efg",
-                    "ghi",
-                    "ijk",
-                    "more items 1",
-                    "more items 2",
-                    "more items 3",
-                    "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
-                    "more items 4", "more items 5", "more items 6",
-                    "more items 7");
+    private static List<String> items = Arrays.asList("abc", "cde", "efg",
+            "ghi", "ijk", "more items 1", "more items 2", "more items 3",
+            "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
+            "more items 4", "more items 5", "more items 6", "more items 7");
 
     @Override
     protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
index 1ddc666a44..5cf736b088 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
@@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox;
 
 public class ComboBoxSuggestionPopupWidthPercentage extends AbstractTestUI {
 
-    private static List<String> items = Arrays
-            .asList("abc",
-                    "cde",
-                    "efg",
-                    "ghi",
-                    "ijk",
-                    "more items 1",
-                    "more items 2",
-                    "more items 3",
-                    "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
-                    "more items 4", "more items 5", "more items 6",
-                    "more items 7");
+    private static List<String> items = Arrays.asList("abc", "cde", "efg",
+            "ghi", "ijk", "more items 1", "more items 2", "more items 3",
+            "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
+            "more items 4", "more items 5", "more items 6", "more items 7");
 
     @Override
     protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
index 623f4c904f..7ebf149a5c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
@@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox;
 
 public class ComboBoxSuggestionPopupWidthPixels extends AbstractTestUI {
 
-    private static List<String> items = Arrays
-            .asList("abc",
-                    "cde",
-                    "efg",
-                    "ghi",
-                    "ijk",
-                    "more items 1",
-                    "more items 2",
-                    "more items 3",
-                    "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
-                    "more items 4", "more items 5", "more items 6",
-                    "more items 7");
+    private static List<String> items = Arrays.asList("abc", "cde", "efg",
+            "ghi", "ijk", "more items 1", "more items 2", "more items 3",
+            "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up",
+            "more items 4", "more items 5", "more items 6", "more items 7");
 
     @Override
     protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index 258126c93d..bd15b377b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
@@ -14,8 +14,8 @@ public class ComboBoxTextFieldEventOrder extends TestBase {
     protected void setup() {
         LegacyTextField textField = new LegacyTextField("text field");
         textField.setImmediate(true);
-        final Select select = new Select("select", Arrays.asList("1", "2", "3",
-                "4"));
+        final Select select = new Select("select",
+                Arrays.asList("1", "2", "3", "4"));
         textField.addListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index 05b52dee80..1598a77d66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
@@ -15,8 +15,8 @@ public class ComboBoxUndefinedWidthAndIcon extends TestBase {
         for (int i = 1; i < 200 + 1; i++) {
             Item item = cb.addItem(i);
             item.getItemProperty("caption").setValue("Item " + i);
-            item.getItemProperty("icon").setValue(
-                    new ThemeResource("../runo/icons/16/users.png"));
+            item.getItemProperty("icon")
+                    .setValue(new ThemeResource("../runo/icons/16/users.png"));
         }
         cb.setItemIconPropertyId("icon");
         cb.setItemCaptionPropertyId("caption");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index a35bc46390..64ed79a54f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
@@ -44,7 +44,8 @@ public class ComboBoxValueInput extends AbstractTestUI {
         return 3268;
     }
 
-    private ComboBox getComboBox(String caption, boolean addNullItem, String id) {
+    private ComboBox getComboBox(String caption, boolean addNullItem,
+            String id) {
         ComboBox cb = new ComboBox(caption);
         cb.setImmediate(true);
         if (addNullItem) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
index 4f7b36386e..36cb6e017e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
@@ -93,7 +93,8 @@ public class ComboPushTiming extends TestBase {
 
     class MyExecutor extends ThreadPoolExecutor {
         public MyExecutor() {
-            super(5, 20, 20, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
+            super(5, 20, 20, TimeUnit.SECONDS,
+                    new SynchronousQueue<Runnable>());
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
index acfb7b165f..66ed6d6da5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
@@ -8,8 +8,8 @@ import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
 
 @SuppressWarnings("serial")
-public class ComboSelectedValueBeyondTheFirstDropdownPage extends
-        AbstractTestUI {
+public class ComboSelectedValueBeyondTheFirstDropdownPage
+        extends AbstractTestUI {
 
     protected static final int ITEM_COUNT = 21;
     protected static final String ITEM_NAME_TEMPLATE = "Item %d";
@@ -32,7 +32,8 @@ public class ComboSelectedValueBeyondTheFirstDropdownPage extends
 
     private ComboBox getComboBox(final Label value) {
         final ComboBox combobox = new ComboBox("MyCaption");
-        combobox.setDescription("ComboBox with more than 10 elements in it's dropdown list.");
+        combobox.setDescription(
+                "ComboBox with more than 10 elements in it's dropdown list.");
 
         combobox.setImmediate(true);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
index 3aaae7e6dc..45d6c0a03d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
@@ -29,8 +29,8 @@ public class ComboboxInPopupViewWithItems extends TestBase {
 
     class PopupContent implements PopupView.Content {
 
-        private final ComboBox cb = new ComboBox(null, Arrays.asList("Item 1",
-                "Item 2", "Item 3"));
+        private final ComboBox cb = new ComboBox(null,
+                Arrays.asList("Item 1", "Item 2", "Item 3"));
 
         @Override
         public String getMinimizedValueAsHTML() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
index 375b417407..67f5669d8e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
@@ -21,8 +21,8 @@ public class ComboboxPrimaryStyleNames extends TestBase {
         addItem(box, "Value 4");
 
         addComponent(box);
-        addComponent(new Button("Set primary style",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Set primary style", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         box.setPrimaryStyleName("my-second-combobox");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
index 593f567c12..afa8933a7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
@@ -33,7 +33,8 @@ public class ComboboxStyleChangeWidth extends AbstractTestUIWithLog {
         final ComboBox cbFoo = new ComboBox();
         cbFoo.setImmediate(true);
         cbFoo.setSizeUndefined();
-        cbFoo.addItem("A really long string that causes an inline width to be set");
+        cbFoo.addItem(
+                "A really long string that causes an inline width to be set");
 
         Button btn = new Button("Click to break CB",
                 new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
index cf754d3fee..3cdbcda3f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
@@ -141,8 +141,8 @@ public class Comboboxes extends ComponentTestCase<ComboBox> {
                             if (value == null) {
                                 c.setItemIcon(id, null);
                             } else {
-                                c.setItemIcon(id, new ThemeResource(value + "?"
-                                        + new Date().getTime()));
+                                c.setItemIcon(id, new ThemeResource(
+                                        value + "?" + new Date().getTime()));
                             }
                         }
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
index ff7faf1965..000404e149 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
@@ -30,12 +30,12 @@ public class FilteringTurkishLocale extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
 
-        final ComboBox comboBox = new ComboBox("Box", Arrays.asList(
-                "I without dot", "İ with dot"));
+        final ComboBox comboBox = new ComboBox("Box",
+                Arrays.asList("I without dot", "İ with dot"));
         comboBox.setNullSelectionAllowed(false);
 
-        NativeSelect localeSelect = new NativeSelect("Locale", Arrays.asList(
-                Locale.ENGLISH, new Locale("tr")));
+        NativeSelect localeSelect = new NativeSelect("Locale",
+                Arrays.asList(Locale.ENGLISH, new Locale("tr")));
         localeSelect.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
index c73bb28c43..d77af57eab 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
@@ -12,7 +12,8 @@ public class PopUpWidth extends TestBase {
     protected void setup() {
 
         addComponent(createComboBox("Do not touch this"));
-        addComponent(createComboBox("Browse this (check that width does not change)"));
+        addComponent(createComboBox(
+                "Browse this (check that width does not change)"));
     }
 
     private ComboBox createComboBox(String caption) {
@@ -22,8 +23,8 @@ public class PopUpWidth extends TestBase {
         for (int i = 1; i < 200 + 1; i++) {
             Item item = cb.addItem(i);
             item.getItemProperty("caption").setValue("Item " + i);
-            item.getItemProperty("icon").setValue(
-                    new ThemeResource("../runo/icons/16/users.png"));
+            item.getItemProperty("icon")
+                    .setValue(new ThemeResource("../runo/icons/16/users.png"));
         }
         cb.setItemIconPropertyId("icon");
         cb.setItemCaptionPropertyId("caption");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
index 48484165ff..d227b52f9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
@@ -28,8 +28,8 @@ public class CustomComponentChildVisibility extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         Label label = new Label("In panel");
         label.setId("label");
-        final CustomComponent cc = new CustomComponent(new Panel(
-                "In CustomComponent", label));
+        final CustomComponent cc = new CustomComponent(
+                new Panel("In CustomComponent", label));
 
         Button hideButton = new Button("Hide CustomComponent");
         hideButton.addClickListener(new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
index 8170f152c2..955c4ff885 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
@@ -21,8 +21,8 @@ public class EmbeddedInCustomComponent extends TestBase {
     }
 
     private CustomComponent wrap(String caption, String themeImage) {
-        Embedded image = new Embedded(caption, new ThemeResource(
-                "../runo/icons/64/" + themeImage));
+        Embedded image = new Embedded(caption,
+                new ThemeResource("../runo/icons/64/" + themeImage));
         CustomComponent cc = new CustomComponent(image);
         return cc;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
index a81efec5d8..318db6b18b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
@@ -11,8 +11,8 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 
-public class CustomLayoutUsingTemplate extends TestBase implements
-        ClickListener {
+public class CustomLayoutUsingTemplate extends TestBase
+        implements ClickListener {
 
     CustomLayout layout;
     Button button1 = new Button("Add Button to first location", this);
@@ -20,13 +20,13 @@ public class CustomLayoutUsingTemplate extends TestBase implements
 
     @Override
     protected void setup() {
-        String thisPackage = CustomLayoutUsingTemplate.class.getName().replace(
-                '.', '/');
+        String thisPackage = CustomLayoutUsingTemplate.class.getName()
+                .replace('.', '/');
         thisPackage = thisPackage.replaceAll(
                 CustomLayoutUsingTemplate.class.getSimpleName() + "$", "");
         String template = thisPackage + "template.htm";
-        InputStream is = getClass().getClassLoader().getResourceAsStream(
-                template);
+        InputStream is = getClass().getClassLoader()
+                .getResourceAsStream(template);
 
         addComponent(button1);
 
@@ -61,7 +61,8 @@ public class CustomLayoutUsingTemplate extends TestBase implements
         if (event.getButton() == button1) {
             layout.addComponent(button2, "location1");
         } else {
-            layout.addComponent(new LegacyTextField("A text field!"), "location2");
+            layout.addComponent(new LegacyTextField("A text field!"),
+                    "location2");
         }
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
index 8d9baeba73..18bf589452 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
@@ -38,8 +38,9 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        layout.addComponent(new NativeButton(
-                                "This is it, the body!"), "body");
+                        layout.addComponent(
+                                new NativeButton("This is it, the body!"),
+                                "body");
                     }
                 }));
         layout.addComponent(menu, "menu");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
index 4127836666..7ed74f8f45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
@@ -32,11 +32,11 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
     protected void setup(VaadinRequest request) {
         CustomLayout cl;
         try {
-            cl = new CustomLayout(
-                    new ByteArrayInputStream(
-                            "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>"
-                                    .getBytes("UTF-8")));
-            cl.addComponent(new LegacyTextField("This should be visible"), "first");
+            cl = new CustomLayout(new ByteArrayInputStream(
+                    "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>"
+                            .getBytes("UTF-8")));
+            cl.addComponent(new LegacyTextField("This should be visible"),
+                    "first");
             Button button = new Button(
                     "This button is visible, together with one label");
             button.addClickListener(new ClickListener() {
@@ -47,8 +47,9 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
                 }
             });
             cl.addComponent(button, "second");
-            cl.addComponent(new LegacyTextField(
-                    "This won't be as the slot is missing"), "third");
+            cl.addComponent(
+                    new LegacyTextField("This won't be as the slot is missing"),
+                    "third");
 
             addComponent(cl);
         } catch (IOException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
index ad8d70ccc5..e89d911806 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
@@ -11,7 +11,8 @@ import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 
-public class LegacyDateFieldTest<T extends LegacyDateField> extends LegacyAbstractFieldTest<T> {
+public class LegacyDateFieldTest<T extends LegacyDateField>
+        extends LegacyAbstractFieldTest<T> {
 
     @SuppressWarnings("unchecked")
     @Override
@@ -31,7 +32,8 @@ public class LegacyDateFieldTest<T extends LegacyDateField> extends LegacyAbstra
     protected void createActions() {
         super.createActions();
         createResolutionSelectAction(CATEGORY_FEATURES);
-        createBooleanAction("Lenient", CATEGORY_FEATURES, false, lenientCommand);
+        createBooleanAction("Lenient", CATEGORY_FEATURES, false,
+                lenientCommand);
         createBooleanAction("Show week numbers", CATEGORY_FEATURES, false,
                 weekNumberCommand);
         createDateFormatSelectAction(CATEGORY_FEATURES);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
index 8539f70b17..0f74e57f3f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
@@ -14,9 +14,8 @@ public class DragStartModes extends TestBase {
     @Override
     protected void setup() {
 
-        TestUtils
-                .injectCSS(getMainWindow(),
-                        ".v-ddwrapper { background: #ACF; } .extra{ background: #FFA500; }");
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-ddwrapper { background: #ACF; } .extra{ background: #FFA500; }");
 
         addComponent(makeWrapper(DragStartMode.NONE));
         addComponent(makeWrapper(DragStartMode.COMPONENT));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
index 7c7e17a5a6..06cacfec4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
@@ -41,12 +41,12 @@ public class SingleUseDragAndDropUpload extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
-        Label upload = new Label(FontAwesome.UPLOAD.getHtml(), ContentMode.HTML);
+        Label upload = new Label(FontAwesome.UPLOAD.getHtml(),
+                ContentMode.HTML);
         upload.setSizeUndefined();
         upload.setStyleName("upload");
-        getPage()
-                .getStyles()
-                .add(".upload{ font-size: 36px; border: 1px solid black; padding:15px;}");
+        getPage().getStyles().add(
+                ".upload{ font-size: 36px; border: 1px solid black; padding:15px;}");
 
         final DragAndDropWrapper dnd = new DragAndDropWrapper(upload);
         dnd.setSizeUndefined();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java
index aedfafe627..803cc95a41 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java
@@ -20,8 +20,8 @@ public class EmbeddedAltText extends TestBase {
 
     @Override
     protected void setup() {
-        final Embedded e = new Embedded("Caption", new ThemeResource(
-                "../runo/icons/64/ok.png"));
+        final Embedded e = new Embedded("Caption",
+                new ThemeResource("../runo/icons/64/ok.png"));
         e.setAlternateText("Alt text of the image");
         addComponent(e);
         final Embedded player = new Embedded();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
index 28ffebcf56..3225b0af9a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
@@ -11,8 +11,8 @@ public class EmbeddedClickListenerRelativeCoordinates extends TestBase {
 
     @Override
     protected void setup() {
-        Embedded e = new Embedded("Embedded caption", new ThemeResource(
-                "../runo/icons/64/ok.png"));
+        Embedded e = new Embedded("Embedded caption",
+                new ThemeResource("../runo/icons/64/ok.png"));
         final Label xLabel = new Label();
         xLabel.setId("x");
         final Label yLabel = new Label();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index 52454e115e..7632577227 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
@@ -55,8 +55,8 @@ public class EmbeddedImageRefresh extends TestBase {
         button.addListener(new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                ((StreamResource) embedded.getSource()).setFilename(new Date()
-                        .getTime() + ".png");
+                ((StreamResource) embedded.getSource())
+                        .setFilename(new Date().getTime() + ".png");
                 embedded.markAsDirty();
             }
         });
@@ -130,8 +130,8 @@ public class EmbeddedImageRefresh extends TestBase {
                     } else {
                         drawable.setColor(Color.black);
                     }
-                    drawable.fillRect(gridx + 1, gridy + 1, gridxnext - gridx
-                            - 1, gridynext - gridy - 1);
+                    drawable.fillRect(gridx + 1, gridy + 1,
+                            gridxnext - gridx - 1, gridynext - gridy - 1);
                 }
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index aa24337013..28bca2001c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
@@ -18,9 +18,10 @@ public class EmbeddedTooltip extends TestBase {
 
     @Override
     protected void setup() {
-        Embedded e = new Embedded("Embedded caption", new ThemeResource(
-                "../runo/icons/64/ok.png"));
-        e.setDescription("Embedded tooltip, only shown on caption, not on the image");
+        Embedded e = new Embedded("Embedded caption",
+                new ThemeResource("../runo/icons/64/ok.png"));
+        e.setDescription(
+                "Embedded tooltip, only shown on caption, not on the image");
         addComponent(e);
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java
index 5d2dc02ccb..07a96381a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java
@@ -45,12 +45,10 @@ public class FormLayoutClickListener extends AbstractTestUIWithLog {
 
             @Override
             public void layoutClick(LayoutClickEvent event) {
-                log("Child component: "
-                        + (event.getChildComponent() == null ? null : event
-                                .getChildComponent().getId()));
-                log("Clicked component: "
-                        + (event.getClickedComponent() == null ? null : event
-                                .getClickedComponent().getId()));
+                log("Child component: " + (event.getChildComponent() == null
+                        ? null : event.getChildComponent().getId()));
+                log("Clicked component: " + (event.getClickedComponent() == null
+                        ? null : event.getClickedComponent().getId()));
                 log("Source component: " + event.getComponent().getId());
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
index 32476dee1e..674ad4100e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
@@ -25,10 +25,12 @@ import com.vaadin.ui.FormLayout;
 public class HtmlCaptionInFormLayout extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
-        final LegacyTextField asHtml = new LegacyTextField("Contains <b>HTML</b>");
+        final LegacyTextField asHtml = new LegacyTextField(
+                "Contains <b>HTML</b>");
         asHtml.setCaptionAsHtml(true);
 
-        final LegacyTextField asText = new LegacyTextField("Contains <b>HTML</b>");
+        final LegacyTextField asText = new LegacyTextField(
+                "Contains <b>HTML</b>");
 
         addComponent(new FormLayout(asHtml, asText));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
index 171d3f2a5e..4e41c09eca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
@@ -67,8 +67,8 @@ public class CustomRenderer extends AbstractTestUI {
         Grid grid = new Grid(container);
 
         grid.getColumn(INT_ARRAY_PROPERTY).setRenderer(new IntArrayRenderer());
-        grid.getColumn(VOID_PROPERTY).setRenderer(
-                new RowAwareRenderer(debugLabel));
+        grid.getColumn(VOID_PROPERTY)
+                .setRenderer(new RowAwareRenderer(debugLabel));
         grid.getColumn(BEAN_PROPERTY).setRenderer(new BeanRenderer());
 
         grid.setSelectionMode(SelectionMode.NONE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
index c0e3c9d683..793ccb8c18 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
@@ -27,8 +27,8 @@ public class GridCellFocusOnResetSize extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        addComponent(new TestWidgetComponent(
-                GridCellFocusOnResetSizeWidget.class));
+        addComponent(
+                new TestWidgetComponent(GridCellFocusOnResetSizeWidget.class));
     }
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
index 7bd1c838d7..49147f004d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
@@ -27,6 +27,7 @@ public class GridClientDataChangeHandler extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        addComponent(new TestWidgetComponent(GridDataChangeHandlerWidget.class));
+        addComponent(
+                new TestWidgetComponent(GridDataChangeHandlerWidget.class));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
index 23d3c3c394..8daa685b66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
@@ -66,8 +66,8 @@ public class GridColspans extends AbstractTestUI {
                 .join(dataSource.getContainerPropertyIds().toArray())
                 .setText("All the stuff");
 
-        addComponent(new Button("Show/Hide firstName",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Show/Hide firstName", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -79,8 +79,8 @@ public class GridColspans extends AbstractTestUI {
                     }
                 }));
 
-        addComponent(new Button("Change column order",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Change column order", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
index 0829e09de9..2aab18d6e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
@@ -27,7 +27,7 @@ public class GridColumnAutoWidthClient extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        addComponent(new TestWidgetComponent(
-                GridColumnAutoWidthClientWidget.class));
+        addComponent(
+                new TestWidgetComponent(GridColumnAutoWidthClientWidget.class));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
index f8338f991a..b2052ee3dc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
@@ -97,7 +97,8 @@ public class GridColumnExpand extends AbstractTestUI {
         return layout;
     }
 
-    private Component createWidthButton(final Column column, final double width) {
+    private Component createWidthButton(final Column column,
+            final double width) {
         return new Button("" + width, new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
index b04745f17a..bced274f32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
@@ -50,16 +50,16 @@ public class GridColumnWidthsWithoutData extends AbstractTestUI {
         });
         addComponent(selectionModeSelector);
 
-        addComponent(new Button("Recreate without data",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Recreate without data", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         replaceGrid(createGrid(false));
                     }
                 }));
 
-        addComponent(new Button("Recreate with data",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Recreate with data", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         replaceGrid(createGrid(true));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
index f18c0f9bdb..926ba16b87 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
@@ -55,8 +55,8 @@ public class GridDetailsDetach extends AbstractTestUI {
             }
         });
 
-        layout.addComponent(new Button("Reattach Grid",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Reattach Grid", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         gridContainer.removeAllComponents();
@@ -87,8 +87,8 @@ public class GridDetailsDetach extends AbstractTestUI {
             public Component getDetails(RowReference rowReference) {
                 final GridExampleBean bean = (GridExampleBean) rowReference
                         .getItemId();
-                VerticalLayout layout = new VerticalLayout(new Label(
-                        "Extra data for " + bean.getName()));
+                VerticalLayout layout = new VerticalLayout(
+                        new Label("Extra data for " + bean.getName()));
                 layout.setMargin(true);
                 return layout;
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
index 27676a14af..028be3a810 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
@@ -41,8 +41,8 @@ public class GridEditorUI extends AbstractTestUI {
 
         grid.getColumn("firstName").setEditorField(new PasswordField());
 
-        LegacyTextField lastNameField = (LegacyTextField) grid.getColumn("lastName")
-                .getEditorField();
+        LegacyTextField lastNameField = (LegacyTextField) grid
+                .getColumn("lastName").getEditorField();
         lastNameField.setMaxLength(50);
 
         grid.getColumn("phoneNumber").getEditorField().setReadOnly(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
index 31fe0275a5..ef8b80c965 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
@@ -42,13 +42,14 @@ public class GridFastAsyncUpdate extends AbstractTestUI {
 
                             ++counter;
                             Item item = container.addItem(counter);
-                            item.getItemProperty("sequenceNumber").setValue(
-                                    String.valueOf(counter));
-                            item.getItemProperty("millis").setValue(
-                                    String.valueOf(Calendar.getInstance()
-                                            .getTimeInMillis() - loggingStart));
-                            item.getItemProperty("level").setValue(
-                                    Level.INFO.toString());
+                            item.getItemProperty("sequenceNumber")
+                                    .setValue(String.valueOf(counter));
+                            item.getItemProperty("millis")
+                                    .setValue(String.valueOf(Calendar
+                                            .getInstance().getTimeInMillis()
+                                            - loggingStart));
+                            item.getItemProperty("level")
+                                    .setValue(Level.INFO.toString());
                             item.getItemProperty("message").setValue("Message");
                             if (grid != null && !scrollLock) {
                                 grid.scrollToEnd();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
index fbd6a42a38..f200fcb71c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
@@ -107,8 +107,8 @@ public class GridHeaderFormatChange extends AbstractTestUI {
         grid = new Grid(datasource);
         grid.setWidth("600px");
         grid.getColumn("zipCode").setRenderer(new NumberRenderer());
-        grid.setColumnOrder("firstName", "lastName", "streetAddress",
-                "zipCode", "city");
+        grid.setColumnOrder("firstName", "lastName", "streetAddress", "zipCode",
+                "city");
         grid.setSelectionMode(SelectionMode.SINGLE);
         addComponent(grid);
 
@@ -156,8 +156,8 @@ public class GridHeaderFormatChange extends AbstractTestUI {
                         if (row == null) {
                             row = grid.prependHeaderRow();
                             if (grid.getColumn("firstName") != null) {
-                                row.join("firstName", "lastName").setText(
-                                        "Full Name");
+                                row.join("firstName", "lastName")
+                                        .setText("Full Name");
                             }
                             row.join("streetAddress", "zipCode", "city")
                                     .setText("Address");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
index 019850dabb..cefcbcfd48 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
@@ -42,8 +42,8 @@ public class GridHeaderStyleNames extends AbstractTestUIWithLog {
     protected void setup(VaadinRequest request) {
         Grid grid = new Grid();
         grid.setSelectionMode(SelectionMode.MULTI);
-        grid.setContainerDataSource(BeanItemContainerGenerator
-                .createContainer(100));
+        grid.setContainerDataSource(
+                BeanItemContainerGenerator.createContainer(100));
 
         ageHeaderCell = grid.getDefaultHeaderRow().getCell("age");
         grid.getDefaultHeaderRow().setStyleName("foo");
@@ -55,18 +55,14 @@ public class GridHeaderStyleNames extends AbstractTestUIWithLog {
         footerRow = grid.appendFooterRow();
         ageFooterCell = footerRow.getCell("age");
 
-        getPage()
-                .getStyles()
-                .add(".age {background-image: linear-gradient(to bottom,green 2%, #efefef 98%) !important;}");
-        getPage()
-                .getStyles()
-                .add(".valo .v-grid-header .v-grid-cell.city-country {background-image: linear-gradient(to bottom,yellow 2%, #efefef 98%) !important;}");
-        getPage()
-                .getStyles()
-                .add(".valo .v-grid-footer .v-grid-cell.age-footer {background-image: linear-gradient(to bottom,blue 2%, #efefef 98%) !important;}");
-        getPage()
-                .getStyles()
-                .add(".valo .v-grid .v-grid-row.custom-row > * {background-image: linear-gradient(to bottom,purple 2%, #efefef 98%);}");
+        getPage().getStyles().add(
+                ".age {background-image: linear-gradient(to bottom,green 2%, #efefef 98%) !important;}");
+        getPage().getStyles().add(
+                ".valo .v-grid-header .v-grid-cell.city-country {background-image: linear-gradient(to bottom,yellow 2%, #efefef 98%) !important;}");
+        getPage().getStyles().add(
+                ".valo .v-grid-footer .v-grid-cell.age-footer {background-image: linear-gradient(to bottom,blue 2%, #efefef 98%) !important;}");
+        getPage().getStyles().add(
+                ".valo .v-grid .v-grid-row.custom-row > * {background-image: linear-gradient(to bottom,purple 2%, #efefef 98%);}");
 
         setCellStyles(true);
         setRowStyles(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
index cddbd390f2..58efb92239 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
@@ -51,8 +51,8 @@ public class GridInTabSheet extends AbstractTestUI {
                 grid.addRow(100 + (k++));
             }
         }));
-        addComponent(new Button("Remove row from Grid",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Remove row from Grid", new Button.ClickListener() {
 
                     private Integer k = 0;
 
@@ -61,8 +61,8 @@ public class GridInTabSheet extends AbstractTestUI {
                         Object firstItemId = grid.getContainerDataSource()
                                 .firstItemId();
                         if (firstItemId != null) {
-                            grid.getContainerDataSource().removeItem(
-                                    firstItemId);
+                            grid.getContainerDataSource()
+                                    .removeItem(firstItemId);
                         }
                     }
                 }));
@@ -73,7 +73,8 @@ public class GridInTabSheet extends AbstractTestUI {
                     public void buttonClick(ClickEvent event) {
                         grid.setCellStyleGenerator(new CellStyleGenerator() {
                             @Override
-                            public String getStyle(CellReference cellReference) {
+                            public String getStyle(
+                                    CellReference cellReference) {
                                 int rowIndex = ((Integer) cellReference
                                         .getItemId()).intValue();
                                 Object propertyId = cellReference
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
index 4a11c19242..6174a37416 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
@@ -38,8 +38,8 @@ public class GridMultiSelectionOnInit extends AbstractTestUI {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                ((MultiSelectionModel) grid.getSelectionModel())
-                        .setSelected(grid.getContainerDataSource().getItemIds());
+                ((MultiSelectionModel) grid.getSelectionModel()).setSelected(
+                        grid.getContainerDataSource().getItemIds());
             }
         }));
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
index 3cb735d92b..377d0e74e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
@@ -14,8 +14,8 @@ import java.util.List;
 
 public class GridRowHeightChange extends AbstractTestUI {
 
-    private final List<String> themes = Arrays
-            .asList("valo", "reindeer", "runo", "chameleon", "base");
+    private final List<String> themes = Arrays.asList("valo", "reindeer",
+            "runo", "chameleon", "base");
 
     @Override
     protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
index ce64b3e9f3..ae880819b2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
@@ -47,8 +47,8 @@ public class GridScrolling extends AbstractTestUI {
         for (int row = 0; row < 65536; row++) {
             Item item = ds.addItem(Integer.valueOf(row));
             for (int col = 0; col < 5; col++) {
-                item.getItemProperty("col" + col).setValue(
-                        "(" + row + ", " + col + ")");
+                item.getItemProperty("col" + col)
+                        .setValue("(" + row + ", " + col + ")");
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
index 852ec7cea6..d2dfa42cc4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
@@ -41,7 +41,8 @@ public class GridSidebarPosition extends AbstractTestUI {
         for (int i = 0; i < 30; i++) {
             grid.addColumn(
                     "This is a really really really really long column name "
-                            + i).setHidable(true);
+                            + i)
+                    .setHidable(true);
         }
         hl.addComponent(grid);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
index a05365d575..2fbaefbb32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
@@ -49,16 +49,17 @@ public class GridSortIndicator extends AbstractTestUI {
                     // is not null.
                     List<SortOrder> newSortOrder = new ArrayList<SortOrder>();
                     SortDirection newSortDirection = oldSortDirection;
-                    if (currentSortOrder.get(0).getPropertyId().equals("Name")) {
-                        newSortDirection = SortDirection.ASCENDING
-                                .equals(oldSortDirection) ? SortDirection.DESCENDING
-                                : SortDirection.ASCENDING;
+                    if (currentSortOrder.get(0).getPropertyId()
+                            .equals("Name")) {
+                        newSortDirection = SortDirection.ASCENDING.equals(
+                                oldSortDirection) ? SortDirection.DESCENDING
+                                        : SortDirection.ASCENDING;
                     }
                     if (newSortDirection != null) {
                         newSortOrder
                                 .add(new SortOrder("Name", newSortDirection));
-                        newSortOrder.add(new SortOrder("Value",
-                                newSortDirection));
+                        newSortOrder
+                                .add(new SortOrder("Value", newSortDirection));
                         g.setSortOrder(newSortOrder);
                     }
                     oldSortDirection = newSortDirection;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
index 23c075136d..9c4ce0fb45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
@@ -60,8 +60,8 @@ public class GridSwitchRenderers extends AbstractTestUIWithLog {
         grid.getColumn(EXPANSION_COLUMN_ID).setWidth(50);
         for (int col = MANUALLY_FORMATTED_COLUMNS; col < COLUMNS; col++) {
             grid.getColumn(getColumnProperty(col)).setWidth(300);
-            grid.getColumn(getColumnProperty(col)).setRenderer(
-                    new TextRenderer());
+            grid.getColumn(getColumnProperty(col))
+                    .setRenderer(new TextRenderer());
         }
 
         grid.setSelectionMode(SelectionMode.NONE);
@@ -86,8 +86,8 @@ public class GridSwitchRenderers extends AbstractTestUIWithLog {
         int col = MANUALLY_FORMATTED_COLUMNS;
 
         for (; col < COLUMNS; col++) {
-            item.getItemProperty(getColumnProperty(col)).setValue(
-                    "<b>(" + content + ", " + col + ")</b>");
+            item.getItemProperty(getColumnProperty(col))
+                    .setValue("<b>(" + content + ", " + col + ")</b>");
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
index 6726400327..cce5ceecd5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
@@ -36,8 +36,8 @@ public class GridWidthIncrease extends AbstractTestUI {
         grid.addRow(rowData);
         grid.setWidth(400 + "px");
         addComponent(grid);
-        addComponent(new Button("Increase Grid Width",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Increase Grid Width", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
index 8f88883161..1caa0763b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
@@ -61,8 +61,8 @@ public class JavaScriptRenderers extends AbstractTestUI {
             Integer itemId = Integer.valueOf(i);
             Item item = container.addItem(itemId);
             item.getItemProperty("id").setValue(itemId);
-            item.getItemProperty("bean").setValue(
-                    new MyBean(i + 1, Integer.toString(i - 1)));
+            item.getItemProperty("bean")
+                    .setValue(new MyBean(i + 1, Integer.toString(i - 1)));
             item.getItemProperty("string").setValue("string" + i);
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
index ab3be6f4f1..27a2ebb58a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
@@ -19,8 +19,8 @@ import com.vaadin.annotations.JavaScript;
 import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
 
 @JavaScript("JavaScriptStringRenderer.js")
-public class JavaScriptStringRenderer extends
-        AbstractJavaScriptRenderer<String> {
+public class JavaScriptStringRenderer
+        extends AbstractJavaScriptRenderer<String> {
 
     protected JavaScriptStringRenderer() {
         super(String.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
index db86847690..9ed2812803 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
@@ -44,13 +44,13 @@ public class NullRenderers extends AbstractTestUI {
         container.addContainerProperty(TextRenderer.class, String.class, null);
         container.addContainerProperty(HtmlRenderer.class, String.class, null);
         container.addContainerProperty(DateRenderer.class, Date.class, null);
-        container
-                .addContainerProperty(NumberRenderer.class, Number.class, null);
+        container.addContainerProperty(NumberRenderer.class, Number.class,
+                null);
 
         container.addContainerProperty(ProgressBarRenderer.class, Double.class,
                 null);
-        container
-                .addContainerProperty(ButtonRenderer.class, String.class, null);
+        container.addContainerProperty(ButtonRenderer.class, String.class,
+                null);
         container.addContainerProperty(ImageRenderer.class, Resource.class,
                 null);
 
@@ -62,27 +62,27 @@ public class NullRenderers extends AbstractTestUI {
         gridDefaults.setSelectionMode(SelectionMode.NONE);
         gridDefaults.setWidth("100%");
 
-        gridDefaults.getColumn(TextRenderer.class).setRenderer(
-                new TextRenderer("-- No Text --"));
-        gridDefaults.getColumn(HtmlRenderer.class).setRenderer(
-                new HtmlRenderer("-- No Jokes --"));
+        gridDefaults.getColumn(TextRenderer.class)
+                .setRenderer(new TextRenderer("-- No Text --"));
+        gridDefaults.getColumn(HtmlRenderer.class)
+                .setRenderer(new HtmlRenderer("-- No Jokes --"));
         gridDefaults.getColumn(DateRenderer.class).setRenderer(
                 new DateRenderer("%s", Locale.getDefault(), "-- Never --"));
         gridDefaults.getColumn(NumberRenderer.class).setRenderer(
                 new NumberRenderer("%s", Locale.getDefault(), "-- Nothing --"));
 
-        gridDefaults.getColumn(ProgressBarRenderer.class).setRenderer(
-                new ProgressBarRenderer());
+        gridDefaults.getColumn(ProgressBarRenderer.class)
+                .setRenderer(new ProgressBarRenderer());
 
-        gridDefaults.getColumn(ButtonRenderer.class).setRenderer(
-                new ButtonRenderer(new RendererClickListener() {
+        gridDefaults.getColumn(ButtonRenderer.class)
+                .setRenderer(new ButtonRenderer(new RendererClickListener() {
                     @Override
                     public void click(RendererClickEvent event) {
                     }
                 }, "-- No Control --"));
 
-        gridDefaults.getColumn(ImageRenderer.class).setRenderer(
-                new ImageRenderer(new RendererClickListener() {
+        gridDefaults.getColumn(ImageRenderer.class)
+                .setRenderer(new ImageRenderer(new RendererClickListener() {
 
                     @Override
                     public void click(RendererClickEvent event) {
@@ -97,27 +97,27 @@ public class NullRenderers extends AbstractTestUI {
         gridNoDefaults.setSelectionMode(SelectionMode.NONE);
         gridNoDefaults.setWidth("100%");
 
-        gridNoDefaults.getColumn(TextRenderer.class).setRenderer(
-                new TextRenderer());
-        gridNoDefaults.getColumn(HtmlRenderer.class).setRenderer(
-                new HtmlRenderer());
-        gridNoDefaults.getColumn(DateRenderer.class).setRenderer(
-                new DateRenderer());
-        gridNoDefaults.getColumn(NumberRenderer.class).setRenderer(
-                new NumberRenderer());
+        gridNoDefaults.getColumn(TextRenderer.class)
+                .setRenderer(new TextRenderer());
+        gridNoDefaults.getColumn(HtmlRenderer.class)
+                .setRenderer(new HtmlRenderer());
+        gridNoDefaults.getColumn(DateRenderer.class)
+                .setRenderer(new DateRenderer());
+        gridNoDefaults.getColumn(NumberRenderer.class)
+                .setRenderer(new NumberRenderer());
 
-        gridNoDefaults.getColumn(ProgressBarRenderer.class).setRenderer(
-                new ProgressBarRenderer());
+        gridNoDefaults.getColumn(ProgressBarRenderer.class)
+                .setRenderer(new ProgressBarRenderer());
 
-        gridNoDefaults.getColumn(ButtonRenderer.class).setRenderer(
-                new ButtonRenderer(new RendererClickListener() {
+        gridNoDefaults.getColumn(ButtonRenderer.class)
+                .setRenderer(new ButtonRenderer(new RendererClickListener() {
                     @Override
                     public void click(RendererClickEvent event) {
                     }
                 }));
 
-        gridNoDefaults.getColumn(ImageRenderer.class).setRenderer(
-                new ImageRenderer(new RendererClickListener() {
+        gridNoDefaults.getColumn(ImageRenderer.class)
+                .setRenderer(new ImageRenderer(new RendererClickListener() {
 
                     @Override
                     public void click(RendererClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
index 56e6c608b3..09d9a12a2b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
@@ -32,17 +32,16 @@ public class SortableHeaderStyles extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        getPage()
-                .getStyles()
-                .add(".valo .v-grid-header th.v-grid-cell.sortable { font-weight: bold;}");
+        getPage().getStyles().add(
+                ".valo .v-grid-header th.v-grid-cell.sortable { font-weight: bold;}");
 
         PersonContainer container = PersonContainer.createWithTestData();
 
         Collection<?> sortableContainerPropertyIds = container
                 .getSortableContainerPropertyIds();
 
-        final OptionGroup sortableSelector = new OptionGroup(
-                "Sortable columns", sortableContainerPropertyIds);
+        final OptionGroup sortableSelector = new OptionGroup("Sortable columns",
+                sortableContainerPropertyIds);
         sortableSelector.setMultiSelect(true);
         sortableSelector.setValue(sortableContainerPropertyIds);
 
@@ -54,8 +53,8 @@ public class SortableHeaderStyles extends AbstractTestUI {
                 Collection<?> sortableCols = (Collection<?>) sortableSelector
                         .getValue();
                 for (Column column : grid.getColumns()) {
-                    column.setSortable(sortableCols.contains(column
-                            .getPropertyId()));
+                    column.setSortable(
+                            sortableCols.contains(column.getPropertyId()));
                 }
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
index d1110d4caa..0d89b96df1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
@@ -43,8 +43,8 @@ public class WidgetRenderers extends AbstractTestUI {
 
         container.addContainerProperty(ProgressBarRenderer.class, Double.class,
                 null);
-        container
-                .addContainerProperty(ButtonRenderer.class, String.class, null);
+        container.addContainerProperty(ButtonRenderer.class, String.class,
+                null);
         container.addContainerProperty(ImageRenderer.class, Resource.class,
                 null);
         container.addContainerProperty(PROPERTY_ID, String.class, null);
@@ -53,8 +53,8 @@ public class WidgetRenderers extends AbstractTestUI {
 
         item.getItemProperty(ProgressBarRenderer.class).setValue(0.3);
         item.getItemProperty(ButtonRenderer.class).setValue("Click");
-        item.getItemProperty(ImageRenderer.class).setValue(
-                new ThemeResource("window/img/close.png"));
+        item.getItemProperty(ImageRenderer.class)
+                .setValue(new ThemeResource("window/img/close.png"));
         item.getItemProperty(PROPERTY_ID).setValue("Click");
 
         final Grid grid = new Grid(container);
@@ -62,20 +62,20 @@ public class WidgetRenderers extends AbstractTestUI {
         grid.setId("test-grid");
         grid.setSelectionMode(SelectionMode.NONE);
 
-        grid.getColumn(ProgressBarRenderer.class).setRenderer(
-                new ProgressBarRenderer());
+        grid.getColumn(ProgressBarRenderer.class)
+                .setRenderer(new ProgressBarRenderer());
 
-        grid.getColumn(ButtonRenderer.class).setRenderer(
-                new ButtonRenderer(new RendererClickListener() {
+        grid.getColumn(ButtonRenderer.class)
+                .setRenderer(new ButtonRenderer(new RendererClickListener() {
                     @Override
                     public void click(RendererClickEvent event) {
-                        item.getItemProperty(ButtonRenderer.class).setValue(
-                                "Clicked!");
+                        item.getItemProperty(ButtonRenderer.class)
+                                .setValue("Clicked!");
                     }
                 }));
 
-        grid.getColumn(ImageRenderer.class).setRenderer(
-                new ImageRenderer(new RendererClickListener() {
+        grid.getColumn(ImageRenderer.class)
+                .setRenderer(new ImageRenderer(new RendererClickListener() {
 
                     @Override
                     public void click(RendererClickEvent event) {
@@ -84,12 +84,12 @@ public class WidgetRenderers extends AbstractTestUI {
                     }
                 }));
 
-        grid.getColumn(PROPERTY_ID).setRenderer(
-                new ButtonRenderer(new RendererClickListener() {
+        grid.getColumn(PROPERTY_ID)
+                .setRenderer(new ButtonRenderer(new RendererClickListener() {
                     @Override
                     public void click(RendererClickEvent event) {
-                        item.getItemProperty(PROPERTY_ID).setValue(
-                                event.getPropertyId());
+                        item.getItemProperty(PROPERTY_ID)
+                                .setValue(event.getPropertyId());
                     }
                 }));
 
@@ -100,7 +100,8 @@ public class WidgetRenderers extends AbstractTestUI {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         grid.setColumnOrder(ImageRenderer.class,
-                                ProgressBarRenderer.class, ButtonRenderer.class);
+                                ProgressBarRenderer.class,
+                                ButtonRenderer.class);
                     }
                 }));
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
index 429f15bb47..3b699a7031 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
@@ -33,7 +33,8 @@ public class GridBasicClientFeatures extends UI {
 
     @Override
     protected void init(VaadinRequest request) {
-        setContent(new TestWidgetComponent(GridBasicClientFeaturesWidget.class));
+        setContent(
+                new TestWidgetComponent(GridBasicClientFeaturesWidget.class));
     }
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 175396289a..a5976fa920 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -118,7 +118,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
             Object addedRow = (iter.hasNext() ? iter.next() : "none");
             iter = event.getRemoved().iterator();
             Object removedRow = (iter.hasNext() ? iter.next() : "none");
-            log("SelectionEvent: Added " + addedRow + ", Removed " + removedRow);
+            log("SelectionEvent: Added " + addedRow + ", Removed "
+                    + removedRow);
         }
     };
 
@@ -126,9 +127,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
         @Override
         public void itemClick(ItemClickEvent event) {
-            log("Item " + (event.isDoubleClick() ? "double " : "")
-                    + "click on " + event.getPropertyId() + ", item "
-                    + event.getItemId());
+            log("Item " + (event.isDoubleClick() ? "double " : "") + "click on "
+                    + event.getPropertyId() + ", item " + event.getItemId());
         }
     };
 
@@ -204,8 +204,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                 cssLayout.addComponent(new Label(string));
             }
 
-            final int rowIndex = grid.getContainerDataSource().indexOfId(
-                    rowReference.getItemId());
+            final int rowIndex = grid.getContainerDataSource()
+                    .indexOfId(rowReference.getItemId());
             ClickListener clickListener = new ClickListener() {
                 @Override
                 public void buttonClick(ClickEvent event) {
@@ -293,26 +293,26 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                 Item item = ds.addItem(Integer.valueOf(row));
                 int col = 0;
                 for (; col < COLUMNS - MANUALLY_FORMATTED_COLUMNS; col++) {
-                    item.getItemProperty(getColumnProperty(col)).setValue(
-                            "(" + row + ", " + col + ")");
+                    item.getItemProperty(getColumnProperty(col))
+                            .setValue("(" + row + ", " + col + ")");
                 }
                 item.getItemProperty(getColumnProperty(1)).setReadOnly(true);
 
-                item.getItemProperty(getColumnProperty(col++)).setValue(
-                        Integer.valueOf(row));
-                item.getItemProperty(getColumnProperty(col++)).setValue(
-                        new Date(timestamp));
+                item.getItemProperty(getColumnProperty(col++))
+                        .setValue(Integer.valueOf(row));
+                item.getItemProperty(getColumnProperty(col++))
+                        .setValue(new Date(timestamp));
                 timestamp += 91250000; // a bit over a day, just to get
                                        // variation
-                item.getItemProperty(getColumnProperty(col++)).setValue(
-                        "<b>" + row + "</b>");
+                item.getItemProperty(getColumnProperty(col++))
+                        .setValue("<b>" + row + "</b>");
 
                 // Random numbers
-                item.getItemProperty(getColumnProperty(col++)).setValue(
-                        rand.nextInt());
+                item.getItemProperty(getColumnProperty(col++))
+                        .setValue(rand.nextInt());
                 // Random between 0 - 5 to test multisorting
-                item.getItemProperty(getColumnProperty(col++)).setValue(
-                        rand.nextInt(5));
+                item.getItemProperty(getColumnProperty(col++))
+                        .setValue(rand.nextInt(5));
             }
         }
 
@@ -321,21 +321,20 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
         {
             int col = grid.getContainerDataSource().getContainerPropertyIds()
-                    .size()
-                    - MANUALLY_FORMATTED_COLUMNS;
-            grid.getColumn(getColumnProperty(col++)).setRenderer(
-                    new NumberRenderer(new DecimalFormat("0,000.00",
-                            DecimalFormatSymbols.getInstance(new Locale("fi",
-                                    "FI")))));
+                    .size() - MANUALLY_FORMATTED_COLUMNS;
+            grid.getColumn(getColumnProperty(col++))
+                    .setRenderer(new NumberRenderer(
+                            new DecimalFormat("0,000.00", DecimalFormatSymbols
+                                    .getInstance(new Locale("fi", "FI")))));
 
             grid.getColumn(getColumnProperty(col++)).setRenderer(
                     new DateRenderer(new SimpleDateFormat("dd.MM.yy HH:mm")));
-            grid.getColumn(getColumnProperty(col++)).setRenderer(
-                    new HtmlRenderer());
-            grid.getColumn(getColumnProperty(col++)).setRenderer(
-                    new NumberRenderer());
-            grid.getColumn(getColumnProperty(col++)).setRenderer(
-                    new NumberRenderer());
+            grid.getColumn(getColumnProperty(col++))
+                    .setRenderer(new HtmlRenderer());
+            grid.getColumn(getColumnProperty(col++))
+                    .setRenderer(new NumberRenderer());
+            grid.getColumn(getColumnProperty(col++))
+                    .setRenderer(new NumberRenderer());
         }
 
         // Create footer
@@ -480,8 +479,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
         primaryStyleNames.put("v-escalator", "v-escalator");
         primaryStyleNames.put("my-grid", "my-grid");
 
-        createMultiClickAction("Primary style name", "State",
-                primaryStyleNames, new Command<Grid, String>() {
+        createMultiClickAction("Primary style name", "State", primaryStyleNames,
+                new Command<Grid, String>() {
 
                     @Override
                     public void execute(Grid grid, String value, Object data) {
@@ -504,7 +503,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                             grid.addSelectionListener(selectionListener);
 
                             ((SelectionModel.Single) grid.getSelectionModel())
-                                    .setDeselectAllowed(singleSelectAllowDeselect);
+                                    .setDeselectAllowed(
+                                            singleSelectAllowDeselect);
                         } else {
                             grid.removeSelectionListener(selectionListener);
                         }
@@ -520,7 +520,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                 new Command<Grid, Integer>() {
                     @Override
                     public void execute(Grid grid, Integer limit, Object data) {
-                        if (!(grid.getSelectionModel() instanceof MultiSelectionModel)) {
+                        if (!(grid
+                                .getSelectionModel() instanceof MultiSelectionModel)) {
                             grid.setSelectionMode(SelectionMode.MULTI);
                         }
 
@@ -531,8 +532,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
         LinkedHashMap<String, List<SortOrder>> sortableProperties = new LinkedHashMap<String, List<SortOrder>>();
         for (Object propertyId : ds.getSortableContainerPropertyIds()) {
-            sortableProperties.put(propertyId + ", ASC", Sort.by(propertyId)
-                    .build());
+            sortableProperties.put(propertyId + ", ASC",
+                    Sort.by(propertyId).build());
             sortableProperties.put(propertyId + ", DESC",
                     Sort.by(propertyId, SortDirection.DESCENDING).build());
         }
@@ -654,12 +655,12 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     }
                 });
 
-        createSelectAction("Cell style generator", "State",
-                cellStyleGenerators, CELL_STYLE_GENERATOR_NONE,
+        createSelectAction("Cell style generator", "State", cellStyleGenerators,
+                CELL_STYLE_GENERATOR_NONE,
                 new Command<Grid, CellStyleGenerator>() {
                     @Override
-                    public void execute(Grid grid,
-                            CellStyleGenerator generator, Object data) {
+                    public void execute(Grid grid, CellStyleGenerator generator,
+                            Object data) {
                         grid.setCellStyleGenerator(generator);
                     }
                 });
@@ -669,8 +670,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
                     @Override
                     public void execute(Grid c, Boolean value, Object data) {
-                        c.setRowDescriptionGenerator(value ? rowDescriptionGenerator
-                                : null);
+                        c.setRowDescriptionGenerator(
+                                value ? rowDescriptionGenerator : null);
                     }
                 });
 
@@ -678,8 +679,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                 new Command<Grid, Boolean>() {
                     @Override
                     public void execute(Grid c, Boolean value, Object data) {
-                        c.setCellDescriptionGenerator(value ? cellDescriptionGenerator
-                                : null);
+                        c.setCellDescriptionGenerator(
+                                value ? cellDescriptionGenerator : null);
                     }
                 });
 
@@ -734,9 +735,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     @Override
                     public void execute(Grid c, Boolean value, Object data) {
                         if (!value) {
-                            c.removeItemClickListener(editorOpeningItemClickListener);
+                            c.removeItemClickListener(
+                                    editorOpeningItemClickListener);
                         } else {
-                            c.addItemClickListener(editorOpeningItemClickListener);
+                            c.addItemClickListener(
+                                    editorOpeningItemClickListener);
                         }
                     }
 
@@ -750,11 +753,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                                 .getField("Column 0");
                         if (targetField != null) {
                             if (!value) {
-                                targetField
-                                        .removeValueChangeListener(reactiveValueChanger);
+                                targetField.removeValueChangeListener(
+                                        reactiveValueChanger);
                             } else {
-                                targetField
-                                        .addValueChangeListener(reactiveValueChanger);
+                                targetField.addValueChangeListener(
+                                        reactiveValueChanger);
                             }
                         }
                     }
@@ -766,9 +769,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     @Override
                     public void execute(Grid grid, Boolean value, Object data) {
                         if (value) {
-                            grid.addColumnReorderListener(columnReorderListener);
+                            grid.addColumnReorderListener(
+                                    columnReorderListener);
                         } else {
-                            grid.removeColumnReorderListener(columnReorderListener);
+                            grid.removeColumnReorderListener(
+                                    columnReorderListener);
                         }
                     }
                 });
@@ -777,9 +782,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     @Override
                     public void execute(Grid grid, Boolean value, Object data) {
                         if (value) {
-                            grid.addColumnVisibilityChangeListener(columnVisibilityListener);
+                            grid.addColumnVisibilityChangeListener(
+                                    columnVisibilityListener);
                         } else {
-                            grid.removeColumnVisibilityChangeListener(columnVisibilityListener);
+                            grid.removeColumnVisibilityChangeListener(
+                                    columnVisibilityListener);
                         }
                     }
                 });
@@ -791,8 +798,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
                         SelectionModel model = c.getSelectionModel();
                         if (model instanceof SelectionModel.Single) {
-                            ((SelectionModel.Single) model)
-                                    .setDeselectAllowed(singleSelectAllowDeselect);
+                            ((SelectionModel.Single) model).setDeselectAllowed(
+                                    singleSelectAllowDeselect);
                         }
                     }
                 });
@@ -852,8 +859,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         if (value.equals("Top")) {
                             defaultRow = grid.getHeaderRow(0);
                         } else if (value.equals("Bottom")) {
-                            defaultRow = grid.getHeaderRow(grid
-                                    .getHeaderRowCount() - 1);
+                            defaultRow = grid
+                                    .getHeaderRow(grid.getHeaderRowCount() - 1);
                         }
                         grid.setDefaultHeaderRow(defaultRow);
                     }
@@ -961,14 +968,17 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         String wasColumnHidingToggleCaption;
 
                         @Override
-                        public void execute(Grid grid, String value, Object data) {
-                            String columnProperty = getColumnProperty((Integer) data);
+                        public void execute(Grid grid, String value,
+                                Object data) {
+                            String columnProperty = getColumnProperty(
+                                    (Integer) data);
                             Column column = grid.getColumn(columnProperty);
                             if (column == null) {
                                 column = grid.addColumn(columnProperty);
                                 column.setHidable(wasHidable);
                                 column.setHidden(wasHidden);
-                                column.setHidingToggleCaption(wasColumnHidingToggleCaption);
+                                column.setHidingToggleCaption(
+                                        wasColumnHidingToggleCaption);
                             } else {
                                 wasHidable = column.isHidable();
                                 wasHidden = column.isHidden();
@@ -982,14 +992,17 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     new Command<Grid, String>() {
 
                         @Override
-                        public void execute(Grid grid, String value, Object data) {
-                            final String columnProperty = getColumnProperty((Integer) data);
+                        public void execute(Grid grid, String value,
+                                Object data) {
+                            final String columnProperty = getColumnProperty(
+                                    (Integer) data);
                             List<Column> cols = grid.getColumns();
                             List<Object> reordered = new ArrayList<Object>();
                             boolean addAsLast = false;
                             for (int i = 0; i < cols.size(); i++) {
                                 Column col = cols.get(i);
-                                if (col.getPropertyId().equals(columnProperty)) {
+                                if (col.getPropertyId()
+                                        .equals(columnProperty)) {
                                     if (i == 0) {
                                         addAsLast = true;
                                     } else {
@@ -1012,7 +1025,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         @Override
                         public void execute(Grid grid, Boolean value,
                                 Object columnIndex) {
-                            Object propertyId = getColumnProperty((Integer) columnIndex);
+                            Object propertyId = getColumnProperty(
+                                    (Integer) columnIndex);
                             Column column = grid.getColumn(propertyId);
                             column.setSortable(value);
                         }
@@ -1024,7 +1038,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         @Override
                         public void execute(Grid grid, Boolean value,
                                 Object columnIndex) {
-                            Object propertyId = getColumnProperty((Integer) columnIndex);
+                            Object propertyId = getColumnProperty(
+                                    (Integer) columnIndex);
                             Column column = grid.getColumn(propertyId);
                             column.setResizable(value);
                         }
@@ -1052,12 +1067,13 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         int count = 0;
 
                         @Override
-                        public void execute(Grid grid, String value, Object data) {
-                            final String columnProperty = getColumnProperty((Integer) data);
+                        public void execute(Grid grid, String value,
+                                Object data) {
+                            final String columnProperty = getColumnProperty(
+                                    (Integer) data);
                             grid.getColumn(columnProperty)
-                                    .setHidingToggleCaption(
-                                            columnProperty + " caption "
-                                                    + count++);
+                                    .setHidingToggleCaption(columnProperty
+                                            + " caption " + count++);
                         }
                     }, null, c);
 
@@ -1066,8 +1082,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         int count = 0;
 
                         @Override
-                        public void execute(Grid grid, String value, Object data) {
-                            final String columnProperty = getColumnProperty((Integer) data);
+                        public void execute(Grid grid, String value,
+                                Object data) {
+                            final String columnProperty = getColumnProperty(
+                                    (Integer) data);
                             grid.getColumn(columnProperty).setHeaderCaption(
                                     columnProperty + " header " + count++);
                         }
@@ -1081,7 +1099,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         @Override
                         public void execute(Grid grid, Integer value,
                                 Object columnIndex) {
-                            Object propertyId = getColumnProperty((Integer) columnIndex);
+                            Object propertyId = getColumnProperty(
+                                    (Integer) columnIndex);
                             Column column = grid.getColumn(propertyId);
                             column.setWidthUndefined();
                         }
@@ -1104,7 +1123,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                             @Override
                             public void execute(Grid grid, Integer value,
                                     Object columnIndex) {
-                                Object propertyId = getColumnProperty((Integer) columnIndex);
+                                Object propertyId = getColumnProperty(
+                                        (Integer) columnIndex);
                                 Column column = grid.getColumn(propertyId);
                                 column.setWidth(value);
                             }
@@ -1120,9 +1140,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     defaultRows, new Command<Grid, GridStaticCellType>() {
 
                         @Override
-                        public void execute(Grid grid,
-                                GridStaticCellType value, Object columnIndex) {
-                            final Object propertyId = getColumnProperty((Integer) columnIndex);
+                        public void execute(Grid grid, GridStaticCellType value,
+                                Object columnIndex) {
+                            final Object propertyId = getColumnProperty(
+                                    (Integer) columnIndex);
                             final HeaderCell cell = grid.getDefaultHeaderRow()
                                     .getCell(propertyId);
                             switch (value) {
@@ -1158,9 +1179,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                     defaultRows, new Command<Grid, GridStaticCellType>() {
 
                         @Override
-                        public void execute(Grid grid,
-                                GridStaticCellType value, Object columnIndex) {
-                            final Object propertyId = getColumnProperty((Integer) columnIndex);
+                        public void execute(Grid grid, GridStaticCellType value,
+                                Object columnIndex) {
+                            final Object propertyId = getColumnProperty(
+                                    (Integer) columnIndex);
                             final FooterCell cell = grid.getFooterRow(0)
                                     .getCell(propertyId);
                             switch (value) {
@@ -1252,8 +1274,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                         if (enable.booleanValue()) {
                             ds.addContainerProperty(propertyId, String.class,
                                     "property value");
-                            grid.getColumn(propertyId).setHeaderCaption(
-                                    "new property");
+                            grid.getColumn(propertyId)
+                                    .setHeaderCaption("new property");
                             grid.setColumnOrder(propertyId);
                         } else {
                             ds.removeContainerProperty(propertyId);
@@ -1293,7 +1315,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                 }
             }
 
-            private <T extends Object> Property<T> getProperty(Item item, int i) {
+            private <T extends Object> Property<T> getProperty(Item item,
+                    int i) {
                 @SuppressWarnings("unchecked")
                 Property<T> itemProperty = item
                         .getItemProperty(getColumnProperty(i));
@@ -1366,9 +1389,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                             Property<?> property = ds.getContainerProperty(
                                     firstItemId, containerPropertyId);
                             if (property.getType().equals(String.class)) {
-                                ((Property<String>) property)
-                                        .setValue("modified: "
-                                                + containerPropertyId);
+                                ((Property<String>) property).setValue(
+                                        "modified: " + containerPropertyId);
                             }
                         }
                     }
@@ -1377,9 +1399,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
         createBooleanAction("Select first row", "Body rows", false,
                 new Command<Grid, Boolean>() {
                     @Override
-                    public void execute(Grid grid, Boolean select, Object data) {
-                        final Object firstItemId = grid
-                                .getContainerDataSource().firstItemId();
+                    public void execute(Grid grid, Boolean select,
+                            Object data) {
+                        final Object firstItemId = grid.getContainerDataSource()
+                                .firstItemId();
                         if (select.booleanValue()) {
                             grid.select(firstItemId);
                         } else {
@@ -1510,8 +1533,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
 
         createCategory("Height", "Size");
         // header 20px + scrollbar 16px = 36px baseline
-        createClickAction("86px (no drag scroll select)", "Height",
-                sizeCommand, "86px");
+        createClickAction("86px (no drag scroll select)", "Height", sizeCommand,
+                "86px");
         createClickAction("96px (drag scroll select limit)", "Height",
                 sizeCommand, "96px");
         createClickAction("106px (drag scroll select enabled)", "Height",
@@ -1532,7 +1555,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
     private void createDetailsActions() {
         Command<Grid, DetailsGenerator> swapDetailsGenerator = new Command<Grid, DetailsGenerator>() {
             @Override
-            public void execute(Grid c, DetailsGenerator generator, Object data) {
+            public void execute(Grid c, DetailsGenerator generator,
+                    Object data) {
                 grid.setDetailsGenerator(generator);
             }
         };
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
index 5c4ccfae89..bd9ec12c75 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
@@ -27,6 +27,7 @@ public class GridDefaultTextRenderer extends UI {
 
     @Override
     protected void init(VaadinRequest request) {
-        setContent(new TestWidgetComponent(GridDefaultTextRendererWidget.class));
+        setContent(
+                new TestWidgetComponent(GridDefaultTextRendererWidget.class));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
index 06f4f17eb8..b37e47243f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
@@ -57,13 +57,16 @@ public class GridLayoutAlignments extends UI {
         setContent(layout);
     }
 
-    private Component createButton(final GridLayout g, final Alignment topLeft) {
-        return new Button("Align " + topLeft.getVerticalAlignment() + ", "
-                + topLeft.getHorizontalAlignment(), new Button.ClickListener() {
-            @Override
-            public void buttonClick(Button.ClickEvent clickEvent) {
-                g.setComponentAlignment(g.getComponent(0, 0), topLeft);
-            }
-        });
+    private Component createButton(final GridLayout g,
+            final Alignment topLeft) {
+        return new Button(
+                "Align " + topLeft.getVerticalAlignment() + ", "
+                        + topLeft.getHorizontalAlignment(),
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(Button.ClickEvent clickEvent) {
+                        g.setComponentAlignment(g.getComponent(0, 0), topLeft);
+                    }
+                });
     }
 }
\ No newline at end of file
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
index d5644336e3..d14c46220f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
@@ -25,9 +25,8 @@ public class GridLayoutExtraSpacing extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        getUI().getPage()
-                .getStyles()
-                .add(".v-gridlayout {background: red;} .v-csslayout {background: white;}");
+        getUI().getPage().getStyles().add(
+                ".v-gridlayout {background: red;} .v-csslayout {background: white;}");
 
         final GridLayout gl = new GridLayout(4, 4);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
index 32d01f9910..5c89a4b3e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
@@ -25,7 +25,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 
 @Widgetset(TestingWidgetSet.NAME)
-public class GridLayoutFractionalSizeAndAlignment extends AbstractTestUIWithLog {
+public class GridLayoutFractionalSizeAndAlignment
+        extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
index 4712b8fb26..95c2d51559 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
@@ -69,24 +69,24 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI {
         horLayout.addComponent(gridLayout);
         horLayout.addComponent(gridLayout2);
 
-        mainLayout.addComponent(new Button(
-                "Hide/show both middle Column and row",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        for (int i = 0; i < ROWS; i++) {
-                            for (int j = 0; j < COLS; j++) {
-                                if (j == 2 || i == 2) {
-                                    if (labels[i][j].isVisible()) {
-                                        labels[i][j].setVisible(false);
-                                    } else {
-                                        labels[i][j].setVisible(true);
+        mainLayout
+                .addComponent(new Button("Hide/show both middle Column and row",
+                        new Button.ClickListener() {
+                            @Override
+                            public void buttonClick(ClickEvent event) {
+                                for (int i = 0; i < ROWS; i++) {
+                                    for (int j = 0; j < COLS; j++) {
+                                        if (j == 2 || i == 2) {
+                                            if (labels[i][j].isVisible()) {
+                                                labels[i][j].setVisible(false);
+                                            } else {
+                                                labels[i][j].setVisible(true);
+                                            }
+                                        }
                                     }
                                 }
                             }
-                        }
-                    }
-                }));
+                        }));
         mainLayout.addComponent(new Button("Hide/show middle Column",
                 new Button.ClickListener() {
                     @Override
@@ -100,8 +100,8 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI {
                         }
                     }
                 }));
-        mainLayout.addComponent(new Button("Hide/show middle Row",
-                new Button.ClickListener() {
+        mainLayout.addComponent(
+                new Button("Hide/show middle Row", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         for (int j = 0; j < COLS; j++) {
@@ -114,8 +114,8 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI {
                     }
 
                 }));
-        mainLayout.addComponent(new Button("Hide Random button",
-                new Button.ClickListener() {
+        mainLayout.addComponent(
+                new Button("Hide Random button", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
index 1ec7bfc13f..5ae4a11448 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
@@ -36,8 +36,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI {
                 .add(".colored { background: lime; overflow: visible; }");
         getPage().getCurrent().getStyles()
                 .add(".pink { background: pink; overflow: visible; }");
-        getPage().getCurrent().getStyles().add(
-                ".v-gridlayout-slot { border: 1px solid red; }");
+        getPage().getCurrent().getStyles()
+                .add(".v-gridlayout-slot { border: 1px solid red; }");
 
         GridLayout rootLayout = new GridLayout(2, 2);
         rootLayout.addStyleName("allow-overflow");
@@ -110,7 +110,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI {
         layout.addComponent(label);
 
         // TODO also test with captions
-        LegacyTextField field = new LegacyTextField(useCaption ? "caption" : null);
+        LegacyTextField field = new LegacyTextField(
+                useCaption ? "caption" : null);
         field.setRequired(true);
         field.setWidth(width);
         layout.addComponent(field);
@@ -119,7 +120,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI {
 
     private void addLabel(VerticalLayout layout, String width,
             Alignment alignment, boolean useCaption) {
-        LegacyTextField field = new LegacyTextField(useCaption ? "caption" : null);
+        LegacyTextField field = new LegacyTextField(
+                useCaption ? "caption" : null);
         field.setRequired(true);
         field.setWidth(width);
         layout.addComponent(field);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
index 968222f0f2..51f864918a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
@@ -23,7 +23,8 @@ public class UniformGridLayoutUI extends UI {
         layout.addComponent(createGridWithoutGridBuilder(3, hide));
     }
 
-    private GridLayout createGridWithoutGridBuilder(int rows, boolean collapse) {
+    private GridLayout createGridWithoutGridBuilder(int rows,
+            boolean collapse) {
         GridLayout grid = new GridLayout(30, 3);
         grid.setWidth("100%");
         // grid.setMargin(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java
index efee376bfe..960acfb598 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java
@@ -10,8 +10,8 @@ public class ImageAltText extends TestBase {
 
     @Override
     protected void setup() {
-        final Image image = new Image("Caption", new ThemeResource(
-                "../runo/icons/64/ok.png"));
+        final Image image = new Image("Caption",
+                new ThemeResource("../runo/icons/64/ok.png"));
         image.setDebugId("image");
         image.setAlternateText("Original alt text");
         addComponent(image);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java
index 397e31c39c..854210344f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java
@@ -38,8 +38,8 @@ public class ImageClicks extends TestBase {
             @Override
             public void click(ClickEvent event) {
                 ++clickCounter;
-                imageResource.setFilename("testimage.png?"
-                        + new Date().getTime());
+                imageResource
+                        .setFilename("testimage.png?" + new Date().getTime());
                 image.markAsDirty();
                 label.setValue(labelText());
             }
@@ -118,8 +118,8 @@ public class ImageClicks extends TestBase {
                         drawable.setColor(Color.white);
                     }
 
-                    drawable.fillRect(gridx + 1, gridy + 1, gridxnext - gridx
-                            - 1, gridynext - gridy - 1);
+                    drawable.fillRect(gridx + 1, gridy + 1,
+                            gridxnext - gridx - 1, gridynext - gridy - 1);
                 }
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index 1e193fc3b4..ccd22da4c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
@@ -95,8 +95,8 @@ public class BasicJavaScriptComponent extends AbstractTestUI {
                     HasComponents parent = getParent();
                     int i = 1;
                     while (parent != null) {
-                        if (!parentIds.getString(i).equals(
-                                parent.getConnectorId())) {
+                        if (!parentIds.getString(i)
+                                .equals(parent.getConnectorId())) {
                             log.log("parentIds[" + i + "] doesn't match");
                         }
                         i++;
@@ -134,10 +134,8 @@ public class BasicJavaScriptComponent extends AbstractTestUI {
             getRpcProxy(TestRpc.class).sendRpc("RPC message");
             callFunction("messageToClient", "Callback message");
 
-            getState()
-                    .setMessages(
-                            Arrays.asList("First state message",
-                                    "Second state message"));
+            getState().setMessages(Arrays.asList("First state message",
+                    "Second state message"));
             // Dummy resource used to test URL translation
             Resource resource = new ConnectorResource() {
                 @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
index 06edbb913f..d858f7c95f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
@@ -41,8 +41,8 @@ public class JavaScriptResizeListener extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
 
-        addComponent(new Button("Change holder size",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Change holder size", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         updateHolderSize();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java
index e5bc539f36..d70fd5ab4c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java
@@ -15,25 +15,30 @@ public class LabelModes extends ComponentTestCase<Label> {
     protected void initializeComponents() {
 
         Label l;
-        l = createLabel("This is an undefined wide label with default content mode");
+        l = createLabel(
+                "This is an undefined wide label with default content mode");
         l.setWidth(null);
         addTestComponent(l);
 
-        l = createLabel("This label                       contains\nnewlines and spaces\nbut is in\ndefault content mode");
+        l = createLabel(
+                "This label                       contains\nnewlines and spaces\nbut is in\ndefault content mode");
         l.setWidth(null);
         addTestComponent(l);
 
-        l = createLabel("This label                       contains\nnewlines and spaces\nand is in\npreformatted mode");
+        l = createLabel(
+                "This label                       contains\nnewlines and spaces\nand is in\npreformatted mode");
         l.setContentMode(ContentMode.PREFORMATTED);
         l.setWidth(null);
         addTestComponent(l);
 
-        l = createLabel("This label                       contains\nnewlines and spaces\nand is in\nhtml mode");
+        l = createLabel(
+                "This label                       contains\nnewlines and spaces\nand is in\nhtml mode");
         l.setContentMode(ContentMode.HTML);
         l.setWidth(null);
         addTestComponent(l);
 
-        l = createLabel("This label                       contains\nnewlines and spaces\nand is in\nraw mode");
+        l = createLabel(
+                "This label                       contains\nnewlines and spaces\nand is in\nraw mode");
         l.setContentMode(ContentMode.RAW);
         l.setWidth(null);
         addTestComponent(l);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
index 8c9a76ea47..5968fccf02 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
@@ -9,8 +9,8 @@ import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.Label;
 
-public class LabelTest extends AbstractComponentTest<Label> implements
-        ValueChangeListener {
+public class LabelTest extends AbstractComponentTest<Label>
+        implements ValueChangeListener {
 
     private Command<Label, String> setValueCommand = new Command<Label, String>() {
 
@@ -59,9 +59,11 @@ public class LabelTest extends AbstractComponentTest<Label> implements
         List<String> values = new ArrayList<String>();
         values.add("Test");
         values.add("A little longer value");
-        values.add("A very long value with very much text. All in all it is 74 characters long");
+        values.add(
+                "A very long value with very much text. All in all it is 74 characters long");
         values.add("<b>Bold</b>");
-        values.add("<div style=\"height: 70px; width: 15px; border: 1px dashed red\">With border</div>");
+        values.add(
+                "<div style=\"height: 70px; width: 15px; border: 1px dashed red\">With border</div>");
 
         createClickAction("(empty string)", subCategory, setValueCommand, "");
         createClickAction("(null)", subCategory, setValueCommand, null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
index cd6976543a..0d296b1b92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
@@ -15,8 +15,9 @@ public class Labels extends ComponentTestCase<Label> {
     @Override
     protected void initializeComponents() {
         Label l;
-        l = createLabel("This is an undefined\nwide\nlabel               which do not wrap. It should be clipped at the end of the screen"
-                + LoremIpsum.get(1000));
+        l = createLabel(
+                "This is an undefined\nwide\nlabel               which do not wrap. It should be clipped at the end of the screen"
+                        + LoremIpsum.get(1000));
         l.setWidth(null);
         addTestComponent(l);
 
@@ -29,8 +30,9 @@ public class Labels extends ComponentTestCase<Label> {
         l.setWidth("100%");
         addTestComponent(l);
 
-        l = createLabel("This is a\n\n     100%\t\t\t   \twide simple with fixed 65px height. It should wrap. "
-                + LoremIpsum.get(5000));
+        l = createLabel(
+                "This is a\n\n     100%\t\t\t   \twide simple with fixed 65px height. It should wrap. "
+                        + LoremIpsum.get(5000));
         l.setWidth("100%");
         l.setHeight("65px");
         addTestComponent(l);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
index f503e8966f..b18b92dfc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
@@ -15,14 +15,15 @@ public class MarginsInLabels extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         AbstractLayout layout = new VerticalLayout();
-        layout.addComponent(new Label("<h1>Vertical layout</h1>",
-                ContentMode.HTML));
+        layout.addComponent(
+                new Label("<h1>Vertical layout</h1>", ContentMode.HTML));
         layout.addComponent(new Label("Next row"));
         addComponent(layout);
 
         layout = new GridLayout(1, 2);
         layout.setWidth("100%");
-        layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.HTML));
+        layout.addComponent(
+                new Label("<h1>Grid layout</h1>", ContentMode.HTML));
         layout.addComponent(new Label("Next row"));
         addComponent(layout);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java
index 970c2f71c7..8378500010 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java
@@ -20,8 +20,8 @@ public class LinkIcon extends TestBase {
 
     @Override
     protected void setup() {
-        Link l = new Link("www.google.com", new ExternalResource(
-                "http://www.vaadin.com/"));
+        Link l = new Link("www.google.com",
+                new ExternalResource("http://www.vaadin.com/"));
         l.setIcon(new ThemeResource("../runo/icons/32/calendar.png"));
 
         addComponent(l);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java
index cb537c88ae..05a3b0008e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java
@@ -19,8 +19,8 @@ public class LinkTargetSize extends TestBase {
 
     @Override
     protected void setup() {
-        Link l = new Link("Try it!", new ExternalResource(
-                "http://www.google.com/m"));
+        Link l = new Link("Try it!",
+                new ExternalResource("http://www.google.com/m"));
         l.setTargetName("_blank");
         l.setTargetWidth(300);
         l.setTargetHeight(300);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java
index 6deea0fd96..996fc32775 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java
@@ -42,11 +42,11 @@ public class LinkTest extends AbstractComponentTest<Link> {
     private void createTargetSelect(String category) {
         LinkedHashMap<String, Resource> options = new LinkedHashMap<String, Resource>();
         options.put("-", null);
-        options.put("https://vaadin.com", new ExternalResource(
-                "https://vaadin.com"));
+        options.put("https://vaadin.com",
+                new ExternalResource("https://vaadin.com"));
         options.put("32x32 theme icon", ICON_32_ATTENTION_PNG_CACHEABLE);
-        options.put("linktest-target.html", new ClassResource(
-                "linktest-target.html"));
+        options.put("linktest-target.html",
+                new ClassResource("linktest-target.html"));
 
         createSelectAction("Link target", category, options,
                 "https://vaadin.com", linkTargetCommand, null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
index 56e9d1f419..d5864b84e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
@@ -97,7 +97,8 @@ public class ListSelectAddRemoveItems extends AbstractTestUIWithLog {
         addComponent(new Button("Remove middle", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                container.removeItem(container.getIdByIndex(container.size() / 2));
+                container.removeItem(
+                        container.getIdByIndex(container.size() / 2));
                 logContainer();
             }
         }));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
index 8e74a7a53d..4ada4f12ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
@@ -9,8 +9,8 @@ public class ListSelectAllowNewItem extends TestBase {
 
     @Override
     protected void setup() {
-        ListSelect select = new ListSelect("Select", Arrays.asList("Option 1",
-                "Option 2"));
+        ListSelect select = new ListSelect("Select",
+                Arrays.asList("Option 1", "Option 2"));
         select.setImmediate(true);
         select.setNewItemsAllowed(true);
         addComponent(select);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
index b0137c55cf..cf7d12781c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
@@ -11,8 +11,8 @@ public class ListSelectPrimaryStylename extends TestBase {
 
     @Override
     protected void setup() {
-        final ListSelect list = new ListSelect("Caption", Arrays.asList(
-                "Option 1", "Option 2", "Option 3"));
+        final ListSelect list = new ListSelect("Caption",
+                Arrays.asList("Option 1", "Option 2", "Option 3"));
         list.setPrimaryStyleName("my-list");
         addComponent(list);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
index 9518456066..944c7549d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
@@ -41,8 +41,8 @@ public class ListSelectPushSelectionChanges extends AbstractTestUI {
         // Option group changes propagate to the list select
         listSelect.setPropertyDataSource(optionGroup);
 
-        final OptionGroup modeSelect = new OptionGroup("Mode", Arrays.asList(
-                "Single", "Multi"));
+        final OptionGroup modeSelect = new OptionGroup("Mode",
+                Arrays.asList("Single", "Multi"));
         modeSelect.setValue("Single");
         modeSelect.addValueChangeListener(new ValueChangeListener() {
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java
index 629edc2130..4c28bc54dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java
@@ -87,8 +87,8 @@ public class LoginFormTest extends TestBase {
     protected void login(LoginForm loginForm, String user, String password) {
         VerticalLayout infoLayout = new VerticalLayout();
 
-        Label info = new Label("User '" + user + "', password='" + password
-                + "' logged in");
+        Label info = new Label(
+                "User '" + user + "', password='" + password + "' logged in");
         Button logoutButton = new Button("Log out", new ClickListener() {
 
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
index 58656cb7bf..1f608cad7c 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
@@ -18,18 +18,18 @@ public class LoginFormUIInLoginHandler extends TestBase {
             public void onLogin(LoginEvent event) {
                 UI r1 = UI.getCurrent();
                 if (r1 != null) {
-                    addComponent(new Label("UI.getCurrent().data: "
-                            + r1.getData()));
+                    addComponent(
+                            new Label("UI.getCurrent().data: " + r1.getData()));
                 } else {
                     addComponent(new Label("UI.getCurrent() is null"));
                 }
                 UI r2 = ((LoginForm) event.getSource()).getUI();
                 if (r2 != null) {
-                    addComponent(new Label("event.getSource().data: "
-                            + r2.getData()));
-                } else {
                     addComponent(new Label(
-                            "event.getSource().getRoot() is null"));
+                            "event.getSource().data: " + r2.getData()));
+                } else {
+                    addComponent(
+                            new Label("event.getSource().getRoot() is null"));
                 }
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index b4e24c60d9..c8814320f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java
@@ -6,7 +6,8 @@ import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 
-public class MenuBarNavigation extends AbstractTestUIWithLog implements Command {
+public class MenuBarNavigation extends AbstractTestUIWithLog
+        implements Command {
 
     private MenuItem edit;
     private MenuItem file;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index 0d9c3d8bba..a6b76eb18f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
@@ -20,7 +20,8 @@ public class MenuBarRunsOutOfBrowser extends AbstractTestCase {
         MenuBar menuBar = new MenuBar();
         menuBar.addItem("Test", new ThemeResource("icons/16/calendar.png"),
                 null);
-        menuBar.addItem("ABC", new ThemeResource("icons/16/document.png"), null);
+        menuBar.addItem("ABC", new ThemeResource("icons/16/document.png"),
+                null);
         menuBar.addItem("123", new ThemeResource("icons/16/help.png"), null);
 
         main.addComponent(menuBar);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
index 88d89abbf4..d284b82ba4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
@@ -28,14 +28,14 @@ public class MenuBarSubmenusClosingValo extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         // here we increase animation time to 1 second for to do auto testing
         // possible
-        getPage().getStyles().add(
-                ".valo .v-menubar-popup[class*=\"animate-in\"] {"
+        getPage().getStyles()
+                .add(".valo .v-menubar-popup[class*=\"animate-in\"] {"
                         + "-webkit-animation: valo-overlay-animate-in 1000ms; "
                         + "-moz-animation: valo-overlay-animate-in 1000ms; "
                         + "animation: valo-overlay-animate-in 1000ms;};");
 
-        getPage().getStyles().add(
-                ".valo .v-menubar-popup[class*=\"animate-out\"] {"
+        getPage().getStyles()
+                .add(".valo .v-menubar-popup[class*=\"animate-out\"] {"
                         + "-webkit-animation: valo-animate-out-fade 1000ms; "
                         + "-moz-animation: valo-animate-out-fade 1000ms; "
                         + "animation: valo-animate-out-fade 1000ms;};");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java
index 982b16c6e2..ada6622c98 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java
@@ -134,8 +134,8 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> {
         options.put("Every second", 2);
         options.put("Every third", 3);
 
-        createSelectAction("Checkable", category, options,
-                "No items checkable", setMenuItemCheckableDensity);
+        createSelectAction("Checkable", category, options, "No items checkable",
+                setMenuItemCheckableDensity);
     }
 
     /* COMMANDS */
@@ -269,8 +269,8 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> {
                 parent.addSeparator();
             }
 
-            MenuItem subMenuItem = parent.addItem("Sub menu " + parent.getId()
-                    + "/" + (i + 1), menuCommand);
+            MenuItem subMenuItem = parent.addItem(
+                    "Sub menu " + parent.getId() + "/" + (i + 1), menuCommand);
 
             if (disabledDensity != null && i % disabledDensity == 0) {
                 subMenuItem.setEnabled(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
index 16a0896aa2..32c27592c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
@@ -44,8 +44,8 @@ public class MenuBarsWithNesting extends AbstractTestUI {
     public final static String[] itemNames = { "Icon item", "Arrow down",
             "Arrow up", "Warning" };
     private final static Resource[] itemIcons = {
-            new ThemeResource("window/img/restore.png"),
-            FontAwesome.ARROW_DOWN, FontAwesome.ARROW_UP, FontAwesome.WARNING };
+            new ThemeResource("window/img/restore.png"), FontAwesome.ARROW_DOWN,
+            FontAwesome.ARROW_UP, FontAwesome.WARNING };
 
     // The last menu item is nested with the following submenu items.
     public final static String[] nestedItemnames = { "No icon", "Font icon",
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
index cf06836f94..8efafa3afa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
@@ -34,8 +34,8 @@ public class MenuItemStyleRemoved extends AbstractTestUI {
                         && webBrowser.getBrowserMajorVersion() == 8) {
                     method = "querySelectorAll('." + MENUITEM_CLASS + "')";
                 }
-                JavaScript.getCurrent().execute(
-                        "var x=document." + method + ";"
+                JavaScript.getCurrent()
+                        .execute("var x=document." + method + ";"
                                 + " var i; for(i=0; i < x.length; i++)"
                                 + " {x[i].className += ' custom-menu-item'};");
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
index b6c80aea0c..22feae52e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
@@ -47,16 +47,16 @@ public class NativeButtonClick extends AbstractTestUI {
                 new NativeButton.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        label1.setValue(event.getClientX() + ","
-                                + event.getClientY());
+                        label1.setValue(
+                                event.getClientX() + "," + event.getClientY());
                     }
                 });
         Button button2 = new NativeButton("Button2",
                 new NativeButton.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        label2.setValue(event.getClientX() + ","
-                                + event.getClientY());
+                        label2.setValue(
+                                event.getClientX() + "," + event.getClientY());
                     }
                 });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
index 94023db2d0..c17fa15612 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
@@ -22,8 +22,8 @@ public class NativeButtonHtml extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                swapButton.setHtmlContentAllowed(!swapButton
-                        .isHtmlContentAllowed());
+                swapButton.setHtmlContentAllowed(
+                        !swapButton.isHtmlContentAllowed());
             }
         });
         addComponent(swapButton);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
index d1a889dcf4..79ee6f79be 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.NativeButton;
 
-public class NativeButtonIconAndText extends AbstractTestUI implements
-        ClickListener {
+public class NativeButtonIconAndText extends AbstractTestUI
+        implements ClickListener {
 
     static final String UPDATED_ALTERNATE_TEXT = "Now has alternate text";
     static final String INITIAL_ALTERNATE_TEXT = "Initial alternate text";
@@ -43,8 +43,8 @@ public class NativeButtonIconAndText extends AbstractTestUI implements
         buttonTextIcon.setIcon(new ThemeResource("../runo/icons/64/ok.png"));
 
         Button buttonTextIconAlt = new Button("Text icon alt");
-        buttonTextIconAlt.setIcon(new ThemeResource(
-                "../runo/icons/64/cancel.png"));
+        buttonTextIconAlt
+                .setIcon(new ThemeResource("../runo/icons/64/cancel.png"));
         buttonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT);
 
         buttonText.addClickListener(this);
@@ -62,12 +62,13 @@ public class NativeButtonIconAndText extends AbstractTestUI implements
         NativeButton nativeButtonText = new NativeButton("Only text");
 
         NativeButton nativeButtonTextIcon = new NativeButton("Text icon");
-        nativeButtonTextIcon.setIcon(new ThemeResource(
-                "../runo/icons/64/ok.png"));
+        nativeButtonTextIcon
+                .setIcon(new ThemeResource("../runo/icons/64/ok.png"));
 
-        NativeButton nativeButtonTextIconAlt = new NativeButton("Text icon alt");
-        nativeButtonTextIconAlt.setIcon(new ThemeResource(
-                "../runo/icons/64/cancel.png"));
+        NativeButton nativeButtonTextIconAlt = new NativeButton(
+                "Text icon alt");
+        nativeButtonTextIconAlt
+                .setIcon(new ThemeResource("../runo/icons/64/cancel.png"));
         nativeButtonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT);
 
         nativeButtonText.addClickListener(this);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
index 10fef434ca..91c886e9ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
@@ -30,8 +30,8 @@ public class Notifications extends TestBase implements ClickListener {
                 .getItemProperty(CAPTION).setValue("Humanized");
         type.addItem(Notification.TYPE_ERROR_MESSAGE).getItemProperty(CAPTION)
                 .setValue("Error");
-        type.addItem(Notification.TYPE_WARNING_MESSAGE)
-                .getItemProperty(CAPTION).setValue("Warning");
+        type.addItem(Notification.TYPE_WARNING_MESSAGE).getItemProperty(CAPTION)
+                .setValue("Warning");
         type.addItem(Notification.TYPE_TRAY_NOTIFICATION)
                 .getItemProperty(CAPTION).setValue("Tray");
         type.setValue(type.getItemIds().iterator().next());
@@ -53,7 +53,8 @@ public class Notifications extends TestBase implements ClickListener {
 
     @Override
     public void buttonClick(ClickEvent event) {
-        Notification n = new Notification(tf.getValue(), (Type) type.getValue());
+        Notification n = new Notification(tf.getValue(),
+                (Type) type.getValue());
         n.setHtmlContentAllowed(true);
         n.show(Page.getCurrent());
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 4732869a9a..aa4605d9e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
@@ -10,7 +10,8 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextArea;
 
-public class NotificationsHtmlAllowed extends TestBase implements ClickListener {
+public class NotificationsHtmlAllowed extends TestBase
+        implements ClickListener {
 
     private TextArea messageField;
     private CheckBox htmlAllowedBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 877f9aa675..0ecf5e6f8d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
@@ -9,9 +9,9 @@ import com.vaadin.ui.OptionGroup;
 
 public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> {
 
-    private static final List<String> cities = Arrays.asList(new String[] {
-            "Berlin", "Brussels", "Helsinki", "Madrid", "Oslo", "Paris",
-            "Stockholm" });
+    private static final List<String> cities = Arrays
+            .asList(new String[] { "Berlin", "Brussels", "Helsinki", "Madrid",
+                    "Oslo", "Paris", "Stockholm" });
 
     private static final String NULL_SELECTION_ID = "Berlin";
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index 213258ed29..b5267781a2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
@@ -22,7 +22,8 @@ public class OptionGroupMultipleValueChange extends TestBase {
     @Override
     protected void setup() {
         final OptionGroup og = new OptionGroup();
-        og.addItem("Clicking on the text might cause an extra valuechange event");
+        og.addItem(
+                "Clicking on the text might cause an extra valuechange event");
         og.addItem("Second option, same thing");
         og.setImmediate(true);
         addComponent(og);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
index c4c588d1ea..a1c05ad715 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
@@ -37,8 +37,8 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> {
         options.put("32x32", ICON_32_ATTENTION_PNG_CACHEABLE);
         options.put("64x64", ICON_64_EMAIL_REPLY_PNG_CACHEABLE);
 
-        createSelectAction(string, CATEGORY_DECORATIONS, options, options
-                .keySet().iterator().next(),
+        createSelectAction(string, CATEGORY_DECORATIONS, options,
+                options.keySet().iterator().next(),
                 new Command<OptionGroup, ThemeResource>() {
                     @Override
                     public void execute(OptionGroup c, ThemeResource icon,
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index a46fd43af8..499dc83781 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -106,10 +106,10 @@ public class BoxLayoutTest extends AbstractTestUI {
         vertical.addValueChangeListener(event -> {
             view.removeAllComponents();
 
-            view.addComponent(createControls(!vertical.getValue()
-                    .booleanValue()));
-            view.addComponent(createTestLayout(!vertical.getValue()
-                    .booleanValue()));
+            view.addComponent(
+                    createControls(!vertical.getValue().booleanValue()));
+            view.addComponent(
+                    createTestLayout(!vertical.getValue().booleanValue()));
 
             view.setExpandRatio(view.getComponent(1), 1);
         });
@@ -124,7 +124,8 @@ public class BoxLayoutTest extends AbstractTestUI {
                                 new Button.ClickListener() {
                                     @Override
                                     public void buttonClick(ClickEvent event) {
-                                        if (event.getButton().getWidth() == -1) {
+                                        if (event.getButton()
+                                                .getWidth() == -1) {
                                             event.getButton().setHeight("50px");
                                             event.getButton().setWidth("200px");
                                         } else {
@@ -147,7 +148,8 @@ public class BoxLayoutTest extends AbstractTestUI {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        Component last = l.getComponent(l.getComponentCount() - 1);
+                        Component last = l
+                                .getComponent(l.getComponentCount() - 1);
                         l.removeComponent(last);
                     }
                 });
@@ -223,8 +225,8 @@ public class BoxLayoutTest extends AbstractTestUI {
 
         align = new NativeSelect(null, alignments);
         for (Alignment a : alignments) {
-            align.setItemCaption(a,
-                    a.getVerticalAlignment() + "-" + a.getHorizontalAlignment());
+            align.setItemCaption(a, a.getVerticalAlignment() + "-"
+                    + a.getHorizontalAlignment());
         }
         align.setImmediate(true);
         align.setEnabled(false);
@@ -295,8 +297,8 @@ public class BoxLayoutTest extends AbstractTestUI {
         });
         component.addComponent(componentHeight);
 
-        componentCaption = new NativeSelect("Caption", Arrays.asList("Short",
-                "Slightly Longer Caption"));
+        componentCaption = new NativeSelect("Caption",
+                Arrays.asList("Short", "Slightly Longer Caption"));
         componentCaption.setImmediate(true);
         componentCaption.setEnabled(false);
         componentCaption.addListener(new ValueChangeListener() {
@@ -311,16 +313,17 @@ public class BoxLayoutTest extends AbstractTestUI {
         });
         component.addComponent(componentCaption);
 
-        componentIcon = new NativeSelect("Icon", Arrays.asList(
-                "../runo/icons/16/folder.png", "../runo/icons/32/document.png"));
+        componentIcon = new NativeSelect("Icon",
+                Arrays.asList("../runo/icons/16/folder.png",
+                        "../runo/icons/32/document.png"));
         componentIcon.setImmediate(true);
         componentIcon.setEnabled(false);
         componentIcon.addListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
                 if (componentIcon.getValue() != null) {
-                    target.setIcon(new ThemeResource(componentIcon.getValue()
-                            .toString()));
+                    target.setIcon(new ThemeResource(
+                            componentIcon.getValue().toString()));
                 } else {
                     target.setIcon(null);
                 }
@@ -344,8 +347,8 @@ public class BoxLayoutTest extends AbstractTestUI {
         componentError.setEnabled(false);
         componentError.addValueChangeListener(event -> {
             if (target != null) {
-                target.setComponentError(componentError.getValue() ? new UserError(
-                        "Error message") : null);
+                target.setComponentError(componentError.getValue()
+                        ? new UserError("Error message") : null);
             }
         });
         component.addComponent(componentError);
@@ -355,8 +358,8 @@ public class BoxLayoutTest extends AbstractTestUI {
         componentRequired.setEnabled(false);
         componentRequired.addValueChangeListener(event -> {
             if (target != null && target instanceof LegacyAbstractField) {
-                ((LegacyAbstractField<?>) target).setRequired(componentRequired
-                        .getValue());
+                ((LegacyAbstractField<?>) target)
+                        .setRequired(componentRequired.getValue());
             }
         });
         component.addComponent(componentRequired);
@@ -406,16 +409,16 @@ public class BoxLayoutTest extends AbstractTestUI {
                 expand.setEnabled(target != null);
                 if (target != null) {
                     if (target.getWidth() > -1) {
-                        componentWidth.select(new Float(target.getWidth())
-                                .intValue()
-                                + target.getWidthUnits().getSymbol());
+                        componentWidth
+                                .select(new Float(target.getWidth()).intValue()
+                                        + target.getWidthUnits().getSymbol());
                     } else {
                         componentWidth.select(null);
                     }
                     if (target.getHeight() > -1) {
-                        componentHeight.select(new Float(target.getHeight())
-                                .intValue()
-                                + target.getHeightUnits().getSymbol());
+                        componentHeight
+                                .select(new Float(target.getHeight()).intValue()
+                                        + target.getHeightUnits().getSymbol());
                     } else {
                         componentHeight.select(null);
                     }
@@ -433,8 +436,8 @@ public class BoxLayoutTest extends AbstractTestUI {
                     componentDescription.setValue(target.getDescription());
                     componentError.setValue(target.getComponentError() != null);
                     if (target instanceof LegacyAbstractField) {
-                        componentRequired.setValue(((LegacyAbstractField<?>) target)
-                                .isRequired());
+                        componentRequired.setValue(
+                                ((LegacyAbstractField<?>) target).isRequired());
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
index 4360ff60d8..17042ca2f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
@@ -33,8 +33,8 @@ public class ExpandChangeReattach extends AbstractTestUI {
 
         Table table = new Table("Table", TestUtils.getISO3166Container());
         verticalLayout.addComponent(table);
-        verticalLayout.addComponent(new Button("Toggle expand logic",
-                new Button.ClickListener() {
+        verticalLayout.addComponent(
+                new Button("Toggle expand logic", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         if (verticalLayout.getHeight() == -1) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
index 420d88af55..bb6efe4699 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
@@ -10,7 +10,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 
-public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI {
+public class HorizontalLayoutFullsizeContentWithErrorMsg
+        extends AbstractTestUI {
 
     static final String FIELD_ID = "f";
     static final String BUTTON_ID = "b";
@@ -44,8 +45,8 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI
         toggleError.addClickListener(new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                tf.setComponentError(tf.getComponentError() == null ? new UserError(
-                        "foo") : null);
+                tf.setComponentError(tf.getComponentError() == null
+                        ? new UserError("foo") : null);
             }
         });
         hl.addComponent(toggleError);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
index d9ab760302..dda071df7c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.orderedlayout;
 import com.vaadin.tests.components.AbstractOrderedLayoutTest;
 import com.vaadin.ui.HorizontalLayout;
 
-public class HorizontalLayoutTest extends
-        AbstractOrderedLayoutTest<HorizontalLayout> {
+public class HorizontalLayoutTest
+        extends AbstractOrderedLayoutTest<HorizontalLayout> {
 
     @Override
     protected Class<HorizontalLayout> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
index 8c5953104f..2b050a9c9a 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
@@ -25,7 +25,8 @@ public class HorizontalRelativeSizeWithoutExpand extends UI {
         verticalLayout1.setSizeFull();
         Tree tree = new Tree();
         tree.setSizeFull();
-        tree.setContainerDataSource(new BeanItemContainer<String>(String.class));
+        tree.setContainerDataSource(
+                new BeanItemContainer<String>(String.class));
         String a = "aaaaaaaaaaaaaaaaaaaaaaaa";
         String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
         String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index c6b0fa625d..61c09e4a92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
@@ -67,8 +67,8 @@ public class LayoutClickListenerTest extends TestBase {
 
                 if (clickedComponent == null) {
                     // Not over any child component
-                    LayoutClickListenerTest.this.addComponent(new Label(
-                            "The click was not over any component."));
+                    LayoutClickListenerTest.this.addComponent(
+                            new Label("The click was not over any component."));
                 } else {
                     // Over a child component
                     String message = "The click was over a "
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 6235ed9617..5fef63ce86 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -31,15 +31,13 @@ public class LayoutRenderTimeTest extends LegacyApplication {
         // row.setWidth("100%");
         // row.setSpacing(true);
 
-        Embedded icon = new Embedded(null, new ThemeResource(
-                "../runo/icons/32/document.png"));
+        Embedded icon = new Embedded(null,
+                new ThemeResource("../runo/icons/32/document.png"));
         // row.addComponent(icon);
         // row.setComponentAlignment(icon, Alignment.MIDDLE_LEFT);
 
-        Label text = new Label(
-                "Row content #"
-                        + i
-                        + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet.");
+        Label text = new Label("Row content #" + i
+                + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet.");
         // row.addComponent(text);
         // row.setExpandRatio(text, 1);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index 99c80fe4c1..aa945ce04f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -32,17 +32,14 @@ public class LayoutResizeTest extends TestBase {
         left.setSpacing(true);
         left.setMargin(true);
 
-        left.addComponent(new Label("<h2>Layout resize test</h2>",
-                ContentMode.HTML));
+        left.addComponent(
+                new Label("<h2>Layout resize test</h2>", ContentMode.HTML));
 
         Button resize = new Button("Resize to 700x400",
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        event.getButton()
-                                .getUI()
-                                .getPage()
-                                .getJavaScript()
+                        event.getButton().getUI().getPage().getJavaScript()
                                 .execute(
                                         "setTimeout(function() {window.resizeTo(700,400)}, 500)");
                     }
@@ -52,12 +49,8 @@ public class LayoutResizeTest extends TestBase {
         resize = new Button("Resize to 900x600", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                event.getButton()
-                        .getUI()
-                        .getPage()
-                        .getJavaScript()
-                        .execute(
-                                "setTimeout(function() {window.resizeTo(900,600)}, 500)");
+                event.getButton().getUI().getPage().getJavaScript().execute(
+                        "setTimeout(function() {window.resizeTo(900,600)}, 500)");
             }
         });
         left.addComponent(resize);
@@ -105,15 +98,13 @@ public class LayoutResizeTest extends TestBase {
         row.setWidth("100%");
         row.setSpacing(true);
 
-        Embedded icon = new Embedded(null, new ThemeResource(
-                "../runo/icons/32/document.png"));
+        Embedded icon = new Embedded(null,
+                new ThemeResource("../runo/icons/32/document.png"));
         row.addComponent(icon);
         row.setComponentAlignment(icon, Alignment.MIDDLE_LEFT);
 
-        Label text = new Label(
-                "Row content #"
-                        + i
-                        + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet.");
+        Label text = new Label("Row content #" + i
+                + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet.");
         row.addComponent(text);
         row.setExpandRatio(text, 1);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
index 59e2b0936a..55226ee500 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
@@ -30,8 +30,8 @@ public class NestedLayoutCaptionHover extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         VerticalLayout test = new VerticalLayout();
         test.setCaption("inner layout");
-        addComponent(new VerticalLayout(new VerticalLayout(new VerticalLayout(
-                test))));
+        addComponent(new VerticalLayout(
+                new VerticalLayout(new VerticalLayout(test))));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index d7dbe11769..520e2d10d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -42,11 +42,12 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     new ValueChangeListener() {
                         @Override
                         public void valueChange(ValueChangeEvent event) {
-                            setHeight(event.getProperty().getValue().toString());
+                            setHeight(
+                                    event.getProperty().getValue().toString());
                         }
                     }, dimensionValues));
-            addComponent(createSimpleSelector("Caption",
-                    new ValueChangeListener() {
+            addComponent(
+                    createSimpleSelector("Caption", new ValueChangeListener() {
                         @Override
                         public void valueChange(ValueChangeEvent event) {
                             String value = event.getProperty().getValue()
@@ -54,7 +55,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                             if (value.length() == 0) {
                                 setCaption(null);
                             } else if (value.equals("Long")) {
-                                setCaption("A rather long caption just to see what happens");
+                                setCaption(
+                                        "A rather long caption just to see what happens");
                             } else {
                                 setCaption(value);
                             }
@@ -133,40 +135,40 @@ public class OrderedLayoutCases extends AbstractTestUI {
         sizeBar = new HorizontalLayout();
         sizeBar.setSpacing(true);
 
-        sizeBar.addComponent(createSimpleSelector("Layout width",
-                new ValueChangeListener() {
+        sizeBar.addComponent(
+                createSimpleSelector("Layout width", new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        currentLayout.setWidth(event.getProperty().getValue()
-                                .toString());
+                        currentLayout.setWidth(
+                                event.getProperty().getValue().toString());
                     }
                 }, dimensionValues));
         sizeBar.addComponent(createSimpleSelector("Layout height",
                 new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        currentLayout.setHeight(event.getProperty().getValue()
-                                .toString());
+                        currentLayout.setHeight(
+                                event.getProperty().getValue().toString());
                     }
                 }, dimensionValues));
-        sizeBar.addComponent(createSimpleSelector("Spacing",
-                new ValueChangeListener() {
+        sizeBar.addComponent(
+                createSimpleSelector("Spacing", new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        currentLayout.setSpacing(Boolean.parseBoolean(event
-                                .getProperty().getValue().toString()));
+                        currentLayout.setSpacing(Boolean.parseBoolean(
+                                event.getProperty().getValue().toString()));
                     }
                 }, "false", "true"));
-        sizeBar.addComponent(createSimpleSelector("Margin",
-                new ValueChangeListener() {
+        sizeBar.addComponent(
+                createSimpleSelector("Margin", new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        currentLayout.setMargin(Boolean.parseBoolean(event
-                                .getProperty().getValue().toString()));
+                        currentLayout.setMargin(Boolean.parseBoolean(
+                                event.getProperty().getValue().toString()));
                     }
                 }, "false", "true"));
-        sizeBar.addComponent(createSimpleSelector("Direction",
-                new ValueChangeListener() {
+        sizeBar.addComponent(
+                createSimpleSelector("Direction", new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
                         Object value = event.getProperty().getValue();
@@ -206,8 +208,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                 }, "Horizontal", "Vertical"));
 
         HorizontalLayout caseBar = new HorizontalLayout();
-        caseBar.addComponent(new Button("Undefined without relative",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Undefined without relative", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -220,8 +222,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                         setChildState(2, 2, 2);
                     }
                 }));
-        caseBar.addComponent(new Button("Undefined with relative",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Undefined with relative", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -229,8 +231,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                         setChildState(1, 0, 4);
                     }
                 }));
-        caseBar.addComponent(new Button("Fixed with overflow",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Fixed with overflow", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -240,8 +242,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                         setState(sizeBar, 3, 1);
                     }
                 }));
-        caseBar.addComponent(new Button("Fixed with extra space",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Fixed with extra space", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -258,8 +260,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     }
                 }));
 
-        caseBar.addComponent(new Button("Expand with alignment",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Expand with alignment", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -276,8 +278,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     }
                 }));
 
-        caseBar.addComponent(new Button("Multiple expands",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Multiple expands", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -299,8 +301,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     }
                 }));
 
-        caseBar.addComponent(new Button("Fixed + relative height",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Fixed + relative height", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -317,8 +319,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     }
                 }));
 
-        caseBar.addComponent(new Button("Undefined + relative height",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Undefined + relative height", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -331,8 +333,8 @@ public class OrderedLayoutCases extends AbstractTestUI {
                     }
                 }));
 
-        caseBar.addComponent(new Button("Undefined + alignments",
-                new ClickListener() {
+        caseBar.addComponent(
+                new Button("Undefined + alignments", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         resetState();
@@ -399,12 +401,14 @@ public class OrderedLayoutCases extends AbstractTestUI {
         }
     }
 
-    private void setChildState(int childIndex, int selectIndex, int valueIndex) {
+    private void setChildState(int childIndex, int selectIndex,
+            int valueIndex) {
         Component child = currentLayout.getComponent(childIndex);
         setState(child, selectIndex, valueIndex);
     }
 
-    private static void setState(Component container, int selectIndex, int value) {
+    private static void setState(Component container, int selectIndex,
+            int value) {
         NativeSelect select = (NativeSelect) ((AbstractOrderedLayout) container)
                 .getComponent(selectIndex);
         select.setValue(new ArrayList<Object>(select.getItemIds()).get(value));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
index 5857df20b1..114445c5ba 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
@@ -54,7 +54,8 @@ public class OrderedLayoutComponentOrdering extends TestBase {
         move.addClickListener(new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                hl.addComponentAsFirst(hl.getComponent(hl.getComponentCount() - 1));
+                hl.addComponentAsFirst(
+                        hl.getComponent(hl.getComponentCount() - 1));
             }
         });
         addComponent(move);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
index 9c54dbab8d..b45a96526a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
@@ -22,7 +22,8 @@ public class OrderedLayoutInfiniteLayoutPasses extends UI {
         setContent(layout);
 
         Styles styles = Page.getCurrent().getStyles();
-        styles.add(".my-separator {background-color: lightgray; min-height:2px;max-height:2px} ");
+        styles.add(
+                ".my-separator {background-color: lightgray; min-height:2px;max-height:2px} ");
     }
 
     private Button createOpenWindowButton() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
index 59447919ef..65a091c7b6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
@@ -24,8 +24,8 @@ public class RelativeChildrenWithoutExpand extends AbstractTestUI {
         setContent(vl);
 
         HorizontalLayout verticalExpand = new HorizontalLayout();
-        verticalExpand.addComponent(new Button("Add relative child",
-                new Button.ClickListener() {
+        verticalExpand.addComponent(
+                new Button("Add relative child", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         horizontalExpand.addComponent(new Label(loremIpsum), 0);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 6fd7bf362b..70f17600c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -43,7 +43,8 @@ public class VaadinTunesLayout extends AbstractTestUI {
         setContent(rootLayout);
 
         // root.showNotification(
-        // "This is an example of how you can do layouts in Vaadin.<br/>It is not a working sound player.",
+        // "This is an example of how you can do layouts in Vaadin.<br/>It is
+        // not a working sound player.",
         // Notification.TYPE_HUMANIZED_MESSAGE);
 
         // Our root window contains one VerticalLayout, let's make
@@ -140,7 +141,8 @@ public class VaadinTunesLayout extends AbstractTestUI {
 
         // Place all components to the status layout and align them properly
         status.addComponent(toggleVisualization);
-        status.setComponentAlignment(toggleVisualization, Alignment.MIDDLE_LEFT);
+        status.setComponentAlignment(toggleVisualization,
+                Alignment.MIDDLE_LEFT);
         status.addComponent(timeFromStart);
         status.setComponentAlignment(timeFromStart, Alignment.BOTTOM_LEFT);
         status.addComponent(trackDetails);
@@ -243,11 +245,11 @@ public class VaadinTunesLayout extends AbstractTestUI {
                 new NativeSelect());
 
         // Lets populate the table with random data
-        String[] tracks = new String[] { "Red Flag", "Millstone",
-                "Not The Sun", "Breath", "Here We Are", "Deep Heaven",
-                "Her Voice Resides", "Natural Tan", "End It All", "Kings",
-                "Daylight Slaving", "Mad Man", "Resolve", "Teargas",
-                "African Air", "Passing Bird" };
+        String[] tracks = new String[] { "Red Flag", "Millstone", "Not The Sun",
+                "Breath", "Here We Are", "Deep Heaven", "Her Voice Resides",
+                "Natural Tan", "End It All", "Kings", "Daylight Slaving",
+                "Mad Man", "Resolve", "Teargas", "African Air",
+                "Passing Bird" };
         String[] times = new String[] { "4:12", "6:03", "5:43", "4:32", "3:42",
                 "4:45", "2:56", "9:34", "2:10", "3:44", "5:49", "6:30", "5:18",
                 "7:42", "3:13", "2:52" };
@@ -263,9 +265,8 @@ public class VaadinTunesLayout extends AbstractTestUI {
                 "Frames", "Fortress", "Phobia", "The Poison", "Manifesto",
                 "White Pony", "The Big Dirty" };
         String[] genres = new String[] { "Rock", "Metal", "Hardcore", "Indie",
-                "Pop", "Alternative", "Blues", "Jazz", "Hip Hop",
-                "Electronica", "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel",
-                "Country" };
+                "Pop", "Alternative", "Blues", "Jazz", "Hip Hop", "Electronica",
+                "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel", "Country" };
         for (int i = 0; i < 1000; i++) {
             NativeSelect s = new NativeSelect();
             s.addItem("1 star");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
index 6909ac06dc..4c8ef34cd2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
@@ -23,8 +23,8 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.VerticalLayout;
 
-public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI implements
-        ValueChangeListener {
+public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI
+        implements ValueChangeListener {
 
     Button dummyButton = new Button("Just a button");
     LegacyTextField listenedTextField = new LegacyTextField();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
index 2298364c3f..bdc345fd26 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.orderedlayout;
 import com.vaadin.tests.components.AbstractOrderedLayoutTest;
 import com.vaadin.ui.VerticalLayout;
 
-public class VerticalLayoutTest extends
-        AbstractOrderedLayoutTest<VerticalLayout> {
+public class VerticalLayoutTest
+        extends AbstractOrderedLayoutTest<VerticalLayout> {
 
     @Override
     protected Class<VerticalLayout> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
index e0c2aebc4c..677df3e8b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
@@ -121,7 +121,8 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
         private final Label myLabel = new Label("");
         private final LegacyTextField filterPhoneField = new LegacyTextField(
                 "Foobar Number");
-        private final LegacyTextField filterFoobarField = new LegacyTextField("Foobar ID");
+        private final LegacyTextField filterFoobarField = new LegacyTextField(
+                "Foobar ID");
         private final CheckBox incomingOnlyField = new CheckBox(
                 "Incoming foobar only");
 
@@ -146,7 +147,8 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
             this.addComponent(topLayout);
 
             // Foobar phone #
-            final LegacyTextField smsNumber = new LegacyTextField("Foobar Phone #");
+            final LegacyTextField smsNumber = new LegacyTextField(
+                    "Foobar Phone #");
             smsNumber.setSizeUndefined();
             smsNumber.setColumns(12);
             smsNumber.setMaxLength(16);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
index 0ac9a008d2..3f22cb5e12 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
@@ -28,7 +28,8 @@ public class VerticalRelativeSizeWithoutExpand extends UI {
         verticalLayout1.setSizeFull();
         Tree tree = new Tree();
         tree.setSizeFull();
-        tree.setContainerDataSource(new BeanItemContainer<String>(String.class));
+        tree.setContainerDataSource(
+                new BeanItemContainer<String>(String.class));
         String a = "aaaaaaaaaaaaaaaaaaaaaaaa";
         String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
         String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
index 9111668dc7..096baad188 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
@@ -16,7 +16,8 @@ public class BasicPanelTest extends TestBase {
     private final Label scrollPosition = new Label();
     private final Panel panel = new Panel("Panel caption") {
         @Override
-        public void changeVariables(Object source, Map<String, Object> variables) {
+        public void changeVariables(Object source,
+                Map<String, Object> variables) {
             super.changeVariables(source, variables);
             updateLabelText();
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java
index 3f953bf73a..bffe4e1e66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class PanelChangeContents extends AbstractTestUI implements
-        ClickListener {
+public class PanelChangeContents extends AbstractTestUI
+        implements ClickListener {
 
     VerticalLayout stats = new VerticalLayout();
     VerticalLayout companies = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
index 1dad8d44b0..7cc1d27e43 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
@@ -17,10 +17,8 @@ public class PanelClickListenerRelativeCoordinates extends TestBase {
 
             @Override
             public void click(ClickEvent event) {
-                getMainWindow()
-                        .showNotification(
-                                "" + event.getRelativeX() + ", "
-                                        + event.getRelativeY());
+                getMainWindow().showNotification("" + event.getRelativeX()
+                        + ", " + event.getRelativeY());
             }
         });
         addComponent(panel);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
index e05678b7c8..9aa173f195 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
@@ -24,12 +24,12 @@ public class PanelConcurrentModificationException extends TestBase {
                         panelLayout.addComponent(new Label("Label"));
                     }
                 }));
-        addComponent(new Button("Or click here first",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Or click here first", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        Notification
-                                .show("It is now safe to click the other button");
+                        Notification.show(
+                                "It is now safe to click the other button");
                     }
                 }));
         addComponent(panel);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index a4b02935a2..bc9de8bd64 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
@@ -70,7 +70,8 @@ public class PanelShouldRemoveActionHandler extends TestBase {
 
     public void remove() {
         panel.setCaption(panel.getCaption() + " - Removed handler");
-        panel.removeActionHandler(actionHandlers.remove(actionHandlers.size() - 1));
+        panel.removeActionHandler(
+                actionHandlers.remove(actionHandlers.size() - 1));
     }
 
     private List<Handler> actionHandlers = new ArrayList<Handler>();
@@ -87,7 +88,8 @@ public class PanelShouldRemoveActionHandler extends TestBase {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 getMainWindow().showNotification(
                         "Handling action " + action.getCaption());
             }
@@ -108,7 +110,8 @@ public class PanelShouldRemoveActionHandler extends TestBase {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 getMainWindow().showNotification(
                         "Handling action " + action.getCaption());
             }
@@ -121,8 +124,8 @@ public class PanelShouldRemoveActionHandler extends TestBase {
     private void addHandler(Handler actionHandler) {
         actionHandlers.add(actionHandler);
         panel.addActionHandler(actionHandler);
-        panel.setCaption("A panel with " + actionHandlers.size()
-                + " action handlers");
+        panel.setCaption(
+                "A panel with " + actionHandlers.size() + " action handlers");
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index 39a88cdc90..2f75b9ed0d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
@@ -4,7 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
 import com.vaadin.ui.PasswordField;
 
-public class PasswordFieldTest extends LegacyAbstractTextFieldTest<PasswordField>
+public class PasswordFieldTest
+        extends LegacyAbstractTextFieldTest<PasswordField>
         implements TextChangeListener {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java
index ecce1781a5..cc732f1c82 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java
@@ -9,7 +9,8 @@ public class DisabledPopupView extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        PopupView popupView = new PopupView("Disabled Popup", new Button("Hi!"));
+        PopupView popupView = new PopupView("Disabled Popup",
+                new Button("Hi!"));
 
         popupView.setEnabled(false);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index a5441f38b1..24b32a9c96 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
@@ -24,8 +24,8 @@ public class PopupViewClickShortcut extends TestBase {
         sub.center();
         getMainWindow().addWindow(sub);
         addComponent(log);
-        addComponent(new PopupView("Show popup table", makeTable("Popup",
-                KeyCode.P)));
+        addComponent(new PopupView("Show popup table",
+                makeTable("Popup", KeyCode.P)));
         addComponent(makeTable("Main window", KeyCode.M));
         ((ComponentContainer) sub.getContent()).addComponent(new PopupView(
                 "Show popup table", makeTable("Subwindow popup", KeyCode.U)));
@@ -45,17 +45,18 @@ public class PopupViewClickShortcut extends TestBase {
         l.setCaption(caption);
         l.setWidth(null);
 
-        Button b = new Button("Submit " + caption + " (Ctrl+Alt+"
-                + (char) keyCode + ")", new Button.ClickListener() {
-            private int i = 5;
+        Button b = new Button(
+                "Submit " + caption + " (Ctrl+Alt+" + (char) keyCode + ")",
+                new Button.ClickListener() {
+                    private int i = 5;
 
-            @Override
-            public void buttonClick(ClickEvent event) {
-                log.log("Submitted from "
-                        + event.getButton().getParent().getCaption());
-                t.addItem(new String[] { "added " + i++ }, i);
-            }
-        });
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        log.log("Submitted from "
+                                + event.getButton().getParent().getCaption());
+                        t.addItem(new String[] { "added " + i++ }, i);
+                    }
+                });
 
         b.setClickShortcut(keyCode, ModifierKey.CTRL, ModifierKey.ALT);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
index d19f98124e..08cc060191 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
@@ -11,8 +11,8 @@ public class PopupViewInEmbeddedApplication extends TestBase {
 
     @Override
     protected void setup() {
-        PopupView pop = new PopupView("Click me!", new Label(
-                "I popped up, woohoo!"));
+        PopupView pop = new PopupView("Click me!",
+                new Label("I popped up, woohoo!"));
         addComponent(pop);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
index 2776c63e9f..43e3aebb06 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
@@ -26,10 +26,10 @@ public class PopupViewLabelResized extends TestBase {
         gl.addComponent(expander, 1, 0);
         gl.setColumnExpandRatio(1, 1);
 
-        gl.addComponent(
-                new PopupView("Click here to popup", new Label("test")), 0, 0);
-        gl.addComponent(
-                new PopupView("Click here to popup", new Label("test")), 2, 0);
+        gl.addComponent(new PopupView("Click here to popup", new Label("test")),
+                0, 0);
+        gl.addComponent(new PopupView("Click here to popup", new Label("test")),
+                2, 0);
 
         addComponent(gl);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 8846b66125..2270da827c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
@@ -27,15 +27,14 @@ public class PopupViewNullValues extends TestBase {
 
             });
         } catch (Exception e) {
-            getMainWindow()
-                    .showNotification(
-                            "Error, 'null content' should not throw an exception at this point",
-                            Notification.TYPE_ERROR_MESSAGE);
+            getMainWindow().showNotification(
+                    "Error, 'null content' should not throw an exception at this point",
+                    Notification.TYPE_ERROR_MESSAGE);
         }
 
         try {
-            pv[1] = new PopupView(null, new LegacyTextField(
-                    "Empty html, contains component"));
+            pv[1] = new PopupView(null,
+                    new LegacyTextField("Empty html, contains component"));
             addComponent(pv[1]);
             b[1] = new Button("Open popupview 2", new ClickListener() {
 
@@ -46,10 +45,9 @@ public class PopupViewNullValues extends TestBase {
 
             });
         } catch (Exception e) {
-            getMainWindow()
-                    .showNotification(
-                            "Error, 'null html', should not throw an exception at this point",
-                            Notification.TYPE_ERROR_MESSAGE);
+            getMainWindow().showNotification(
+                    "Error, 'null html', should not throw an exception at this point",
+                    Notification.TYPE_ERROR_MESSAGE);
         }
 
         try {
@@ -64,14 +62,13 @@ public class PopupViewNullValues extends TestBase {
 
             });
         } catch (Exception e) {
-            getMainWindow()
-                    .showNotification(
-                            "Error, 'null html, null content', should not throw an exception at this point",
-                            Notification.TYPE_ERROR_MESSAGE);
+            getMainWindow().showNotification(
+                    "Error, 'null html, null content', should not throw an exception at this point",
+                    Notification.TYPE_ERROR_MESSAGE);
         }
         try {
-            pv[3] = new PopupView("Popupview 4 - has component", new LegacyTextField(
-                    "This is the content of popupview 4"));
+            pv[3] = new PopupView("Popupview 4 - has component",
+                    new LegacyTextField("This is the content of popupview 4"));
             addComponent(pv[3]);
             b[3] = new Button("Open popupview 4", new ClickListener() {
 
@@ -82,10 +79,9 @@ public class PopupViewNullValues extends TestBase {
 
             });
         } catch (Exception e) {
-            getMainWindow()
-                    .showNotification(
-                            "Error, 'null html, null content', should not throw an exception at this point",
-                            Notification.TYPE_ERROR_MESSAGE);
+            getMainWindow().showNotification(
+                    "Error, 'null html, null content', should not throw an exception at this point",
+                    Notification.TYPE_ERROR_MESSAGE);
         }
 
         addComponent(b[0]);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java
index 979bafc688..f497724a42 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java
@@ -28,8 +28,8 @@ public class ReopenPopupView extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         addComponent(log);
-        addComponent(new PopupView("PopupView", new Button("Button",
-                new Button.ClickListener() {
+        addComponent(new PopupView("PopupView",
+                new Button("Button", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         log.log("Button clicked");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
index c98f580ae2..470f793a04 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
@@ -5,7 +5,8 @@ import java.util.LinkedHashMap;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.ProgressBar;
 
-public class ProgressBarGenericTest extends LegacyAbstractFieldTest<ProgressBar> {
+public class ProgressBarGenericTest
+        extends LegacyAbstractFieldTest<ProgressBar> {
 
     private Command<ProgressBar, Boolean> indeterminate = new Command<ProgressBar, Boolean>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
index ce51184e7d..19e033088f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
@@ -65,8 +65,8 @@ public class ProgressBarTest extends AbstractTestUI {
             }
         }));
 
-        addComponent(new Button("Use ProgressIndicator",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Use ProgressIndicator", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         useComponent(new ProgressIndicator());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 4542d0c6c8..6bb9c73411 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
@@ -25,8 +25,8 @@ public class ProgressIndicatorInvisible extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         pi.setVisible(!pi.isVisible());
-                        event.getButton().setCaption(
-                                (pi.isVisible() ? "Hide" : "Show")
+                        event.getButton()
+                                .setCaption((pi.isVisible() ? "Hide" : "Show")
                                         + " progress indicator");
 
                     }
@@ -47,19 +47,19 @@ public class ProgressIndicatorInvisible extends TestBase {
                 });
 
         addComponent(disableProgressIndicator);
-        Button removeProgressIndicator = new Button(
-                "Remove progress indicator", new ClickListener() {
+        Button removeProgressIndicator = new Button("Remove progress indicator",
+                new ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
                         if (pi.getParent() != null) {
                             lo.removeComponent(pi);
-                            event.getButton().setCaption(
-                                    "Add progress indicator");
+                            event.getButton()
+                                    .setCaption("Add progress indicator");
                         } else {
                             lo.addComponent(pi);
-                            event.getButton().setCaption(
-                                    "Remove progress indicator");
+                            event.getButton()
+                                    .setCaption("Remove progress indicator");
                         }
 
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
index 3590881efa..d5c5a523d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
@@ -20,7 +20,8 @@ import java.util.LinkedHashMap;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.ProgressIndicator;
 
-public class ProgressIndicatorTest extends LegacyAbstractFieldTest<ProgressIndicator> {
+public class ProgressIndicatorTest
+        extends LegacyAbstractFieldTest<ProgressIndicator> {
     ProgressIndicator progress = new ProgressIndicator();
     Command<ProgressIndicator, Float> setValueCommand = new Command<ProgressIndicator, Float>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index c406dcd749..cd9abc369e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
@@ -15,8 +15,8 @@ import com.vaadin.server.Resource;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.AbstractSelect;
 
-public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
-        LegacyAbstractFieldTest<T> implements ItemClickListener {
+public abstract class AbstractSelectTestCase<T extends AbstractSelect>
+        extends LegacyAbstractFieldTest<T> implements ItemClickListener {
 
     public static final String CATEGORY_DATA_SOURCE = "Data source";
 
@@ -67,7 +67,8 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
     }
 
     protected void createMultiSelectCheckbox(String category) {
-        createBooleanAction("Multi select", category, false, multiselectCommand);
+        createBooleanAction("Multi select", category, false,
+                multiselectCommand);
 
     }
 
@@ -101,8 +102,8 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
         for (int i = 1; i <= items; i++) {
             Item item = c.addItem("Item " + i);
             for (int j = 1; j <= properties; j++) {
-                item.getItemProperty("Property " + j).setValue(
-                        "Item " + i + "," + j);
+                item.getItemProperty("Property " + j)
+                        .setValue("Item " + i + "," + j);
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
index 33edc470c7..64714cba70 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
@@ -10,7 +10,8 @@ import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.OptionGroup;
 import com.vaadin.ui.TwinColSelect;
 
-public class OptionGroupBaseSelects extends ComponentTestCase<HorizontalLayout> {
+public class OptionGroupBaseSelects
+        extends ComponentTestCase<HorizontalLayout> {
 
     private HorizontalLayout layout;
 
@@ -50,31 +51,32 @@ public class OptionGroupBaseSelects extends ComponentTestCase<HorizontalLayout>
 
         layout = new HorizontalLayout();
         layout.setSpacing(true);
-        layout.addComponent(createSelect(
-                new ListSelect("List Select, enabled"), true));
-        layout.addComponent(createSelect(
-                new ListSelect("List Select, disabled"), false));
+        layout.addComponent(
+                createSelect(new ListSelect("List Select, enabled"), true));
+        layout.addComponent(
+                createSelect(new ListSelect("List Select, disabled"), false));
 
-        layout.addComponent(createSelect(new NativeSelect(
-                "Native Select, enabled"), true));
-        layout.addComponent(createSelect(new NativeSelect(
-                "Native Select, disabled"), false));
+        layout.addComponent(
+                createSelect(new NativeSelect("Native Select, enabled"), true));
+        layout.addComponent(createSelect(
+                new NativeSelect("Native Select, disabled"), false));
 
-        layout.addComponent(createSelect(new OptionGroup(
-                "Option Group, enabled"), true));
-        layout.addComponent(createSelect(new OptionGroup(
-                "Option Group, disabled"), false));
+        layout.addComponent(
+                createSelect(new OptionGroup("Option Group, enabled"), true));
+        layout.addComponent(
+                createSelect(new OptionGroup("Option Group, disabled"), false));
 
-        layout.addComponent(createSelect(new TwinColSelect(
-                "Twin Column Select, enabled"), true));
-        layout.addComponent(createSelect(new TwinColSelect(
-                "Twin Column Select, disabled"), false));
+        layout.addComponent(createSelect(
+                new TwinColSelect("Twin Column Select, enabled"), true));
+        layout.addComponent(createSelect(
+                new TwinColSelect("Twin Column Select, disabled"), false));
 
         addTestComponent(layout);
 
     }
 
-    private AbstractSelect createSelect(AbstractSelect select, boolean enabled) {
+    private AbstractSelect createSelect(AbstractSelect select,
+            boolean enabled) {
         select.addContainerProperty(CAPTION, String.class, null);
         for (int i = 0; i < 10; i++) {
             select.addItem("" + i).getItemProperty(CAPTION)
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index 77c187ff60..a7752f6033 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
@@ -75,7 +75,8 @@ public class SelectDisplaysOldValue extends TestBase {
         }
 
         private void buildSlaveDropdown(Integer masterId) {
-            IndexedContainer slaveOptionContainer = initSlaveOptionContainer(masterId);
+            IndexedContainer slaveOptionContainer = initSlaveOptionContainer(
+                    masterId);
             slaveComboBox = new Select(SLAVE_COMBO_BOX_CAPTION,
                     slaveOptionContainer);
             configureSlaveOptionDropdown();
@@ -91,8 +92,8 @@ public class SelectDisplaysOldValue extends TestBase {
 
             for (Integer optionId : controllerOptionMap.keySet()) {
                 itemAdded = containerToReturn.addItem(optionId);
-                itemAdded.getItemProperty(NAME_PROPERTY_ID).setValue(
-                        controllerOptionMap.get(optionId));
+                itemAdded.getItemProperty(NAME_PROPERTY_ID)
+                        .setValue(controllerOptionMap.get(optionId));
             }
 
             return containerToReturn;
@@ -139,12 +140,13 @@ public class SelectDisplaysOldValue extends TestBase {
             System.out.println("Slave value: " + slaveComboBox.getValue());
         }
 
-        private class ControllerUpdatedListener implements
-                Property.ValueChangeListener {
+        private class ControllerUpdatedListener
+                implements Property.ValueChangeListener {
             @Override
-            public void valueChange(Property.ValueChangeEvent valueChangeEvent) {
-                refreshSlaveDropdown((Integer) valueChangeEvent.getProperty()
-                        .getValue());
+            public void valueChange(
+                    Property.ValueChangeEvent valueChangeEvent) {
+                refreshSlaveDropdown(
+                        (Integer) valueChangeEvent.getProperty().getValue());
             }
         }
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
index 0cba74b941..0b3301bb4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
@@ -19,8 +19,8 @@ public class SelectIconPlacement extends TestBase {
             mySelect = new Select("Width: " + (width == null ? "auto" : width));
             String bar = "Only item";
             mySelect.addItem(bar);
-            mySelect.setItemIcon(bar, new ThemeResource("common/icons/" + icon
-                    + "?w=" + width));
+            mySelect.setItemIcon(bar,
+                    new ThemeResource("common/icons/" + icon + "?w=" + width));
             mySelect.select(bar);
             mySelect.setWidth(width);
             addComponent(mySelect);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
index b97231ae8e..baa06b86a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
@@ -10,10 +10,8 @@ public class StylingPopupOpener extends TestBase {
 
     @Override
     protected void setup() {
-        TestUtils
-                .injectCSS(
-                        getMainWindow(),
-                        ".v-filterselect-mystyle .v-filterselect-button { width: 50px; background-color: red; } ");
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-filterselect-mystyle .v-filterselect-button { width: 50px; background-color: red; } ");
 
         final Select select = new Select();
         addComponent(select);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
index 00e1713222..1c0716fdce 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
@@ -14,8 +14,8 @@ public class SliderPrimaryStyleName extends TestBase {
         slider.setPrimaryStyleName("my-slider");
         addComponent(slider);
 
-        addComponent(new Button("Change primary style",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Change primary style", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         slider.setPrimaryStyleName("my-second-slider");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index 7c0648876b..5fa6860c34 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
@@ -8,17 +8,19 @@ import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener;
 
 public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel>
-        extends AbstractComponentContainerTest<T> implements
-        SplitterClickListener {
+        extends AbstractComponentContainerTest<T>
+        implements SplitterClickListener {
 
     private Command<T, Boolean> splitterClickListenerCommand = new Command<T, Boolean>() {
 
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((SplitterClickListener) AbstractSplitPanelTest.this);
+                c.addListener(
+                        (SplitterClickListener) AbstractSplitPanelTest.this);
             } else {
-                c.removeListener((SplitterClickListener) AbstractSplitPanelTest.this);
+                c.removeListener(
+                        (SplitterClickListener) AbstractSplitPanelTest.this);
             }
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
index 4da5430cb1..dd5b4e8c1d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
@@ -35,7 +35,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI {
         getLayout().setMargin(new MarginInfo(true, false, false, false));
 
         HorizontalSplitPanel panel = new HorizontalSplitPanel();
-        panel.setCaption("Horizontal 1 - no first component, label as second component");
+        panel.setCaption(
+                "Horizontal 1 - no first component, label as second component");
         panel.setId("Horizontal 1");
         Label label = new Label("Label");
         label.addStyleName("target");
@@ -44,7 +45,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI {
         addComponent(panel);
 
         panel = new HorizontalSplitPanel();
-        panel.setCaption("Horizontal 2 - button as first component, label as second component");
+        panel.setCaption(
+                "Horizontal 2 - button as first component, label as second component");
         panel.setId("Horizontal 2");
         label = new Label("Label");
         label.addStyleName("target");
@@ -54,7 +56,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI {
         addComponent(panel);
 
         panel = new HorizontalSplitPanel();
-        panel.setCaption("Horizontal 3 - fixed height, no first component, label as second component");
+        panel.setCaption(
+                "Horizontal 3 - fixed height, no first component, label as second component");
         panel.setId("Horizontal 3");
         label = new Label("Label");
         label.addStyleName("target");
@@ -64,7 +67,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI {
         addComponent(panel);
 
         VerticalSplitPanel vPanel = new VerticalSplitPanel();
-        vPanel.setCaption("Vertical 1 - no first component, label as second component");
+        vPanel.setCaption(
+                "Vertical 1 - no first component, label as second component");
         vPanel.setId("Vertical 1");
         vPanel.setHeight(100, Unit.PIXELS);
         Label vLabel = new Label("Label");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
index a330581f22..a9c2d6bb6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel;
 
 import com.vaadin.ui.HorizontalSplitPanel;
 
-public class HorizontalSplitPanels extends
-        AbstractSplitPanelTest<HorizontalSplitPanel> {
+public class HorizontalSplitPanels
+        extends AbstractSplitPanelTest<HorizontalSplitPanel> {
 
     @Override
     protected Class<HorizontalSplitPanel> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 7328983f21..3025da57e7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
@@ -10,8 +10,8 @@ import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
 
-public class SplitPanelExtraScrollbars extends AbstractTestCase implements
-        ClickListener {
+public class SplitPanelExtraScrollbars extends AbstractTestCase
+        implements ClickListener {
 
     private HorizontalSplitPanel sp;
     private HorizontalLayout hl;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index eb1fee145d..f8f56f17d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
@@ -45,8 +45,8 @@ public class SplitPanelSplitterWidth extends TestBase {
         p.setSizeFull();
         split2.addComponent(p);
 
-        getLayout().addComponent(
-                new Button("Unlock", new Button.ClickListener() {
+        getLayout()
+                .addComponent(new Button("Unlock", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
index 3359ec0559..6e4fd58391 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
@@ -21,10 +21,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
         horizontalSplitsLayout.setCaption("Horizontal splits");
 
         HorizontalSplitPanel percentagePositionWithPercentageLimitsHorizontal = new HorizontalSplitPanel();
-        percentagePositionWithPercentageLimitsHorizontal.setMinSplitPosition(
-                10, Sizeable.UNITS_PERCENTAGE);
-        percentagePositionWithPercentageLimitsHorizontal.setMaxSplitPosition(
-                80, Sizeable.UNITS_PERCENTAGE);
+        percentagePositionWithPercentageLimitsHorizontal.setMinSplitPosition(10,
+                Sizeable.UNITS_PERCENTAGE);
+        percentagePositionWithPercentageLimitsHorizontal.setMaxSplitPosition(80,
+                Sizeable.UNITS_PERCENTAGE);
         percentagePositionWithPercentageLimitsHorizontal
                 .setFirstComponent(new Label("Min 10 % - 50 % position"));
         percentagePositionWithPercentageLimitsHorizontal
@@ -53,10 +53,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 Sizeable.UNITS_PIXELS);
         pixelPositionWithPixelLimitsHorizontal.setMaxSplitPosition(550,
                 Sizeable.UNITS_PIXELS);
-        pixelPositionWithPixelLimitsHorizontal.setFirstComponent(new Label(
-                "Min 100 px - 400 px position"));
-        pixelPositionWithPixelLimitsHorizontal.setSecondComponent(new Label(
-                "Max 550 px"));
+        pixelPositionWithPixelLimitsHorizontal
+                .setFirstComponent(new Label("Min 100 px - 400 px position"));
+        pixelPositionWithPixelLimitsHorizontal
+                .setSecondComponent(new Label("Max 550 px"));
         pixelPositionWithPixelLimitsHorizontal.setSplitPosition(400,
                 Sizeable.UNITS_PIXELS);
         horizontalSplitsLayout
@@ -82,38 +82,36 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
         percentagePositionWithPercentageLimitsHorizontalResersed
                 .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE);
         percentagePositionWithPercentageLimitsHorizontalResersed
-                .setFirstComponent(new Label(
-                        "Max 80 % - Reversed 50 % position"));
+                .setFirstComponent(
+                        new Label("Max 80 % - Reversed 50 % position"));
         percentagePositionWithPercentageLimitsHorizontalResersed
                 .setSecondComponent(new Label("Min 10 %"));
         percentagePositionWithPercentageLimitsHorizontalResersed
                 .setSplitPosition(50, Sizeable.UNITS_PERCENTAGE, true);
-        horizontalSplitsLayout
-                .addComponent(percentagePositionWithPercentageLimitsHorizontalResersed);
+        horizontalSplitsLayout.addComponent(
+                percentagePositionWithPercentageLimitsHorizontalResersed);
 
         HorizontalSplitPanel pixelPositionWithPercentageLimitsHorizontalResersed = new HorizontalSplitPanel();
         pixelPositionWithPercentageLimitsHorizontalResersed
                 .setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE);
         pixelPositionWithPercentageLimitsHorizontalResersed
                 .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE);
-        pixelPositionWithPercentageLimitsHorizontalResersed
-                .setFirstComponent(new Label(
-                        "Max 80 % - Reversed 400 px position"));
+        pixelPositionWithPercentageLimitsHorizontalResersed.setFirstComponent(
+                new Label("Max 80 % - Reversed 400 px position"));
         pixelPositionWithPercentageLimitsHorizontalResersed
                 .setSecondComponent(new Label("Min 10 %"));
-        pixelPositionWithPercentageLimitsHorizontalResersed.setSplitPosition(
-                400, Sizeable.UNITS_PIXELS, true);
-        horizontalSplitsLayout
-                .addComponent(pixelPositionWithPercentageLimitsHorizontalResersed);
+        pixelPositionWithPercentageLimitsHorizontalResersed
+                .setSplitPosition(400, Sizeable.UNITS_PIXELS, true);
+        horizontalSplitsLayout.addComponent(
+                pixelPositionWithPercentageLimitsHorizontalResersed);
 
         HorizontalSplitPanel pixelPositionWithPixelLimitsHorizontalResersed = new HorizontalSplitPanel();
         pixelPositionWithPixelLimitsHorizontalResersed.setMinSplitPosition(100,
                 Sizeable.UNITS_PIXELS);
         pixelPositionWithPixelLimitsHorizontalResersed.setMaxSplitPosition(550,
                 Sizeable.UNITS_PIXELS);
-        pixelPositionWithPixelLimitsHorizontalResersed
-                .setFirstComponent(new Label(
-                        "Max 550 px - Reversed 400 px position"));
+        pixelPositionWithPixelLimitsHorizontalResersed.setFirstComponent(
+                new Label("Max 550 px - Reversed 400 px position"));
         pixelPositionWithPixelLimitsHorizontalResersed
                 .setSecondComponent(new Label("Min 100 px"));
         pixelPositionWithPixelLimitsHorizontalResersed.setSplitPosition(400,
@@ -126,15 +124,14 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 .setMinSplitPosition(100, Sizeable.UNITS_PIXELS);
         percentagePositionWithPixelLimitsHorizontalResersed
                 .setMaxSplitPosition(550, Sizeable.UNITS_PIXELS);
-        percentagePositionWithPixelLimitsHorizontalResersed
-                .setFirstComponent(new Label(
-                        "Max 550 px - Reversed 30 % position"));
+        percentagePositionWithPixelLimitsHorizontalResersed.setFirstComponent(
+                new Label("Max 550 px - Reversed 30 % position"));
         percentagePositionWithPixelLimitsHorizontalResersed
                 .setSecondComponent(new Label("Min 100 px"));
-        percentagePositionWithPixelLimitsHorizontalResersed.setSplitPosition(
-                30, Sizeable.UNITS_PERCENTAGE, true);
-        horizontalSplitsLayout
-                .addComponent(percentagePositionWithPixelLimitsHorizontalResersed);
+        percentagePositionWithPixelLimitsHorizontalResersed.setSplitPosition(30,
+                Sizeable.UNITS_PERCENTAGE, true);
+        horizontalSplitsLayout.addComponent(
+                percentagePositionWithPixelLimitsHorizontalResersed);
 
         horizontalSplitsLayout.setSizeFull();
         tabs.addComponent(horizontalSplitsLayout);
@@ -161,10 +158,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 Sizeable.UNITS_PERCENTAGE);
         pixelPositionWithPercentageLimitsVertical.setMaxSplitPosition(80,
                 Sizeable.UNITS_PERCENTAGE);
-        pixelPositionWithPercentageLimitsVertical.setFirstComponent(new Label(
-                "Min 10 % - 400 px position"));
-        pixelPositionWithPercentageLimitsVertical.setSecondComponent(new Label(
-                "Max 80 %"));
+        pixelPositionWithPercentageLimitsVertical
+                .setFirstComponent(new Label("Min 10 % - 400 px position"));
+        pixelPositionWithPercentageLimitsVertical
+                .setSecondComponent(new Label("Max 80 %"));
         pixelPositionWithPercentageLimitsVertical.setSplitPosition(400,
                 Sizeable.UNITS_PIXELS);
         verticalSplitsLayout
@@ -175,10 +172,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 Sizeable.UNITS_PIXELS);
         pixelPositionWithPixelLimitsVertical.setMaxSplitPosition(450,
                 Sizeable.UNITS_PIXELS);
-        pixelPositionWithPixelLimitsVertical.setFirstComponent(new Label(
-                "Min 100 px - 400 px position"));
-        pixelPositionWithPixelLimitsVertical.setSecondComponent(new Label(
-                "Max 450 px"));
+        pixelPositionWithPixelLimitsVertical
+                .setFirstComponent(new Label("Min 100 px - 400 px position"));
+        pixelPositionWithPixelLimitsVertical
+                .setSecondComponent(new Label("Max 450 px"));
         pixelPositionWithPixelLimitsVertical.setSplitPosition(400,
                 Sizeable.UNITS_PIXELS);
         verticalSplitsLayout.addComponent(pixelPositionWithPixelLimitsVertical);
@@ -188,10 +185,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 Sizeable.UNITS_PIXELS);
         percentagePositionWithPixelLimitsVertical.setMaxSplitPosition(450,
                 Sizeable.UNITS_PIXELS);
-        percentagePositionWithPixelLimitsVertical.setFirstComponent(new Label(
-                "Min 100 px - 30 % position"));
-        percentagePositionWithPixelLimitsVertical.setSecondComponent(new Label(
-                "Max 450 px"));
+        percentagePositionWithPixelLimitsVertical
+                .setFirstComponent(new Label("Min 100 px - 30 % position"));
+        percentagePositionWithPixelLimitsVertical
+                .setSecondComponent(new Label("Max 450 px"));
         percentagePositionWithPixelLimitsVertical.setSplitPosition(30,
                 Sizeable.UNITS_PERCENTAGE);
         verticalSplitsLayout
@@ -203,38 +200,36 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
         percentagePositionWithPercentageLimitsVerticalReversed
                 .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE);
         percentagePositionWithPercentageLimitsVerticalReversed
-                .setFirstComponent(new Label(
-                        "Max 80 % - Reversed 50 % position"));
+                .setFirstComponent(
+                        new Label("Max 80 % - Reversed 50 % position"));
         percentagePositionWithPercentageLimitsVerticalReversed
                 .setSecondComponent(new Label("Min 10 %"));
         percentagePositionWithPercentageLimitsVerticalReversed
                 .setSplitPosition(50, Sizeable.UNITS_PERCENTAGE, true);
-        verticalSplitsLayout
-                .addComponent(percentagePositionWithPercentageLimitsVerticalReversed);
+        verticalSplitsLayout.addComponent(
+                percentagePositionWithPercentageLimitsVerticalReversed);
 
         VerticalSplitPanel pixelPositionWithPercentageLimitsVerticalReversed = new VerticalSplitPanel();
-        pixelPositionWithPercentageLimitsVerticalReversed.setMinSplitPosition(
-                10, Sizeable.UNITS_PERCENTAGE);
-        pixelPositionWithPercentageLimitsVerticalReversed.setMaxSplitPosition(
-                80, Sizeable.UNITS_PERCENTAGE);
         pixelPositionWithPercentageLimitsVerticalReversed
-                .setFirstComponent(new Label(
-                        "Max 80 % - Reversed 400 px position"));
+                .setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE);
+        pixelPositionWithPercentageLimitsVerticalReversed
+                .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE);
+        pixelPositionWithPercentageLimitsVerticalReversed.setFirstComponent(
+                new Label("Max 80 % - Reversed 400 px position"));
         pixelPositionWithPercentageLimitsVerticalReversed
                 .setSecondComponent(new Label("Min 10 %"));
         pixelPositionWithPercentageLimitsVerticalReversed.setSplitPosition(400,
                 Sizeable.UNITS_PIXELS, true);
-        verticalSplitsLayout
-                .addComponent(pixelPositionWithPercentageLimitsVerticalReversed);
+        verticalSplitsLayout.addComponent(
+                pixelPositionWithPercentageLimitsVerticalReversed);
 
         VerticalSplitPanel pixelPositionWithPixelLimitsVerticalReversed = new VerticalSplitPanel();
         pixelPositionWithPixelLimitsVerticalReversed.setMinSplitPosition(100,
                 Sizeable.UNITS_PIXELS);
         pixelPositionWithPixelLimitsVerticalReversed.setMaxSplitPosition(400,
                 Sizeable.UNITS_PIXELS);
-        pixelPositionWithPixelLimitsVerticalReversed
-                .setFirstComponent(new Label(
-                        "Max 400 px - Reversed 300 px position"));
+        pixelPositionWithPixelLimitsVerticalReversed.setFirstComponent(
+                new Label("Max 400 px - Reversed 300 px position"));
         pixelPositionWithPixelLimitsVerticalReversed
                 .setSecondComponent(new Label("Min 100 px"));
         pixelPositionWithPixelLimitsVerticalReversed.setSplitPosition(300,
@@ -243,19 +238,18 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
                 .addComponent(pixelPositionWithPixelLimitsVerticalReversed);
 
         VerticalSplitPanel percentagePositionWithPixelLimitsVerticalReversed = new VerticalSplitPanel();
-        percentagePositionWithPixelLimitsVerticalReversed.setMinSplitPosition(
-                100, Sizeable.UNITS_PIXELS);
-        percentagePositionWithPixelLimitsVerticalReversed.setMaxSplitPosition(
-                400, Sizeable.UNITS_PIXELS);
         percentagePositionWithPixelLimitsVerticalReversed
-                .setFirstComponent(new Label(
-                        "Max 400 px - Reversed 30 % position"));
+                .setMinSplitPosition(100, Sizeable.UNITS_PIXELS);
+        percentagePositionWithPixelLimitsVerticalReversed
+                .setMaxSplitPosition(400, Sizeable.UNITS_PIXELS);
+        percentagePositionWithPixelLimitsVerticalReversed.setFirstComponent(
+                new Label("Max 400 px - Reversed 30 % position"));
         percentagePositionWithPixelLimitsVerticalReversed
                 .setSecondComponent(new Label("Min 100 px"));
         percentagePositionWithPixelLimitsVerticalReversed.setSplitPosition(30,
                 Sizeable.UNITS_PERCENTAGE, true);
-        verticalSplitsLayout
-                .addComponent(percentagePositionWithPixelLimitsVerticalReversed);
+        verticalSplitsLayout.addComponent(
+                percentagePositionWithPixelLimitsVerticalReversed);
 
         tabs.addComponent(verticalSplitsLayout);
         verticalSplitsLayout.setSizeFull();
@@ -266,8 +260,8 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI {
         final HorizontalSplitPanel togglableSplitPanel = new HorizontalSplitPanel();
         togglableSplitPanel.setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE);
         togglableSplitPanel.setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE);
-        togglableSplitPanel.setFirstComponent(new Label(
-                "Min 10 % - 50 % position"));
+        togglableSplitPanel
+                .setFirstComponent(new Label("Min 10 % - 50 % position"));
         togglableSplitPanel.setSecondComponent(new Label("Max 80 %"));
         togglableSplitPanel.setSplitPosition(50, Sizeable.UNITS_PERCENTAGE);
         togglableSplitPanel.setHeight("250px");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
index 81c449731c..6c6173542b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
@@ -49,8 +49,8 @@ public class SplitPositionChange extends AbstractTestUIWithLog {
         splitPanel.setHeight("200px");
         splitPanel.addComponent(buildPanel(firstCaption));
         splitPanel.addComponent(buildPanel(secondCaption));
-        splitPanel
-                .addSplitPositionChangeListener(new AbstractSplitPanel.SplitPositionChangeListener() {
+        splitPanel.addSplitPositionChangeListener(
+                new AbstractSplitPanel.SplitPositionChangeListener() {
 
                     @Override
                     public void onSplitPositionChanged(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
index 219a72c196..f366d59591 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel;
 
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class VerticalSplitPanels extends
-        AbstractSplitPanelTest<VerticalSplitPanel> {
+public class VerticalSplitPanels
+        extends AbstractSplitPanelTest<VerticalSplitPanel> {
 
     @Override
     protected Class<VerticalSplitPanel> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
index 2d8a30cb12..17f6000282 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
@@ -64,8 +64,7 @@ public class AddSelectionToRemovedRange extends AbstractTestUI {
 
                 for (Integer item : selected) {
                     if (null == item) {
-                        new Notification(
-                                "ERROR",
+                        new Notification("ERROR",
                                 "Table value has null in Set of selected items!",
                                 Type.ERROR_MESSAGE).show(getPage());
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
index 6f9f1df89f..8edb3d9aa9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
@@ -69,9 +69,8 @@ public class AsyncPushUpdates extends AbstractTestUI {
                             for (int i = 0; i < 11; i++) {
                                 container.getContainerProperty(
                                         container.addItem(), VALUE_PROPERTY_ID)
-                                        .setValue(
-                                                clickCount + " - " + id + " - "
-                                                        + i);
+                                        .setValue(clickCount + " - " + id
+                                                + " - " + i);
                             }
 
                         } catch (InterruptedException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index fb4bc5a045..84824718b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
@@ -10,9 +10,8 @@ public class CellStyleGeneratorTest extends TestBase {
 
     @Override
     protected void setup() {
-        TestUtils
-                .injectCSS(getMainWindow(),
-                        ".v-table-cell-content-red{background:red;}.v-table-row-blue{background:blue;}");
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-table-cell-content-red{background:red;}.v-table-row-blue{background:blue;}");
 
         CellStyleGenerator g = new CellStyleGenerator() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 8d1a9fc7df..769f988c15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
@@ -37,7 +37,8 @@ public class ColumnCollapsingAndColumnExpansion extends AbstractTestUIWithLog {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 table.setColumnCollapsed("Col2",
                         !table.isColumnCollapsed("Col2"));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
index f092ba8bca..77d490ea7d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
@@ -85,20 +85,21 @@ public class ColumnResizeEvent extends TestBase {
 
         table.addListener(new ColumnResizeListener() {
             @Override
-            public void columnResize(com.vaadin.ui.Table.ColumnResizeEvent event) {
+            public void columnResize(
+                    com.vaadin.ui.Table.ColumnResizeEvent event) {
 
                 if (event.getPropertyId().equals("firstname")) {
-                    column1Width.setValue(event.getCurrentWidth()
-                            + "px (previously " + event.getPreviousWidth()
-                            + "px)");
+                    column1Width.setValue(
+                            event.getCurrentWidth() + "px (previously "
+                                    + event.getPreviousWidth() + "px)");
                 } else if (event.getPropertyId().equals("lastname")) {
-                    column2Width.setValue(event.getCurrentWidth()
-                            + "px (previously " + event.getPreviousWidth()
-                            + "px)");
+                    column2Width.setValue(
+                            event.getCurrentWidth() + "px (previously "
+                                    + event.getPreviousWidth() + "px)");
                 } else if (event.getPropertyId().equals("150pxfixedCol")) {
-                    column3Width.setValue(event.getCurrentWidth()
-                            + "px (previously " + event.getPreviousWidth()
-                            + "px)");
+                    column3Width.setValue(
+                            event.getCurrentWidth() + "px (previously "
+                                    + event.getPreviousWidth() + "px)");
                 }
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
index 7e33de502c..27d2d82113 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
@@ -10,8 +10,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends
-        AbstractTestUI {
+public class ColumnWidthsAfterChangeTableColumnsCountOrOrder
+        extends AbstractTestUI {
 
     protected static final String BUTTON_CHANGE_ORDER_AND_WIDTH_ID = "buttonChangeOrderAndWidth";
     protected static final String BUTTON_CHANGE_COLUMN_COUNT_AND_WIDTH = "buttonChangeColumnCountAndWidth";
@@ -40,8 +40,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent clickEvent) {
-                        table.setVisibleColumns(new Object[] { "name", "descr",
-                                "id" });
+                        table.setVisibleColumns(
+                                new Object[] { "name", "descr", "id" });
                         table.setColumnWidth("descr", NEW_COLUMN_WIDTH);
                     }
                 });
@@ -51,7 +51,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends
                 "Change columns count and width", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent clickEvent) {
-                        table.setVisibleColumns(new Object[] { "name", "descr" });
+                        table.setVisibleColumns(
+                                new Object[] { "name", "descr" });
                         table.setColumnWidth("descr", NEW_COLUMN_WIDTH);
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
index 12f28332f4..5f96538368 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
@@ -111,8 +111,8 @@ public class ContainerSizeChangeDuringTablePaint extends AbstractTestUI {
                         addItem(container, "A", "New", "Row");
                         container.sabotageNextPaint();
 
-                        event.getButton().setCaption(
-                                "Event was fired successfully.");
+                        event.getButton()
+                                .setCaption("Event was fired successfully.");
                     }
                 });
         button.setId("addRow");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
index ec7301099f..38a8f746e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
@@ -36,7 +36,8 @@ public class ContextMenuSize extends AbstractTestUI {
         table.addActionHandler(new Handler() {
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
             }
 
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
index 7bebfafd4e..693a489f2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
@@ -86,11 +86,11 @@ public class DndTableTargetDetails extends AbstractTestUI {
                     .getTargetDetails();
             MouseEventDetails mouseDetails = details.getMouseEvent();
 
-            VerticalLayout layout = (VerticalLayout) details.getTarget()
-                    .getUI().getContent();
+            VerticalLayout layout = (VerticalLayout) details.getTarget().getUI()
+                    .getContent();
 
-            Label name = new Label("Button name="
-                    + mouseDetails.getButtonName());
+            Label name = new Label(
+                    "Button name=" + mouseDetails.getButtonName());
             name.addStyleName("dnd-button-name");
             layout.addComponent(name);
             if (mouseDetails.isCtrlKey()) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
index 390a026c6f..0241684a99 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
@@ -81,7 +81,8 @@ public class EditableModeChange extends AbstractTestUI {
                 Object propertyId, Component uiContext) {
             if (selectionEvent != null) {
                 if ((selectionEvent.getItemId().equals(itemId))
-                        && (selectionEvent.getPropertyId().equals(propertyId))) {
+                        && (selectionEvent.getPropertyId()
+                                .equals(propertyId))) {
                     return super.createField(container, itemId, propertyId,
                             uiContext);
                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
index 3bc0d3dd1f..3290ea9db5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
@@ -83,9 +83,9 @@ public class EmptyRowsWhenScrolling extends UI {
                     SimpleBean.class);
             container.setBeanIdProperty("id");
             for (int i = 1; i <= 50; ++i) {
-                container.addBean(new SimpleBean(i, "image",
-                        "Column1 row " + i, "Column2 row " + i, "Column3 row "
-                                + i, "Column4 row " + i));
+                container.addBean(new SimpleBean(i, "image", "Column1 row " + i,
+                        "Column2 row " + i, "Column3 row " + i,
+                        "Column4 row " + i));
             }
             table.setContainerDataSource(container);
             table.setEditable(true);
@@ -99,8 +99,8 @@ public class EmptyRowsWhenScrolling extends UI {
                     int imgNum = new Random().nextInt(5) + 1;
                     try {
                         // Simulate background work
-                        System.out
-                                .println("Generated column for image /com/example/simpletable/img/px50-"
+                        System.out.println(
+                                "Generated column for image /com/example/simpletable/img/px50-"
                                         + imgNum + ".jpg");
                         Thread.sleep(50);
                     } catch (InterruptedException e) {
@@ -112,13 +112,14 @@ public class EmptyRowsWhenScrolling extends UI {
                     Embedded image = new Embedded("", resource);
                     image.setWidth("50px");
                     image.setHeight("50px");
-                    image.addClickListener(new com.vaadin.event.MouseEvents.ClickListener() {
-                        @Override
-                        public void click(
-                                com.vaadin.event.MouseEvents.ClickEvent event) {
-                            Notification.show("Image clicked!");
-                        }
-                    });
+                    image.addClickListener(
+                            new com.vaadin.event.MouseEvents.ClickListener() {
+                                @Override
+                                public void click(
+                                        com.vaadin.event.MouseEvents.ClickEvent event) {
+                                    Notification.show("Image clicked!");
+                                }
+                            });
                     return image;
                 }
             });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
index a7d387477d..532c03b91a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
@@ -114,7 +114,7 @@ public class ExpandingContainer extends AbstractContainer implements
 
     @Override
     @SuppressWarnings("rawtypes")
-    public Property/* <?> */getContainerProperty(Object itemId,
+    public Property/* <?> */ getContainerProperty(Object itemId,
             Object propertyId) {
         BeanItem<MyBean> item = getItem(itemId);
         return item != null ? item.getItemProperty(propertyId) : null;
@@ -222,8 +222,8 @@ public class ExpandingContainer extends AbstractContainer implements
         }
         final int size = currentSize;
         if (index >= size) {
-            throw new IndexOutOfBoundsException("index=" + index + " but size="
-                    + size);
+            throw new IndexOutOfBoundsException(
+                    "index=" + index + " but size=" + size);
         }
         checkExpand(index);
         return index;
@@ -237,8 +237,8 @@ public class ExpandingContainer extends AbstractContainer implements
         final int size = currentSize;
         checkExpand(startIndex);
         if (startIndex < 0 || startIndex > size) {
-            throw new IndexOutOfBoundsException("startIndex=" + startIndex
-                    + " but size=" + size);
+            throw new IndexOutOfBoundsException(
+                    "startIndex=" + startIndex + " but size=" + size);
         }
         if (startIndex + numberOfItems > size) {
             numberOfItems = size - startIndex;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
index a42135dc85..7c3220dced 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
@@ -35,8 +35,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
         CheckBox headerClickListenerCheckbox = new CheckBox(
                 "Header click listener");
         headerClickListenerCheckbox.setImmediate(true);
-        headerClickListenerCheckbox
-                .addValueChangeListener(new HasValue.ValueChangeListener<Boolean>() {
+        headerClickListenerCheckbox.addValueChangeListener(
+                new HasValue.ValueChangeListener<Boolean>() {
 
                     private HeaderClickListener headerClickListener = new HeaderClickListener() {
 
@@ -57,7 +57,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
                                 .isEmpty()) {
                             table.addHeaderClickListener(headerClickListener);
                         } else {
-                            table.removeHeaderClickListener(headerClickListener);
+                            table.removeHeaderClickListener(
+                                    headerClickListener);
                         }
                     }
                 });
@@ -66,8 +67,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
         CheckBox footerClickListenerCheckbox = new CheckBox(
                 "Footer click listener");
         footerClickListenerCheckbox.setImmediate(true);
-        footerClickListenerCheckbox
-                .addValueChangeListener(new HasValue.ValueChangeListener<Boolean>() {
+        footerClickListenerCheckbox.addValueChangeListener(
+                new HasValue.ValueChangeListener<Boolean>() {
 
                     private FooterClickListener footerClickListener = new FooterClickListener() {
 
@@ -87,7 +88,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
                                 .isEmpty()) {
                             table.addFooterClickListener(footerClickListener);
                         } else {
-                            table.removeFooterClickListener(footerClickListener);
+                            table.removeFooterClickListener(
+                                    footerClickListener);
                         }
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
index 10ffb1c8aa..fc2b1ae49a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
@@ -13,8 +13,8 @@ import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Table;
 
-public class HeaderPositionWhenSorting extends AbstractTestUI implements
-        Action.Handler, ItemClickListener {
+public class HeaderPositionWhenSorting extends AbstractTestUI
+        implements Action.Handler, ItemClickListener {
 
     private Table table;
     private boolean actionHandlerHasActions = false;
@@ -43,7 +43,8 @@ public class HeaderPositionWhenSorting extends AbstractTestUI implements
         });
         addComponent(cbActionHandler);
 
-        CheckBox cbActionHasActions = new CheckBox("Action handler has actions");
+        CheckBox cbActionHasActions = new CheckBox(
+                "Action handler has actions");
         cbActionHasActions.setImmediate(true);
         cbActionHasActions.addValueChangeListener(event -> {
             actionHandlerHasActions = event.getValue();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
index e9c948ddf7..7642ac2bc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
@@ -14,8 +14,8 @@ public class HeaderRightClickAfterDrag extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         Table table = new Table();
-        table.setContainerDataSource(new BeanItemContainer<TestBean>(
-                TestBean.class));
+        table.setContainerDataSource(
+                new BeanItemContainer<TestBean>(TestBean.class));
         for (int i = 0; i < 10; i++) {
             table.addItem(new TestBean(i));
         }
@@ -25,12 +25,11 @@ public class HeaderRightClickAfterDrag extends AbstractTestUI {
         table.addHeaderClickListener(new Table.HeaderClickListener() {
             @Override
             public void headerClick(Table.HeaderClickEvent event) {
-                if (MouseEventDetails.MouseButton.RIGHT.equals(event
-                        .getButton())) {
+                if (MouseEventDetails.MouseButton.RIGHT
+                        .equals(event.getButton())) {
                     Window window = new Window("Right-clicked:", new Label(
-                            "<center>"
-                                    + event.getPropertyId().toString()
-                                            .toUpperCase() + "</center>",
+                            "<center>" + event.getPropertyId().toString()
+                                    .toUpperCase() + "</center>",
                             ContentMode.HTML));
                     window.setPositionX(event.getClientX());
                     window.setPositionY(event.getClientY());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index abb770ab05..40f2f30055 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
@@ -20,7 +20,8 @@ public class HeaderUpdateWhenNoRows extends AbstractTestUI {
         final CheckBox showHeaders = new CheckBox("Show headers");
         showHeaders.addValueChangeListener(event -> {
             if (showHeaders.getValue()) {
-                table.setColumnHeaderMode(ColumnHeaderMode.EXPLICIT_DEFAULTS_ID);
+                table.setColumnHeaderMode(
+                        ColumnHeaderMode.EXPLICIT_DEFAULTS_ID);
             } else {
                 table.setColumnHeaderMode(ColumnHeaderMode.HIDDEN);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index 4a729d221f..e4d894057a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
@@ -37,8 +37,8 @@ public class HiddenColumnsExpandRatios extends TestBase {
         addComponent(new Button("All", new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.setVisibleColumns(table.getContainerPropertyIds()
-                        .toArray());
+                table.setVisibleColumns(
+                        table.getContainerPropertyIds().toArray());
             }
         }));
         addComponent(new Button("Some", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
index a085408436..5018ca5e4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -57,9 +57,7 @@ public class ItemClickEvents extends AbstractTestUI {
         tree.setParent("2. Child 1", "Root 2");
         tree.addItem("2. Child 2");
         tree.setParent("2. Child 2", "Root 2");
-        tree.addContainerProperty(
-                "icon",
-                ExternalResource.class,
+        tree.addContainerProperty("icon", ExternalResource.class,
                 new ExternalResource(
                         "https://vaadin.com/vaadin-theme/images/vaadin-logo.png"));
 
@@ -144,16 +142,19 @@ public class ItemClickEvents extends AbstractTestUI {
         b = new CheckBox("selectable");
         if (c instanceof Table) {
             b.setValue(((Table) c).isSelectable());
-            b.addValueChangeListener(event -> ((Table) c).setSelectable(event.getValue()));
+            b.addValueChangeListener(
+                    event -> ((Table) c).setSelectable(event.getValue()));
         } else if (c instanceof Tree) {
             b.setValue(((Tree) c).isSelectable());
-            b.addValueChangeListener(event -> ((Tree) c).setSelectable(event.getValue()));
+            b.addValueChangeListener(
+                    event -> ((Tree) c).setSelectable(event.getValue()));
         }
         b.setImmediate(true);
         layout.addComponent(b);
         b = new CheckBox("nullsel");
         b.setValue(c.isNullSelectionAllowed());
-        b.addValueChangeListener(event -> c.setNullSelectionAllowed(event.getValue()));
+        b.addValueChangeListener(
+                event -> c.setNullSelectionAllowed(event.getValue()));
         b.setImmediate(true);
         layout.addComponent(b);
         b = new CheckBox("multi");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
index 2998940db1..6611cef707 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
@@ -45,7 +45,8 @@ public class KeyControl extends TestBase {
             public void valueChange(ValueChangeEvent event) {
                 @SuppressWarnings("unchecked")
                 Set<String> value = (Set<String>) table1.getValue();
-                selected1.setValue(value.toString() + " TOTAL: " + value.size());
+                selected1
+                        .setValue(value.toString() + " TOTAL: " + value.size());
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index f9a0add6fc..fe678f7980 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
@@ -31,24 +31,23 @@ public class KeyboardNavigationWithChangingContent extends TestBase {
         t.setMultiSelect(true);
 
         getLayout().addComponent(t);
-        getLayout().addComponent(
-                new Button("Change elements and selection",
-                        new ClickListener() {
-
-                            @Override
-                            public void buttonClick(ClickEvent event) {
-
-                                bic.removeAllItems();
-                                ValueHolder<String> v4 = null;
-                                for (int i = 4; i < 30; i++) {
-                                    v4 = new ValueHolder<String>("test" + i);
-                                    bic.addBean(v4);
-
-                                }
-                                t.select(t.firstItemId());
-                                t.focus();
-                            }
-                        }));
+        getLayout().addComponent(new Button("Change elements and selection",
+                new ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+
+                        bic.removeAllItems();
+                        ValueHolder<String> v4 = null;
+                        for (int i = 4; i < 30; i++) {
+                            v4 = new ValueHolder<String>("test" + i);
+                            bic.addBean(v4);
+
+                        }
+                        t.select(t.firstItemId());
+                        t.focus();
+                    }
+                }));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index b9062236de..ada685960d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -38,23 +38,21 @@ public class LabelEmbeddedClickThroughForTable extends AbstractTestUI {
         Item item = table.addItem("Item 1 (row 1)");
         item.getItemProperty("Column 1").setValue("String A");
         item.getItemProperty("Column 2").setValue(new Label("Label A"));
-        item.getItemProperty("Column 3").setValue(
-                new Label("<b>Label A</b>", ContentMode.HTML));
-        item.getItemProperty("Column 4").setValue(
-                new Embedded("An embedded image", new ThemeResource(
-                        "../runo/icons/32/ok.png")));
+        item.getItemProperty("Column 3")
+                .setValue(new Label("<b>Label A</b>", ContentMode.HTML));
+        item.getItemProperty("Column 4")
+                .setValue(new Embedded("An embedded image",
+                        new ThemeResource("../runo/icons/32/ok.png")));
 
         item = table.addItem("Item 2 (row 2)");
         item.getItemProperty("Column 1").setValue("String B");
         item.getItemProperty("Column 2").setValue(new Label("Label B"));
         item.getItemProperty("Column 3")
-                .setValue(
-                        new Label(
-                                "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>",
-                                ContentMode.HTML));
-        item.getItemProperty("Column 4").setValue(
-                new Embedded("", new ThemeResource(
-                        "../runo/icons/32/cancel.png")));
+                .setValue(new Label(
+                        "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>",
+                        ContentMode.HTML));
+        item.getItemProperty("Column 4").setValue(new Embedded("",
+                new ThemeResource("../runo/icons/32/cancel.png")));
 
         table.addItemClickListener(new ItemClickListener() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
index b6ee62ea59..715ace04eb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
@@ -86,8 +86,8 @@ public class LargeSelectionCausesNPE extends TestBase {
 
             // set column headers
             table.setVisibleColumns(new String[] { CODE, NAME, ID });
-            table.setColumnHeaders(new String[] { "DummyCode", "DummyName",
-                    "DummyId" });
+            table.setColumnHeaders(
+                    new String[] { "DummyCode", "DummyName", "DummyId" });
 
             // Column alignment
             table.setColumnAlignment(ID, Align.CENTER);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
index 87ff6d9d7b..c230a1b257 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
@@ -48,11 +48,8 @@ public class LastColumnNegative extends TestBase {
     private Table setupTable() {
         IndexedContainer container = new IndexedContainer();
 
-        container
-                .addContainerProperty(
-                        "fileName",
-                        String.class,
-                        "Long enough string to cause a scrollbar when the window is set to a dencently small size.");
+        container.addContainerProperty("fileName", String.class,
+                "Long enough string to cause a scrollbar when the window is set to a dencently small size.");
         container.addContainerProperty("size", Long.class, 23958l);
         container.addItem();
         container.addItem();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
index d5302cdf45..05f1d538fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
@@ -40,8 +40,8 @@ public class LongMultiselect extends AbstractTestUI {
                 // Set ItemProperty.COLUMN2 for all selected values of table
                 Collection selectedIds = (Collection) table.getValue();
                 for (final Object itemId : selectedIds) {
-                    final Property p = table.getItem(itemId).getItemProperty(
-                            ItemProperty.COLUMN2);
+                    final Property p = table.getItem(itemId)
+                            .getItemProperty(ItemProperty.COLUMN2);
                     if (p.getValue() instanceof String) {
                         p.setValue(null);
                     } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
index 00965220db..c888fd98d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
@@ -27,14 +27,16 @@ public class ModifyContainerProperty extends TestBase {
         addComponent(new Button("Remove container property",
                 new Button.ClickListener() {
                     @Override
-                    public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) {
+                    public void buttonClick(
+                            com.vaadin.ui.Button.ClickEvent arg0) {
                         ic.removeContainerProperty("one");
                     }
                 }));
         addComponent(new Button("Add container property",
                 new Button.ClickListener() {
                     @Override
-                    public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) {
+                    public void buttonClick(
+                            com.vaadin.ui.Button.ClickEvent arg0) {
                         boolean added = ic.addContainerProperty("three",
                                 String.class, "three");
                         if (added) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
index 9c063fd42e..a7058b41e3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
@@ -35,10 +35,11 @@ public class MultiSelectWithRemovedRow extends TestBase {
         addComponent(log);
 
         final BeanItemContainer<Person> container = new BeanItemContainer<Person>(
-                Person.class, Arrays.asList(new Person("Joe"), new Person(
-                        "William"), new Person("Jack"), new Person("Averell"),
-                        new Person("Bob"), new Person("Grat"), new Person(
-                                "Bill"), new Person("Emmett")));
+                Person.class,
+                Arrays.asList(new Person("Joe"), new Person("William"),
+                        new Person("Jack"), new Person("Averell"),
+                        new Person("Bob"), new Person("Grat"),
+                        new Person("Bill"), new Person("Emmett")));
         final Table table = new Table("Table", container);
         table.setSelectable(true);
         table.setMultiSelect(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
index f070d28aa8..9a118ab979 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
@@ -41,8 +41,8 @@ public class PopupViewInTable extends AbstractTestUI {
     }
 
     private Component createContent() {
-        VerticalLayout vl = new VerticalLayout(new Label("Hello"), new Button(
-                "World"));
+        VerticalLayout vl = new VerticalLayout(new Label("Hello"),
+                new Button("World"));
         return vl;
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
index d418dbc1f4..de160182a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -49,8 +49,8 @@ public class PropertyValueChange extends TestBase {
                 Object columnId) {
             final Label l = new Label();
             @SuppressWarnings("unchecked")
-            final Property<Integer> integer = source.getContainerProperty(
-                    itemId, "integer");
+            final Property<Integer> integer = source
+                    .getContainerProperty(itemId, "integer");
             l.setValue(String.valueOf(getMultipliedValue(integer)));
 
             // we must hook value change listener to ensure updates in all use
@@ -107,8 +107,9 @@ public class PropertyValueChange extends TestBase {
         t2.setId("disabled table");
 
         Table reader = new Table("Reader table");
-        reader.setDescription("This table should be redrawn on container changes as container data is "
-                + "displayed directly in cells.");
+        reader.setDescription(
+                "This table should be redrawn on container changes as container data is "
+                        + "displayed directly in cells.");
         reader.setContainerDataSource(container);
         reader.addGeneratedColumn("integer x 3", multiplier);
         reader.setPageLength(0);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
index ef72f92a4e..77acb153b8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
@@ -15,8 +15,8 @@ public class ReloadWidgets extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
 
-        final Table table = new Table(null, new BeanItemContainer<Bean>(
-                Bean.class));
+        final Table table = new Table(null,
+                new BeanItemContainer<Bean>(Bean.class));
         table.setId("table");
         table.setSizeFull();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
index c6d071f34c..3645f88a69 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
@@ -39,16 +39,16 @@ public class RowAdditionTest extends TestBase {
                 item.getItemProperty("column1").setValue("0");
             }
         }));
-        hl.addComponent(new Button("Add at position 50",
-                new Button.ClickListener() {
+        hl.addComponent(
+                new Button("Add at position 50", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Item item = container.addItemAt(50, new Object());
                         item.getItemProperty("column1").setValue("50");
                     }
                 }));
-        hl.addComponent(new Button("Add at position 100",
-                new Button.ClickListener() {
+        hl.addComponent(
+                new Button("Add at position 100", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Item item = container.addItemAt(100, new Object());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index bcae4dc6d9..0f8d590909 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
@@ -54,7 +54,8 @@ public class RowUpdateShouldRetainContextMenu extends TestBase {
 
         table.addActionHandler(new Action.Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
             }
 
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
index 6d6f744918..2c77cd2dbc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
@@ -35,7 +35,8 @@ public class ShowLastItem extends AbstractTestUI {
                 table.addItem(itemId).getItemProperty("Col")
                         .setValue(String.valueOf(itemId));
 
-                table.setCurrentPageFirstItemIndex(table.getItemIds().size() - 1);
+                table.setCurrentPageFirstItemIndex(
+                        table.getItemIds().size() - 1);
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
index a41f4248d9..dbe8c4aa6e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
@@ -29,16 +29,16 @@ public class SortableHeaderStyles extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        getPage().getStyles().add(
-                ".v-table-header-sortable { font-weight: bold;}");
+        getPage().getStyles()
+                .add(".v-table-header-sortable { font-weight: bold;}");
 
         PersonContainer container = PersonContainer.createWithTestData();
 
         Collection<?> sortableContainerPropertyIds = container
                 .getSortableContainerPropertyIds();
 
-        final OptionGroup sortableSelector = new OptionGroup(
-                "Sortable columns", sortableContainerPropertyIds);
+        final OptionGroup sortableSelector = new OptionGroup("Sortable columns",
+                sortableContainerPropertyIds);
         sortableSelector.setMultiSelect(true);
         sortableSelector.setValue(sortableContainerPropertyIds);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index 202fa97c8b..92250090f5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
@@ -11,8 +11,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Table;
 
-public class TableAndBrowserContextMenu extends TestBase implements
-        Action.Handler, ItemClickListener {
+public class TableAndBrowserContextMenu extends TestBase
+        implements Action.Handler, ItemClickListener {
 
     private Table table;
     private boolean actionHandlerHasActions = false;
@@ -41,7 +41,8 @@ public class TableAndBrowserContextMenu extends TestBase implements
         });
         addComponent(cbActionHandler);
 
-        CheckBox cbActionHasActions = new CheckBox("Action handler has actions");
+        CheckBox cbActionHasActions = new CheckBox(
+                "Action handler has actions");
         cbActionHasActions.setImmediate(true);
         cbActionHasActions.addValueChangeListener(event -> {
             actionHandlerHasActions = event.getValue();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
index d95b406c1a..a3d0d4ab29 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
@@ -134,8 +134,8 @@ public class TableBlurFocus extends AbstractTestUIWithLog {
                     Notification.show("Clicked!");
                 }
             });
-            table.addItem(new Object[] { "entryString" + x, buttonLabel,
-                    button, " " }, "entryID" + x);
+            table.addItem(new Object[] { "entryString" + x, buttonLabel, button,
+                    " " }, "entryID" + x);
         }
         return table;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index ec954b1a78..3a1795c4f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -61,8 +61,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
                     Object columnId) {
                 Item item = source.getItem(itemId);
                 LegacyTextField textfield = new LegacyTextField();
-                textfield.setValue(String.valueOf(item.getItemProperty("foo")
-                        .getValue()));
+                textfield.setValue(
+                        String.valueOf(item.getItemProperty("foo").getValue()));
                 return textfield;
             }
         });
@@ -75,8 +75,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
                     Object columnId) {
                 Item item = source.getItem(itemId);
                 LegacyTextField textfield = new LegacyTextField();
-                textfield.setValue(String.valueOf(item.getItemProperty("foo")
-                        .getValue()));
+                textfield.setValue(
+                        String.valueOf(item.getItemProperty("foo").getValue()));
                 textfield.setReadOnly(true);
                 return textfield;
             }
@@ -88,8 +88,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
             @Override
             public Component generateCell(Table source, Object itemId,
                     Object columnId) {
-                Embedded embedded = new Embedded(null, new ThemeResource(
-                        "../runo/icons/16/ok.png"));
+                Embedded embedded = new Embedded(null,
+                        new ThemeResource("../runo/icons/16/ok.png"));
                 return embedded;
             }
         });
@@ -134,8 +134,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
         }
         item.getItemProperty("foo").setValue("foo " + itemId);
         item.getItemProperty("red").setValue("red " + itemId);
-        item.getItemProperty("icon").setValue(
-                new ThemeResource("../runo/icons/16/ok.png"));
+        item.getItemProperty("icon")
+                .setValue(new ThemeResource("../runo/icons/16/ok.png"));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index 6fa86543cb..f50a5c6a04 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
@@ -73,8 +73,8 @@ public class TableClickValueChangeInteraction extends TestBase {
 
                 @Override
                 public void valueChange(ValueChangeEvent event) {
-                    valueChangeLabel.setValue("Value "
-                            + event.getProperty().getValue());
+                    valueChangeLabel.setValue(
+                            "Value " + event.getProperty().getValue());
                 }
             });
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
index 40751047b1..cebc15432b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
@@ -27,15 +27,11 @@ public class TableColumnAddAndResize extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        String people[][] = {
-                { "Galileo", "Liked to go around the Sun" },
+        String people[][] = { { "Galileo", "Liked to go around the Sun" },
                 { "Monnier", "Liked star charts" },
-                { "VÀisÀlÀ", "Liked optics" },
-                { "Oterma", "Liked comets" },
-                {
-                        "Valtaoja",
-                        "Likes cosmology and still "
-                                + "lives unlike the others above" }, };
+                { "VÀisÀlÀ", "Liked optics" }, { "Oterma", "Liked comets" },
+                { "Valtaoja", "Likes cosmology and still "
+                        + "lives unlike the others above" }, };
 
         VerticalLayout content = new VerticalLayout();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
index 9416ffe70c..1cfb28c793 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
@@ -17,7 +17,8 @@ public class TableContextMenu extends TestBase {
 
         table.addActionHandler(new Action.Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("Done that :-)");
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
index 8f98cdbffb..eb496c2438 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
@@ -23,7 +23,8 @@ public class TableContextMenuOnField extends TestBase {
 
         table.addActionHandler(new Action.Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 // TODO Auto-generated method stub
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
index 9415318054..4c04cee540 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
@@ -28,7 +28,8 @@ public class TableContextMenuTouch extends AbstractTestUI {
 
         table.addActionHandler(new Action.Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("Done that :-)");
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
index ccf521c500..00f3bb3463 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
@@ -42,8 +42,8 @@ public class TableExtraScrollbars extends AbstractTestCase {
         for (int i = 0; i < ROWS; ++i) {
             Item item = container.addItem(i);
             for (int p = 0; p < PROPS; ++p) {
-                item.getItemProperty("prop" + p).setValue(
-                        "property value 1234567890");
+                item.getItemProperty("prop" + p)
+                        .setValue("property value 1234567890");
             }
         }
         return container;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index 3b3c789232..af1acb7d89 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
@@ -34,7 +34,8 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase {
             if (event.getValue()) {
                 // table body height is now 77px, which together
                 // with header makes 100px
-                table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
+                table.setColumnHeaderMode(
+                        Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
             } else {
                 table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
                 // header disappears, but table body height stays at
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
index 1515589b4c..e5adaaf4c2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
@@ -41,8 +41,8 @@ public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI {
         Item item = table.addItem("Item 1 (row 1)");
         item.getItemProperty("Column 1").setValue("String A");
         item.getItemProperty("Column 2").setValue(new Label("Label A"));
-        item.getItemProperty("Column 3").setValue(
-                new Label("<b>Label A</b>", ContentMode.HTML));
+        item.getItemProperty("Column 3")
+                .setValue(new Label("<b>Label A</b>", ContentMode.HTML));
         VerticalLayout l = new VerticalLayout();
         l.setId("row-1");
         l.setHeight(100, Unit.PIXELS);
@@ -52,10 +52,9 @@ public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI {
         item.getItemProperty("Column 1").setValue("String B");
         item.getItemProperty("Column 2").setValue(new Label("Label B"));
         item.getItemProperty("Column 3")
-                .setValue(
-                        new Label(
-                                "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>",
-                                ContentMode.HTML));
+                .setValue(new Label(
+                        "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>",
+                        ContentMode.HTML));
         l = new VerticalLayout();
         l.setId("row-2");
         l.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
index 8f6e6c685f..1033d01c12 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
@@ -72,9 +72,8 @@ public class TableMoveFocusWithSelection extends AbstractTestUI {
         addComponent(t);
 
         // Select mode
-        Button toggleSelectMode = new Button(
-                t.isMultiSelect() ? "Press to use single select"
-                        : "Press to use multi select");
+        Button toggleSelectMode = new Button(t.isMultiSelect()
+                ? "Press to use single select" : "Press to use multi select");
         toggleSelectMode.setId("toggle-mode");
         toggleSelectMode.addClickListener(new ClickListener() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index d6a79759ac..58506e83a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
@@ -30,8 +30,8 @@ public class TableMultiSelectSimple extends TestBase {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                TreeSet<?> sorted = new TreeSet<Object>((Set<?>) event
-                        .getProperty().getValue());
+                TreeSet<?> sorted = new TreeSet<Object>(
+                        (Set<?>) event.getProperty().getValue());
                 log.log("Selected value: " + sorted);
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
index 9aeb25002d..611ebc792e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
@@ -37,8 +37,8 @@ public class TableParentEnabledStateChange extends AbstractTestUIWithLog {
 
         final MyCustomComponent customComponent = new MyCustomComponent();
 
-        toggle = new Button("Toggle enabled state ; "
-                + customComponent.isEnabled());
+        toggle = new Button(
+                "Toggle enabled state ; " + customComponent.isEnabled());
         toggle.addClickListener(new Button.ClickListener() {
 
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
index 30db12371d..a7012976c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
@@ -73,8 +73,8 @@ public class TableReduceContainerSize extends TestBase {
                         label.setValue("Index: "
                                 + table.getCurrentPageFirstItemIndex());
                     } catch (Exception e) {
-                        label.setValue("Exception: "
-                                + e.getClass().getSimpleName());
+                        label.setValue(
+                                "Exception: " + e.getClass().getSimpleName());
                     }
                 }
             });
@@ -95,8 +95,8 @@ public class TableReduceContainerSize extends TestBase {
                         label.setValue("Index: "
                                 + table.getCurrentPageFirstItemIndex());
                     } catch (Exception e) {
-                        label.setValue("Exception: "
-                                + e.getClass().getSimpleName());
+                        label.setValue(
+                                "Exception: " + e.getClass().getSimpleName());
                     }
                 }
             });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
index 710a4f8fe3..f3edec8cd2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
@@ -129,7 +129,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI {
         }
 
         @Override
-        public void setDiffState(ClientConnector connector, JsonObject diffState) {
+        public void setDiffState(ClientConnector connector,
+                JsonObject diffState) {
             tracker.setDiffState(connector, diffState);
         }
 
@@ -161,7 +162,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI {
         }
 
         @Override
-        public void cleanStreamVariable(String connectorId, String variableName) {
+        public void cleanStreamVariable(String connectorId,
+                String variableName) {
             tracker.cleanStreamVariable(connectorId, variableName);
         }
 
@@ -185,7 +187,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI {
         @Override
         public void cleanConcurrentlyRemovedConnectorIds(
                 int lastSyncIdSeenByClient) {
-            tracker.cleanConcurrentlyRemovedConnectorIds(lastSyncIdSeenByClient);
+            tracker.cleanConcurrentlyRemovedConnectorIds(
+                    lastSyncIdSeenByClient);
         }
 
         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
index bee0839663..865d9b3576 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
@@ -17,7 +17,8 @@ import com.vaadin.ui.Table;
  * 
  * @author Vaadin Ltd
  */
-public class TableRepairsScrollPositionOnReAddingAllRows extends AbstractTestUI {
+public class TableRepairsScrollPositionOnReAddingAllRows
+        extends AbstractTestUI {
 
     private static final long serialVersionUID = 1L;
 
@@ -50,8 +51,8 @@ public class TableRepairsScrollPositionOnReAddingAllRows extends AbstractTestUI
 
             @Override
             public void buttonClick(com.vaadin.ui.Button.ClickEvent event) {
-                List<TableItem> originalItemIds = new ArrayList<TableItem>(cont
-                        .getItemIds());
+                List<TableItem> originalItemIds = new ArrayList<TableItem>(
+                        cont.getItemIds());
                 cont.removeAllItems();
                 cont.addAll(originalItemIds);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
index 5c733b9e24..c612af6194 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
@@ -46,7 +46,8 @@ public class TableRowHeight2 extends AbstractTestUI {
             b.setStyleName(BaseTheme.BUTTON_LINK);
             b.addStyleName("nowraplink");
 
-            b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero.");
+            b.setCaption(
+                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero.");
 
             item.getItemProperty("title").setValue(b);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
index c31b87f9da..5acc9713f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
@@ -40,7 +40,8 @@ public class TableRowHeight3 extends TestBase {
             b.setStyleName(BaseTheme.BUTTON_LINK);
             b.addStyleName("nowraplink");
             if (i < 2) {
-                b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero.");
+                b.setCaption(
+                        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero.");
             } else if (2 <= i && i < 4) {
                 b.setCaption("One line");
             } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
index e1fe4d0514..0574a1de6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
@@ -28,10 +28,12 @@ public class TableRowScrolledBottom extends AbstractTestUI {
             public void buttonClick(Button.ClickEvent event) {
                 for (int j = 0; j < 100; j++) {
                     ++i;
-                    table.addItem(new Object[] { new Label(part1 + "<b>" + i
-                            + "</b>" + part2, ContentMode.HTML) }, i);
-                    table.setCurrentPageFirstItemIndex(table
-                            .getContainerDataSource().size() - 1);
+                    table.addItem(new Object[] {
+                            new Label(part1 + "<b>" + i + "</b>" + part2,
+                                    ContentMode.HTML) },
+                            i);
+                    table.setCurrentPageFirstItemIndex(
+                            table.getContainerDataSource().size() - 1);
                 }
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
index d1d6edaa67..b352c68989 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
@@ -114,8 +114,8 @@ public class TableScrollAfterAddRow extends AbstractTestUI {
                 new NativeButton.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        label.setValue(Integer.toString(table
-                                .getCurrentPageFirstItemIndex()));
+                        label.setValue(Integer.toString(
+                                table.getCurrentPageFirstItemIndex()));
                     }
                 });
         layout.addComponent(addRowButton);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
index 61f8952041..29fd306aca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
@@ -44,8 +44,8 @@ public class TableScrollingWithSQLContainer extends UI {
             // Will fail if table doesn't exist, which is OK.
             conn.rollback();
         }
-        statement
-                .execute("create table people (id integer generated always as identity,"
+        statement.execute(
+                "create table people (id integer generated always as identity,"
                         + " name varchar(32), AGE INTEGER)");
         statement.execute("alter table people add primary key (id)");
         for (int i = 0; i < 5000; i++) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
index d97e0a5cef..e9ddd2d20e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
@@ -21,9 +21,10 @@ public class TableSelectPagingOff extends TestBase {
     }
 
     private Collection<MyBean> getBeans() {
-        return Arrays.asList(new MyBean("a", "description a"), new MyBean("b",
-                "description b"), new MyBean("c", "description c"), new MyBean(
-                "d", "description d"));
+        return Arrays.asList(new MyBean("a", "description a"),
+                new MyBean("b", "description b"),
+                new MyBean("c", "description c"),
+                new MyBean("d", "description d"));
     }
 
     public class MyBean {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
index e355c0d0ea..7a857995df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
@@ -36,22 +36,22 @@ public class TableSetUndefinedSize extends AbstractTestUI {
     private HorizontalLayout createWidthButtons(final Table table) {
         HorizontalLayout layout = new HorizontalLayout();
 
-        layout.addComponent(new Button("width 500px",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("width 500px", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setWidth("500px");
                     }
                 }));
-        layout.addComponent(new Button("width 100%",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("width 100%", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setWidth("100%");
                     }
                 }));
-        layout.addComponent(new Button("undefined width",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("undefined width", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setWidthUndefined();
@@ -64,29 +64,29 @@ public class TableSetUndefinedSize extends AbstractTestUI {
     private HorizontalLayout createHeigthButtons(final Table table) {
         HorizontalLayout layout = new HorizontalLayout();
 
-        layout.addComponent(new Button("height 200px",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("height 200px", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setHeight("200px");
                     }
                 }));
-        layout.addComponent(new Button("height 300px",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("height 300px", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setHeight("300px");
                     }
                 }));
-        layout.addComponent(new Button("height 100%",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("height 100%", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setHeight("100%");
                     }
                 }));
-        layout.addComponent(new Button("undefined height",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("undefined height", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         table.setHeightUndefined();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 74de327b19..5fdb4af257 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
@@ -12,7 +12,8 @@ public class TableShouldNotEatValueChanges extends TestBase {
 
     @Override
     protected void setup() {
-        Table t = new Table("Table with multiselection and item click listener");
+        Table t = new Table(
+                "Table with multiselection and item click listener");
         t.focus();
         t.setPageLength(3);
         t.addContainerProperty("foo", String.class, "bar");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
index 85819784c0..48b98987ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
@@ -34,8 +34,8 @@ public class TableSorting extends TestBase {
         testTable.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                System.out.println("ValueChanged: "
-                        + testTable.getValue().toString());
+                System.out.println(
+                        "ValueChanged: " + testTable.getValue().toString());
                 showID.setCaption("ID: " + testTable.getValue().toString());
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
index a0738de8a4..ba78372e29 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
@@ -58,8 +58,8 @@ public class TableSqlContainer extends AbstractTestUI {
         table.addValueChangeListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                selectedLabel.setValue("Selected: "
-                        + event.getProperty().getValue());
+                selectedLabel.setValue(
+                        "Selected: " + event.getProperty().getValue());
             }
         });
 
@@ -108,14 +108,14 @@ public class TableSqlContainer extends AbstractTestUI {
             conn = connectionPool.reserveConnection();
             Statement statement = conn.createStatement();
 
-            statement
-                    .executeUpdate("INSERT INTO mytable VALUES(1, '2013-05-24', 'A0')");
-            statement
-                    .executeUpdate("INSERT INTO mytable VALUES(2, '2013-04-26', 'A1')");
-            statement
-                    .executeUpdate("INSERT INTO mytable VALUES(3, '2013-05-27', 'B0')");
-            statement
-                    .executeUpdate("INSERT INTO mytable VALUES(4, '2013-04-28', 'B1')");
+            statement.executeUpdate(
+                    "INSERT INTO mytable VALUES(1, '2013-05-24', 'A0')");
+            statement.executeUpdate(
+                    "INSERT INTO mytable VALUES(2, '2013-04-26', 'A1')");
+            statement.executeUpdate(
+                    "INSERT INTO mytable VALUES(3, '2013-05-27', 'B0')");
+            statement.executeUpdate(
+                    "INSERT INTO mytable VALUES(4, '2013-04-28', 'B1')");
 
             statement.close();
             conn.commit();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
index 442f00f346..6dfdd84768 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
@@ -58,7 +58,8 @@ public class TableToggleColumnVisibilityWidth extends AbstractTestUI {
                 if (detailed) {
                     table.setVisibleColumns(new Object[] { "Name" });
                 } else {
-                    table.setVisibleColumns(new Object[] { "Name", "Last Name" });
+                    table.setVisibleColumns(
+                            new Object[] { "Name", "Last Name" });
                 }
                 detailed = !detailed;
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
index f89d2d2934..856d9e04fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
@@ -148,9 +148,9 @@ public class TableToggleVisibility extends AbstractTestCase {
                     ToggleButton.this.table.setVisible(!wasVisible);
                     setCaption((wasVisible ? "+ " : "- ")
                             + ToggleButton.this.table.getCaption());
-                    setDescription((wasVisible ? "Show " : "Hide ")
-                            + "the list with "
-                            + ToggleButton.this.table.getCaption());
+                    setDescription(
+                            (wasVisible ? "Show " : "Hide ") + "the list with "
+                                    + ToggleButton.this.table.getCaption());
 
                 }
             });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
index 7705d52cb1..ec6b58fbac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
@@ -36,8 +36,8 @@ public class TableUndefinedSize extends TestBase {
 
         log = new Log(5);
 
-        controls.addComponent(new Button("Fixed size (200x200)",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Fixed size (200x200)", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         tbl.setWidth("200px");
@@ -46,8 +46,8 @@ public class TableUndefinedSize extends TestBase {
                     }
                 }));
 
-        controls.addComponent(new Button("Fixed size (600x200)",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Fixed size (600x200)", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         tbl.setWidth("600px");
@@ -56,8 +56,8 @@ public class TableUndefinedSize extends TestBase {
                     }
                 }));
 
-        controls.addComponent(new Button("Undefined size",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Undefined size", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         tbl.setSizeUndefined();
@@ -65,15 +65,15 @@ public class TableUndefinedSize extends TestBase {
                     }
                 }));
 
-        NativeSelect pageLength = new NativeSelect("PageLength", Arrays.asList(
-                0, 1, 2, 4, 8, 10));
+        NativeSelect pageLength = new NativeSelect("PageLength",
+                Arrays.asList(0, 1, 2, 4, 8, 10));
         pageLength.setImmediate(true);
         pageLength.setNullSelectionAllowed(false);
         pageLength.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                int pageLength = Integer.valueOf(event.getProperty().getValue()
-                        .toString());
+                int pageLength = Integer
+                        .valueOf(event.getProperty().getValue().toString());
                 tbl.setPageLength(pageLength);
                 log.log("Page length: " + pageLength);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 2ac9f67402..ebb5f16372 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
@@ -30,7 +30,8 @@ public class TableUnregisterComponent extends TestBase {
         container.addContainerProperty(COL_B, String.class, "");
 
         Item it = container.addItem("a");
-        final ObjectProperty<String> valA = new ObjectProperty<String>("orgVal");
+        final ObjectProperty<String> valA = new ObjectProperty<String>(
+                "orgVal");
         final LegacyTextField fieldA = new LegacyTextField(valA) {
             @Override
             public void setPropertyDataSource(Property newDataSource) {
@@ -49,12 +50,13 @@ public class TableUnregisterComponent extends TestBase {
         table.setColumnCollapsingAllowed(true);
         table.setTableFieldFactory(new DefaultFieldFactory() {
             @Override
-            public LegacyField<?> createField(Container container, Object itemId,
-                    Object propertyId, Component uiContext) {
+            public LegacyField<?> createField(Container container,
+                    Object itemId, Object propertyId, Component uiContext) {
                 if (COL_B.equals(propertyId)) {
                     LegacyField<String> field = new LegacyTextField() {
                         @Override
-                        public void setPropertyDataSource(Property newDataSource) {
+                        public void setPropertyDataSource(
+                                Property newDataSource) {
                             super.setPropertyDataSource(newDataSource);
                             if (newDataSource == null) {
                                 log.log("Edit field property data source cleared");
@@ -78,7 +80,8 @@ public class TableUnregisterComponent extends TestBase {
         addComponent(new Button("Switch column collapse", new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.setColumnCollapsed(COL_A, !table.isColumnCollapsed(COL_A));
+                table.setColumnCollapsed(COL_A,
+                        !table.isColumnCollapsed(COL_A));
             }
         }));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
index bd84fab309..5b3c756d4f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
@@ -55,8 +55,7 @@ public class TableWidthItemRemove extends AbstractTestUI {
         addButton("Populate", new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.addItem(
-                        new Object[] { "John", "Doe", new Integer(1980) },
+                table.addItem(new Object[] { "John", "Doe", new Integer(1980) },
                         Math.random() * 1000);
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
index ad34d50208..56bdbc2704 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
@@ -77,11 +77,12 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase {
         }
 
         @Override
-        public Object generateCell(Table source, Object itemId, Object columnId) {
+        public Object generateCell(Table source, Object itemId,
+                Object columnId) {
             if (counter++ % brokenInterval == 0
                     && Boolean.TRUE.equals(brokenGenerator.getValue())) {
-                throw new IllegalArgumentException("Broken generator for "
-                        + itemId + "/" + columnId);
+                throw new IllegalArgumentException(
+                        "Broken generator for " + itemId + "/" + columnId);
             } else {
                 return "Generated " + itemId + "/" + columnId;
             }
@@ -136,9 +137,9 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase {
                                     Table table = ((CacheUpdateException) t)
                                             .getTable();
                                     table.removeAllItems();
-                                    Notification
-                                            .show("Problem updating table. Please try again later",
-                                                    Notification.Type.ERROR_MESSAGE);
+                                    Notification.show(
+                                            "Problem updating table. Please try again later",
+                                            Notification.Type.ERROR_MESSAGE);
                                 }
                             }
                         }
@@ -158,8 +159,8 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase {
         for (int i = 1; i <= rows; i++) {
             Item item = container.addItem("item" + i);
             for (int j = 1; j <= cols; j++) {
-                item.getItemProperty("prop" + j).setValue(
-                        "item" + i + "/prop" + j);
+                item.getItemProperty("prop" + j)
+                        .setValue("item" + i + "/prop" + j);
             }
         }
         return container;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
index 7eb9c3239c..cfec94e6c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
@@ -11,7 +11,8 @@ import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnGenerator;
 
-public class TableWithChildComponents extends TestBase implements ClickListener {
+public class TableWithChildComponents extends TestBase
+        implements ClickListener {
 
     private static final String COL2 = "Column 2 - generated";
     private static final String COL1 = "Column 1 - components";
@@ -30,16 +31,15 @@ public class TableWithChildComponents extends TestBase implements ClickListener
             @Override
             public Object generateCell(Table source, Object itemId,
                     Object columnId) {
-                return new Button(
-                        "Item id: " + itemId + " column: " + columnId,
+                return new Button("Item id: " + itemId + " column: " + columnId,
                         TableWithChildComponents.this);
             }
         });
 
         for (int i = 0; i < 100; i++) {
             Item item = table.addItem("Row " + i);
-            item.getItemProperty(COL1).setValue(
-                    new NativeButton("Row " + i + " native", this));
+            item.getItemProperty(COL1)
+                    .setValue(new NativeButton("Row " + i + " native", this));
         }
 
         addComponent(table);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 4ca83b22bd..3d2ead9fe9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
@@ -18,19 +18,22 @@ public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI {
     private MyEntityContainer container = new MyEntityContainer();
     private Log log = new Log(10);
 
-    public static class MyEntityContainer extends BeanContainer<Long, MyEntity> {
+    public static class MyEntityContainer
+            extends BeanContainer<Long, MyEntity> {
 
         public MyEntityContainer() {
             super(MyEntity.class);
-            setBeanIdResolver(new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() {
-
-                @Override
-                public Long getIdForBean(MyEntity bean) {
-                    // Return a new instance every time to ensure Table can
-                    // handle it
-                    return new Long(bean.getId());
-                }
-            });
+            setBeanIdResolver(
+                    new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() {
+
+                        @Override
+                        public Long getIdForBean(MyEntity bean) {
+                            // Return a new instance every time to ensure Table
+                            // can
+                            // handle it
+                            return new Long(bean.getId());
+                        }
+                    });
 
         }
 
@@ -66,14 +69,15 @@ public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI {
 
         for (int i = 0; i < 1000; i++) {
             MyEntity myEntity = new MyEntity(i + "st");
-            myEntity.setCreated(new Date(new Date().getTime() - 24 * 60 * 60
-                    * 1000L));
+            myEntity.setCreated(
+                    new Date(new Date().getTime() - 24 * 60 * 60 * 1000L));
             myEntity.setId(i);
             container.addBean(myEntity);
         }
 
         t.setContainerDataSource(container);
-        t.setVisibleColumns(new Object[] { "id", "created", "name", "Actions" });
+        t.setVisibleColumns(
+                new Object[] { "id", "created", "name", "Actions" });
 
         addComponent(t);
         addComponent(log);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
index b7d965a91f..7ca9d1b236 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.Table;
 
 public class TableWithCustomConverterFactory extends AbstractTestUI {
 
-    public static class MyIntegerConverter implements
-            LegacyConverter<String, Integer> {
+    public static class MyIntegerConverter
+            implements LegacyConverter<String, Integer> {
 
         @Override
         public Integer convertToModel(String value,
@@ -55,9 +55,11 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
 
     }
 
-    public static class MyConverterFactory extends LegacyDefaultConverterFactory {
+    public static class MyConverterFactory
+            extends LegacyDefaultConverterFactory {
         @Override
-        protected LegacyConverter<String, ?> createStringConverter(Class<?> sourceType) {
+        protected LegacyConverter<String, ?> createStringConverter(
+                Class<?> sourceType) {
             if (Integer.class.isAssignableFrom(sourceType)) {
                 return new MyIntegerConverter();
             } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
index 226fde3b29..6cd5995296 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
@@ -21,9 +21,10 @@ public class TableWithNoncollapsibleColumns extends TestBase {
 
         table.addContainerProperty("Column 1 - noncollapsible", String.class,
                 null);
-        table.addContainerProperty("Column 2 - collapsible", String.class, null);
-        table.addContainerProperty("Column 3 - toggle collapsing",
-                String.class, null);
+        table.addContainerProperty("Column 2 - collapsible", String.class,
+                null);
+        table.addContainerProperty("Column 3 - toggle collapsing", String.class,
+                null);
 
         table.setColumnCollapsible("Column 1 - noncollapsible", false);
         layout.addComponent(table);
@@ -32,18 +33,18 @@ public class TableWithNoncollapsibleColumns extends TestBase {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        table.setColumnCollapsed(
-                                "Column 1 - noncollapsible",
-                                !table.isColumnCollapsed("Column 1 - noncollapsible"));
+                        table.setColumnCollapsed("Column 1 - noncollapsible",
+                                !table.isColumnCollapsed(
+                                        "Column 1 - noncollapsible"));
                     }
                 });
         final Button button2 = new Button("Column 2: collapse/show",
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        table.setColumnCollapsed(
-                                "Column 2 - collapsible",
-                                !table.isColumnCollapsed("Column 2 - collapsible"));
+                        table.setColumnCollapsed("Column 2 - collapsible",
+                                !table.isColumnCollapsed(
+                                        "Column 2 - collapsible"));
                     }
                 });
 
@@ -51,9 +52,9 @@ public class TableWithNoncollapsibleColumns extends TestBase {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        table.setColumnCollapsed(
-                                "Column 3 - toggle collapsing",
-                                !table.isColumnCollapsed("Column 3 - toggle collapsing"));
+                        table.setColumnCollapsed("Column 3 - toggle collapsing",
+                                !table.isColumnCollapsed(
+                                        "Column 3 - toggle collapsing"));
                     }
                 });
         final Button button4 = new Button(
@@ -63,7 +64,8 @@ public class TableWithNoncollapsibleColumns extends TestBase {
                     public void buttonClick(ClickEvent event) {
                         table.setColumnCollapsible(
                                 "Column 3 - toggle collapsing",
-                                !table.isColumnCollapsible("Column 3 - toggle collapsing"));
+                                !table.isColumnCollapsible(
+                                        "Column 3 - toggle collapsing"));
                     }
                 });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
index fdd5c2901a..55e86f49d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
@@ -40,8 +40,9 @@ public class TableWithPolling extends AbstractTestUI {
         table.addContainerProperty("Last Name", String.class, null);
         table.addContainerProperty("Year", Integer.class, null);
 
-        table.addItem(new Object[] { "Nicolaus", "Copernicus",
-                new Integer(1473) }, new Integer(1));
+        table.addItem(
+                new Object[] { "Nicolaus", "Copernicus", new Integer(1473) },
+                new Integer(1));
         table.addItem(new Object[] { "Tycho", "Brahe", new Integer(1546) },
                 new Integer(2));
         table.addItem(new Object[] { "Giordano", "Bruno", new Integer(1548) },
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
index e82cb8321f..f6dfc6de4b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
@@ -59,8 +59,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
     private Command<T, Boolean> columnVisibleCommand = new Command<T, Boolean>() {
         @Override
         public void execute(Table c, Boolean visible, Object propertyId) {
-            List<Object> visibleColumns = new ArrayList<Object>(Arrays.asList(c
-                    .getVisibleColumns()));
+            List<Object> visibleColumns = new ArrayList<Object>(
+                    Arrays.asList(c.getVisibleColumns()));
             if (visible) {
                 // Table should really check this... Completely fails without
                 // the check (#
@@ -205,7 +205,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
     private Command<T, ColumnHeaderMode> columnHeaderModeCommand = new Command<T, ColumnHeaderMode>() {
 
         @Override
-        public void execute(T c, ColumnHeaderMode columnHeaderMode, Object data) {
+        public void execute(T c, ColumnHeaderMode columnHeaderMode,
+                Object data) {
             c.setColumnHeaderMode(columnHeaderMode);
 
         }
@@ -246,8 +247,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
 
         @Override
         public void execute(T c, final GeneratedColumn col, Object data) {
-            while (c.getColumnGenerator(generatedColumnId
-                    + generatedColumnNextNr) != null) {
+            while (c.getColumnGenerator(
+                    generatedColumnId + generatedColumnNextNr) != null) {
                 generatedColumnNextNr++;
             }
 
@@ -314,7 +315,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
         private final Object itemId;
         private final Object propertyId;
 
-        public CellStyleInfo(String styleName, Object itemId, Object propertyId) {
+        public CellStyleInfo(String styleName, Object itemId,
+                Object propertyId) {
             this.styleName = styleName;
             this.itemId = itemId;
             this.propertyId = propertyId;
@@ -322,15 +324,17 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
 
         public boolean appliesTo(Object itemId, Object propertyId) {
             return (this.itemId != null && this.itemId.equals(itemId))
-                    && (this.propertyId == propertyId || (this.propertyId != null && this.propertyId
-                            .equals(propertyId)));
+                    && (this.propertyId == propertyId
+                            || (this.propertyId != null
+                                    && this.propertyId.equals(propertyId)));
         }
     }
 
     private Command<T, CellStyleInfo> cellStyleCommand = new Command<T, CellStyleInfo>() {
 
         @Override
-        public void execute(T c, final CellStyleInfo cellStyleInfo, Object data) {
+        public void execute(T c, final CellStyleInfo cellStyleInfo,
+                Object data) {
             if (cellStyleInfo == null) {
                 c.setCellStyleGenerator(null);
             } else {
@@ -384,12 +388,13 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                 c.setRowGenerator(new RowGenerator() {
 
                     @Override
-                    public GeneratedRow generateRow(Table table, Object itemId) {
+                    public GeneratedRow generateRow(Table table,
+                            Object itemId) {
                         if (generatedRowInfo.appliesTo(itemId)) {
                             GeneratedRow generatedRow = new GeneratedRow(
                                     generatedRowInfo.text);
-                            generatedRow
-                                    .setHtmlContentAllowed(generatedRowInfo.isHtml);
+                            generatedRow.setHtmlContentAllowed(
+                                    generatedRowInfo.isHtml);
                             return generatedRow;
                         }
                         return null;
@@ -455,34 +460,34 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
         createClickAction("Add Button", category, addGeneratedColumnCommand,
                 new GeneratedColumn(Button.class, null, false));
         createClickAction("Add 200px wide Button", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Button.class,
-                        "200px", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Button.class, "200px", false));
         createClickAction("Add 100% wide Button", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Button.class,
-                        "100%", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Button.class, "100%", false));
         createClickAction("Add Label", category, addGeneratedColumnCommand,
                 new GeneratedColumn(Label.class, null, false));
         createClickAction("Add 100px Label", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Label.class,
-                        "100px", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Label.class, "100px", false));
         createClickAction("Add 100% wide Label", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Label.class,
-                        "100%", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Label.class, "100%", false));
 
         createClickAction("Remove generated columns", category,
                 removeGeneratedColumnsCommand, null);
         createClickAction("Add string as generated column", category,
-                addGeneratedColumnCommand, new GeneratedColumn(String.class,
-                        "", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(String.class, "", false));
         createClickAction("Add HTML string as generated column", category,
-                addGeneratedColumnCommand, new GeneratedColumn(String.class,
-                        "", true));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(String.class, "", true));
         createClickAction("Add 100px HTML Label", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Label.class,
-                        "100px", true));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Label.class, "100px", true));
         createClickAction("Add Object as generated column", category,
-                addGeneratedColumnCommand, new GeneratedColumn(Object.class,
-                        "", false));
+                addGeneratedColumnCommand,
+                new GeneratedColumn(Object.class, "", false));
     }
 
     private void createCellStyleAction(String categoryFeatures) {
@@ -506,14 +511,13 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
         for (int ix = 0; ix < props; ix++) {
             text[ix] = "foo" + ix;
         }
-        options.put("Every tenth row, no spanning", new GeneratedRowInfo(10,
-                false, text));
-        options.put(
-                "Every eight row, spanned, html formatted",
+        options.put("Every tenth row, no spanning",
+                new GeneratedRowInfo(10, false, text));
+        options.put("Every eight row, spanned, html formatted",
                 new GeneratedRowInfo(8, true,
                         "<b>foo</b> <i>bar</i> <span style='color:red;text-size:0.5em;'>baz</span>"));
-        options.put("Every row, spanned", new GeneratedRowInfo(1, false,
-                "spanned"));
+        options.put("Every row, spanned",
+                new GeneratedRowInfo(1, false, "spanned"));
         createSelectAction("Row generator", categoryFeatures, options, "None",
                 rowGeneratorCommand, true);
     }
@@ -549,8 +553,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
         cm.addItem("Caption only", null);
         cm.addItem("Has icon", ICON_16_USER_PNG_UNCACHEABLE);
         options.put("With and without icon", cm);
-        options.put("Only one large icon", new ContextMenu("Icon",
-                ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE));
+        options.put("Only one large icon",
+                new ContextMenu("Icon", ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE));
         options.put("Empty", new ContextMenu() {
             @Override
             public Action[] getActions(Object target, Object sender) {
@@ -752,10 +756,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                                     && nr % 2 == 0) {
                                 c.setColumnHeader(propertyId, null);
                             } else if (value != null) {
-                                c.setColumnHeader(
-                                        propertyId,
-                                        value.replace("{id}",
-                                                propertyId.toString()));
+                                c.setColumnHeader(propertyId, value.replace(
+                                        "{id}", propertyId.toString()));
                             } else {
                                 c.setColumnHeader(propertyId, null);
                             }
@@ -812,7 +814,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                 "Explicit defaults id", new Command<T, ColumnHeaderMode>() {
 
                     @Override
-                    public void execute(T c, ColumnHeaderMode value, Object data) {
+                    public void execute(T c, ColumnHeaderMode value,
+                            Object data) {
                         c.setColumnHeaderMode(value);
 
                     }
@@ -852,7 +855,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                 "Multi - ctrl/shift", new Command<T, SelectMode>() {
 
                     @Override
-                    public void execute(Table t, SelectMode value, Object data) {
+                    public void execute(Table t, SelectMode value,
+                            Object data) {
                         switch (value) {
                         case NONE:
                             t.setSelectable(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
index 193cb499a7..72f96b4172 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
@@ -104,7 +104,8 @@ public class TabletContextMenu extends AbstractTestUI {
                     ShortcutAction.KeyCode.DELETE, null);
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 System.out.println(action.getCaption());
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index 8244835df7..3891fb8212 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
@@ -10,7 +10,8 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
 
-public class TestCurrentPageFirstItem extends TestBase implements ClickListener {
+public class TestCurrentPageFirstItem extends TestBase
+        implements ClickListener {
 
     private Button buttonIndex;
     private Button buttonItem;
@@ -56,8 +57,9 @@ public class TestCurrentPageFirstItem extends TestBase implements ClickListener
             Table t = tables[i];
             t.select(counter);
             if (event.getButton() == buttonIndex) {
-                t.setCurrentPageFirstItemIndex(((Container.Indexed) t
-                        .getContainerDataSource()).indexOfId(counter));
+                t.setCurrentPageFirstItemIndex(
+                        ((Container.Indexed) t.getContainerDataSource())
+                                .indexOfId(counter));
             } else {
                 t.setCurrentPageFirstItemId(counter);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
index 58abce830b..d21a09838a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
@@ -47,8 +47,8 @@ public class ValueAfterClearingContainer extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         if (!table.getItemIds().isEmpty()) {
-                            Notification
-                                    .show("Only possible when the table is empty");
+                            Notification.show(
+                                    "Only possible when the table is empty");
                             return;
                         } else {
                             for (int i = 0; i < 5; i++) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
index 3e132c583b..3d32cadb0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
@@ -25,8 +25,8 @@ public class FirstTabNotVisibleInTabsheet extends AbstractTestUI {
             tabSheet.addTab(new Label("visible tab " + i), "visible tab " + i);
         }
 
-        addComponent(new VerticalLayout(tabSheet, new Button(
-                "Toggle first tab", new Button.ClickListener() {
+        addComponent(new VerticalLayout(tabSheet,
+                new Button("Toggle first tab", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent event) {
                         firstTab.setVisible(!firstTab.isVisible());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java
index fddb036728..6a3d308733 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 
-public class PreventTabChange extends TestBase implements
-        SelectedTabChangeListener {
+public class PreventTabChange extends TestBase
+        implements SelectedTabChangeListener {
 
     private TabSheet tabSheet;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java
index accd77ae0e..d7a69b50f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java
@@ -82,9 +82,8 @@ public class TabBarWidth extends AbstractTestUI {
                     String originalWidth = (String) ((TabSheet) component)
                             .getData();
                     component.setWidth(originalWidth);
-                    component.setCaption("Width: "
-                            + (originalWidth == null ? "undefined"
-                                    : originalWidth));
+                    component.setCaption("Width: " + (originalWidth == null
+                            ? "undefined" : originalWidth));
                 }
             }
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
index 0d4f1fe562..a480751b15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
@@ -34,8 +34,8 @@ public class TabGetAndReplaceComponent extends TestBase {
                         Tab tab = tabs.getTab(content2);
 
                         // Replace content
-                        tabs.replaceComponent(tab.getComponent(), new Label(
-                                "Replacement 2"));
+                        tabs.replaceComponent(tab.getComponent(),
+                                new Label("Replacement 2"));
 
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index 09e34307c0..899de78252 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
@@ -38,8 +38,8 @@ public class TabSheetCaptions extends TestBase {
         VerticalLayout layout1 = new VerticalLayout();
         layout1.setMargin(true);
         layout1.setSizeFull();
-        panel1 = new Panel(
-                "Panel initial caption (should also be tab caption)", layout1);
+        panel1 = new Panel("Panel initial caption (should also be tab caption)",
+                layout1);
         panel1.setSizeFull();
         layout1.addComponent(new Label("This is a panel"));
         tabSheet.addTab(panel1);
@@ -48,9 +48,8 @@ public class TabSheetCaptions extends TestBase {
         button.addClickListener(new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                tabSheet.getTab(panel1).setCaption(
-                        "This is a new tab caption "
-                                + dateFormatter.format(date));
+                tabSheet.getTab(panel1).setCaption("This is a new tab caption "
+                        + dateFormatter.format(date));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index f0c51be9ed..50050b9a36 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
@@ -39,7 +39,8 @@ public class TabSheetIcons extends TestBase {
         tab[0] = new Label("This is tab 1");
         tab[0].setIcon(new ThemeResource("../runo/icons/32/folder-add.png"));
         tab[0].setCaption("tab number 1");
-        tab[1] = new LegacyTextField("This is tab 2", "Contents of tab 2 textfield");
+        tab[1] = new LegacyTextField("This is tab 2",
+                "Contents of tab 2 textfield");
         tab[2] = new Label("This is tab 3");
         tab[2].setIcon(new ThemeResource("../runo/icons/16/folder-add.png"));
         tab[2].setCaption("tab number 3");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index de637bbed7..8e6b17d81e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
@@ -59,9 +59,8 @@ public class TabSheetIndexOperations extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         getMainWindow().showNotification(
-                                "Index: "
-                                        + tabs.getTabPosition(tabs.getTab(tabs
-                                                .getSelectedTab())));
+                                "Index: " + tabs.getTabPosition(
+                                        tabs.getTab(tabs.getSelectedTab())));
 
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index c14203e765..4114abfd99 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
@@ -21,8 +21,8 @@ public class TabSheetTabStyleNames extends TestBase {
 
         tab1.setStyleName(STYLE_NAME);
 
-        addComponent(new Button("Update style names",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Update style names", new Button.ClickListener() {
                     int counter = 0;
 
                     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
index 5c76effefd..bd86191451 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
@@ -11,7 +11,8 @@ public class TabSheetTabTheming extends TestBase {
         TabSheet tabsheet = new TabSheet();
         tabsheet.setStyleName("pg");
         tabsheet.addTab(new Label(), "Brown fox and the fence", null);
-        tabsheet.addTab(new Label(), "Something about using all the keys", null);
+        tabsheet.addTab(new Label(), "Something about using all the keys",
+                null);
         addComponent(tabsheet);
         setTheme("tests-tickets");
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index 56836037b7..c106b5bde2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java
@@ -165,8 +165,8 @@ public class TabSheetTest<T extends TabSheet> extends
         iconOptions.put("16x16 (cachable)", ICON_16_USER_PNG_CACHEABLE);
         iconOptions.put("16x16 (uncachable)", ICON_16_USER_PNG_UNCACHEABLE);
         iconOptions.put("32x32 (cachable)", ICON_32_ATTENTION_PNG_CACHEABLE);
-        iconOptions
-                .put("32x32 (uncachable)", ICON_32_ATTENTION_PNG_UNCACHEABLE);
+        iconOptions.put("32x32 (uncachable)",
+                ICON_32_ATTENTION_PNG_UNCACHEABLE);
         iconOptions.put("64x64 (cachable)", ICON_64_EMAIL_REPLY_PNG_CACHEABLE);
         iconOptions.put("64x64 (uncachable)",
                 ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
index 2dd4993aca..b242e192b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
@@ -64,8 +64,8 @@ public class TabSheetWithHasComponent extends AbstractTestUI {
     }
 
     protected TabSheet createSmallTabSheet() {
-        return new TabSheet(new Button("Tab1 inside popup"), new NativeButton(
-                "Tab 2 inside popup"));
+        return new TabSheet(new Button("Tab1 inside popup"),
+                new NativeButton("Tab 2 inside popup"));
     }
 
     private Panel createPanel() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
index fe1bcd0a1a..a3301a905d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
@@ -76,7 +76,8 @@ public class TabsheetScrolling extends TestBase {
                 new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        int lastFixed = fixedSizeTabSheet.getComponentCount() - 1;
+                        int lastFixed = fixedSizeTabSheet.getComponentCount()
+                                - 1;
                         fixedSizeTabSheet.setSelectedTab(lastFixed);
                         int lastAuto = autoWideTabSheet.getComponentCount() - 1;
                         autoWideTabSheet.setSelectedTab(lastAuto);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
index bd39910ddb..95ba3f1baf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
@@ -37,7 +37,8 @@ public class TabsheetShouldUpdateHeight extends TestBase {
         addComponent(btnSwitch);
     }
 
-    private VerticalLayout getLayoutWithComponents(final int inAmount, String id) {
+    private VerticalLayout getLayoutWithComponents(final int inAmount,
+            String id) {
         final VerticalLayout v = new VerticalLayout();
         v.setDebugId(id);
         v.setSpacing(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 110f26d478..531c0f73d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
@@ -25,8 +25,7 @@ public class VerticalScrollbarPosition extends TestBase {
         tf.setRows(2);
         tf.setHeight("300px");
         tf.setWidth("200px");
-        tabsheet.addTab(
-                tf,
+        tabsheet.addTab(tf,
                 "A text area that is 200px wide, the tab bar for the tabsheet is wider",
                 null);
         TextArea tf2 = new TextArea("Another tab", "b");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
index 154a30a64b..4a2294e478 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
@@ -18,11 +18,11 @@ public class ScrollCursor extends TestBase {
     @Override
     protected void setup() {
         textArea = new TextArea();
-        textArea.setValue("saddddddddddd     fdgdfgfdgfd\n"
-                + "aasddddddddddd\n" + "dsaffffffdsf\n" + "sdf\n"
-                + "dsfsdfsdfsdfsd\n\n" + "ffffffffffffffffffff\n"
-                + "sdfdsfdsfsdfsdfsd  xxxxxxxxxxxxxxxx\n" + "sdgfsd\n"
-                + "dsf\n" + "ds\n" + "fds\n" + "fds\nfs");
+        textArea.setValue("saddddddddddd     fdgdfgfdgfd\n" + "aasddddddddddd\n"
+                + "dsaffffffdsf\n" + "sdf\n" + "dsfsdfsdfsdfsd\n\n"
+                + "ffffffffffffffffffff\n"
+                + "sdfdsfdsfsdfsdfsd  xxxxxxxxxxxxxxxx\n" + "sdgfsd\n" + "dsf\n"
+                + "ds\n" + "fds\n" + "fds\nfs");
         addComponent(textArea);
         Button button = new Button("Scroll");
         button.addListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index 50a7155a78..db6aa01281 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
@@ -13,7 +13,8 @@ import com.vaadin.ui.TextArea;
 
 public class TextAreaCursorPosition extends TestBase {
 
-    private LegacyTextField cursorPosition = new LegacyTextField("Cursor position");
+    private LegacyTextField cursorPosition = new LegacyTextField(
+            "Cursor position");
 
     @Override
     public void setup() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
index 38f0fb5326..4561431ac6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
@@ -58,7 +58,8 @@ public class BigDecimalTextField extends AbstractTestUIWithLog {
         Button setValue = new Button("Set value to 15,2", new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                ((LegacyTextField) fieldGroup.getField("decimal")).setValue("15,2");
+                ((LegacyTextField) fieldGroup.getField("decimal"))
+                        .setValue("15,2");
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 646824cd8f..8cb0076038 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
@@ -37,7 +37,8 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 if (action == enter) {
 
                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
index 7e3f377155..3387ad4f15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
@@ -67,17 +67,17 @@ public class InputPromptGetText extends AbstractTestUI {
                 getLayout().addComponent(label);
             }
         });
-        tf.addShortcutListener(new ShortcutListener("Shortcut", KeyCode.ENTER,
-                null) {
+        tf.addShortcutListener(
+                new ShortcutListener("Shortcut", KeyCode.ENTER, null) {
 
-            @Override
-            public void handleAction(Object sender, Object target) {
-                String input = tf.getValue();
-                Label label = new Label("Your input was: " + input);
-                label.setId(LABEL1);
-                getLayout().addComponent(label);
-            }
-        });
+                    @Override
+                    public void handleAction(Object sender, Object target) {
+                        String input = tf.getValue();
+                        Label label = new Label("Your input was: " + input);
+                        label.setId(LABEL1);
+                        getLayout().addComponent(label);
+                    }
+                });
 
         getLayout().addComponent(tf);
         getLayout().addComponent(button);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index c194b1486e..0f13f5f92d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
@@ -122,8 +122,9 @@ public class TextChangeEvents2 extends TestBase {
         }
 
         {
-            final LegacyTextField[] tfs = new LegacyTextField[] { new LegacyTextField(),
-                    new LegacyTextField(), new LegacyTextField(), new LegacyTextField() };
+            final LegacyTextField[] tfs = new LegacyTextField[] {
+                    new LegacyTextField(), new LegacyTextField(),
+                    new LegacyTextField(), new LegacyTextField() };
             HorizontalLayout hl = new HorizontalLayout();
             hl.setCaption("Blää");
             getLayout().addComponent(hl);
@@ -162,7 +163,8 @@ public class TextChangeEvents2 extends TestBase {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        LegacyTextField tf = (LegacyTextField) event.getProperty();
+                        LegacyTextField tf = (LegacyTextField) event
+                                .getProperty();
                         String val = tf.getValue();
                         if (val != null && val.length() > 4) {
                             tf.setValue(val.substring(0, 4));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index a533456179..e8bfc639ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
@@ -12,8 +12,8 @@ public class TextFieldInLayoutInTable extends LegacyApplication {
     @Override
     public void init() {
 
-        final LegacyWindow mainWindow = new LegacyWindow(this.getClass()
-                .getName());
+        final LegacyWindow mainWindow = new LegacyWindow(
+                this.getClass().getName());
         setMainWindow(mainWindow);
 
         final Table table = new Table();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
index 777c29ad37..71303c4209 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
@@ -4,8 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
 
-public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField> implements
-        TextChangeListener {
+public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField>
+        implements TextChangeListener {
 
     @Override
     protected Class<LegacyTextField> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
index 1b8b6c3ba5..d7518eea95 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
@@ -35,7 +35,8 @@ public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        LegacyTextField textField = new LegacyTextField("TextField with null value");
+        LegacyTextField textField = new LegacyTextField(
+                "TextField with null value");
         textField.setInputPrompt("Me is input prompt");
         textField.setNullRepresentation(null);
         textField.setValue(null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
index 5c2d4d8e39..da9569aa9a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
@@ -58,16 +58,16 @@ public class TreeConnectors extends TestBase {
 
         });
 
-        tree.setItemIcon("Item 1", new ThemeResource(
-                "../runo/icons/32/folder.png"));
-        tree.setItemIcon("Item 3", new ThemeResource(
-                "../runo/icons/32/document.png"));
-        tree.setItemIcon("Item 13", new ThemeResource(
-                "../runo/icons/64/user.png"));
-        tree.setItemIcon("Item 72", new ThemeResource(
-                "../runo/icons/64/users.png"));
-        tree.setItemIcon("Item 17", new ThemeResource(
-                "../runo/icons/16/document-pdf.png"));
+        tree.setItemIcon("Item 1",
+                new ThemeResource("../runo/icons/32/folder.png"));
+        tree.setItemIcon("Item 3",
+                new ThemeResource("../runo/icons/32/document.png"));
+        tree.setItemIcon("Item 13",
+                new ThemeResource("../runo/icons/64/user.png"));
+        tree.setItemIcon("Item 72",
+                new ThemeResource("../runo/icons/64/users.png"));
+        tree.setItemIcon("Item 17",
+                new ThemeResource("../runo/icons/16/document-pdf.png"));
 
         return tree;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index f885e1d1da..409df2b18d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
@@ -29,8 +29,8 @@ public class TreeNodeCaptionWrapping extends TestBase {
         String subItem = "Subitem - also long";
 
         tree.addItem(mainItem);
-        tree.setItemIcon(mainItem, new ThemeResource(
-                "../runo/icons/16/error.png"));
+        tree.setItemIcon(mainItem,
+                new ThemeResource("../runo/icons/16/error.png"));
 
         tree.addItem(subItem);
         tree.setParent(subItem, mainItem);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
index 59e3fec1f9..6839e6837c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
@@ -12,13 +12,14 @@ public class TreeToolTips extends TestBase {
     @Override
     protected void setup() {
         final Tree tree = new Tree(null, createContainer());
-        tree.setItemDescriptionGenerator(new AbstractSelect.ItemDescriptionGenerator() {
-            @Override
-            public String generateDescription(Component source, Object itemId,
-                    Object propertyId) {
-                return "This is a tooltip for item id '" + itemId + "'";
-            }
-        });
+        tree.setItemDescriptionGenerator(
+                new AbstractSelect.ItemDescriptionGenerator() {
+                    @Override
+                    public String generateDescription(Component source,
+                            Object itemId, Object propertyId) {
+                        return "This is a tooltip for item id '" + itemId + "'";
+                    }
+                });
 
         for (Object rootItems : tree.rootItemIds()) {
             tree.expandItemsRecursively(rootItems);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
index f12d6adbb3..d41cdd94d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
@@ -19,8 +19,8 @@ import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 import com.vaadin.ui.Tree.ItemStyleGenerator;
 
-public class Trees extends AbstractSelectTestCase<Tree> implements
-        ExpandListener, CollapseListener {
+public class Trees extends AbstractSelectTestCase<Tree>
+        implements ExpandListener, CollapseListener {
 
     private int rootItemIds = 3;
 
@@ -137,8 +137,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements
         cm.addItem("Caption only", null);
         cm.addItem("Has icon", ICON_16_USER_PNG_UNCACHEABLE);
         options.put("With and without icon", cm);
-        options.put("Only one large icon", new ContextMenu("Icon",
-                ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE));
+        options.put("Only one large icon",
+                new ContextMenu("Icon", ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE));
 
         createSelectAction("Context menu", category, options, "None",
                 contextMenuCommand, true);
@@ -149,7 +149,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements
         LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator> options = new LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator>();
 
         options.put("-", null);
-        options.put(rootGreenSecondLevelRed.toString(), rootGreenSecondLevelRed);
+        options.put(rootGreenSecondLevelRed.toString(),
+                rootGreenSecondLevelRed);
         options.put(evenItemsBold.toString(), evenItemsBold);
 
         createSelectAction("Item Style generator", category, options, "-",
@@ -387,8 +388,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements
     private Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator>() {
 
         @Override
-        public void execute(Tree c,
-                com.vaadin.ui.Tree.ItemStyleGenerator value, Object data) {
+        public void execute(Tree c, com.vaadin.ui.Tree.ItemStyleGenerator value,
+                Object data) {
             c.setItemStyleGenerator(value);
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
index 3d40bc47cf..69cb884c07 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
@@ -43,9 +43,9 @@ public class ChangeDataSourcePageLengthZero extends TestBase {
                         .getContainerDataSource();
                 Object itemId = container.addItem();
                 container.getContainerProperty(itemId, "i").setValue(i++);
-                container.getContainerProperty(itemId, "link").setValue(
-                        new Link(String.valueOf(i + 1), new ExternalResource(
-                                "http://www.google.fi")));
+                container.getContainerProperty(itemId, "link")
+                        .setValue(new Link(String.valueOf(i + 1),
+                                new ExternalResource("http://www.google.fi")));
                 container.setChildrenAllowed(itemId, false);
                 container.setParent(itemId, null);
             }
@@ -68,9 +68,9 @@ public class ChangeDataSourcePageLengthZero extends TestBase {
         for (int i = 0; i < num; i++) {
             Object item = container.addItem();
             container.getContainerProperty(item, "i").setValue(i + 1);
-            container.getContainerProperty(item, "link").setValue(
-                    new Link(String.valueOf(i + 1), new ExternalResource(
-                            "http://www.google.fi")));
+            container.getContainerProperty(item, "link")
+                    .setValue(new Link(String.valueOf(i + 1),
+                            new ExternalResource("http://www.google.fi")));
             if (i > 0 && (i + 1) % 2 == 0) {
                 container.setChildrenAllowed(item, false);
                 container.setParent(item, previous);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
index ee64007234..c60090d974 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
@@ -21,8 +21,7 @@ public class DisappearingComponents extends AbstractTestUI {
         for (int i = 0; i < items.length; i++) {
             items[i] = tt
                     .addItem(
-                            new Object[] {
-                                    i + 1,
+                            new Object[] { i + 1,
                                     new Link(String.valueOf(i + 1),
                                             new ExternalResource(
                                                     "http://www.google.fi")) },
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
index e089237b54..484076d804 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
@@ -8,8 +8,8 @@ import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.TreeTable;
 
-public class DynamicallyModified extends TestBase implements
-        Tree.ExpandListener, Tree.CollapseListener {
+public class DynamicallyModified extends TestBase
+        implements Tree.ExpandListener, Tree.CollapseListener {
     protected static final String NAME_PROPERTY = "Name";
     protected static final String HOURS_PROPERTY = "Hours done";
     protected static final String MODIFIED_PROPERTY = "Last Modified";
@@ -36,22 +36,22 @@ public class DynamicallyModified extends TestBase implements
                 DEFAULT_DATE);
 
         // Populate table
-        Object allProjects = treetable.addItem(new Object[] { "All Projects",
-                18, DEFAULT_DATE }, null);
-        Object year2010 = treetable.addItem(new Object[] { "Year 2010", 18,
-                DEFAULT_DATE }, null);
-        Object customerProject1 = treetable.addItem(new Object[] {
-                "Customer Project 1", 13, DEFAULT_DATE }, null);
-        Object customerProject1Implementation = treetable.addItem(new Object[] {
-                "Implementation", 5, DEFAULT_DATE }, null);
-        Object customerProject1Planning = treetable.addItem(new Object[] {
-                "Planning", 2, DEFAULT_DATE }, null);
-        Object customerProject1Prototype = treetable.addItem(new Object[] {
-                "Prototype", 5, DEFAULT_DATE }, null);
-        Object customerProject2 = treetable.addItem(new Object[] {
-                "Customer Project 2", 5, DEFAULT_DATE }, null);
-        Object customerProject2Planning = treetable.addItem(new Object[] {
-                "Planning", 5, DEFAULT_DATE }, null);
+        Object allProjects = treetable.addItem(
+                new Object[] { "All Projects", 18, DEFAULT_DATE }, null);
+        Object year2010 = treetable
+                .addItem(new Object[] { "Year 2010", 18, DEFAULT_DATE }, null);
+        Object customerProject1 = treetable.addItem(
+                new Object[] { "Customer Project 1", 13, DEFAULT_DATE }, null);
+        Object customerProject1Implementation = treetable.addItem(
+                new Object[] { "Implementation", 5, DEFAULT_DATE }, null);
+        Object customerProject1Planning = treetable
+                .addItem(new Object[] { "Planning", 2, DEFAULT_DATE }, null);
+        Object customerProject1Prototype = treetable
+                .addItem(new Object[] { "Prototype", 5, DEFAULT_DATE }, null);
+        Object customerProject2 = treetable.addItem(
+                new Object[] { "Customer Project 2", 5, DEFAULT_DATE }, null);
+        Object customerProject2Planning = treetable
+                .addItem(new Object[] { "Planning", 5, DEFAULT_DATE }, null);
 
         // Set hierarchy
         treetable.setParent(year2010, allProjects);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index 2042edeea2..9c34efb539 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
@@ -62,13 +62,12 @@ public class ExpandAnimationsInChameleon extends TestBase {
                 super.addComponent(c);
                 setComponentAlignment(c, Alignment.MIDDLE_CENTER);
                 if (c.getStyleName() != "") {
-                    ((AbstractComponent) c).setDescription(c.getClass()
-                            .getSimpleName()
-                            + ".addStyleName(\""
-                            + c.getStyleName() + "\")");
+                    ((AbstractComponent) c).setDescription(
+                            c.getClass().getSimpleName() + ".addStyleName(\""
+                                    + c.getStyleName() + "\")");
                 } else {
-                    ((AbstractComponent) c).setDescription("new "
-                            + c.getClass().getSimpleName() + "()");
+                    ((AbstractComponent) c).setDescription(
+                            "new " + c.getClass().getSimpleName() + "()");
                 }
             }
         };
@@ -106,8 +105,8 @@ public class ExpandAnimationsInChameleon extends TestBase {
             hc.setParent(j, 2);
         }
 
-        t.setColumnIcon("Third", new ThemeResource(
-                "../runo/icons/16/document.png"));
+        t.setColumnIcon("Third",
+                new ThemeResource("../runo/icons/16/document.png"));
         t.select(1);
 
         return t;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index f444b781dd..09477213a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 import com.vaadin.ui.TreeTable;
 
-public class KeepAllItemsVisible extends TestBase implements ExpandListener,
-        CollapseListener {
+public class KeepAllItemsVisible extends TestBase
+        implements ExpandListener, CollapseListener {
 
     private static final String CAPTION = "caption";
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index ea76a9639a..c9f74dd654 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
@@ -22,14 +22,15 @@ public class ProgrammaticCollapse extends TestBase {
             table.addItem(new Object[] { "A" + i, "B" + i }, parentid);
             for (int j = 1; j < 5; ++j) {
                 int id = 1000 * i + j;
-                table.addItem(new Object[] { "A" + i + "." + j,
-                        "B" + i + "." + j }, id);
+                table.addItem(
+                        new Object[] { "A" + i + "." + j, "B" + i + "." + j },
+                        id);
                 table.setParent(id, parentid);
             }
         }
         layout.addComponent(table);
-        layout.addComponent(new Button("Expand / Collapse",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Expand / Collapse", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         boolean collapsed = !table.isCollapsed(1);
@@ -37,8 +38,8 @@ public class ProgrammaticCollapse extends TestBase {
                         table.setCollapsed(1, collapsed);
                     }
                 }));
-        layout.addComponent(new Button("Expand / Collapse last",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Expand / Collapse last", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         boolean collapsed = !table.isCollapsed(100);
@@ -46,8 +47,8 @@ public class ProgrammaticCollapse extends TestBase {
                         table.setCollapsed(100, collapsed);
                     }
                 }));
-        layout.addComponent(new Button("Expand / Collapse multiple",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Expand / Collapse multiple", new ClickListener() {
                     private boolean collapsed = true;
 
                     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index 7088497b4e..23776a14b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
@@ -109,8 +109,8 @@ public class ProgrammaticSelect extends TestBase {
         for (int i = 1; i <= items; i++) {
             Item item = c.addItem("Item " + i);
             for (int j = 1; j <= properties; j++) {
-                item.getItemProperty("Property " + j).setValue(
-                        "Item " + i + "," + j);
+                item.getItemProperty("Property " + j)
+                        .setValue("Item " + i + "," + j);
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
index 4372341161..b7b7371b89 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
@@ -80,14 +80,14 @@ public class RemoveAllItemsRefresh extends TestBase {
         containerItem = treeContainer.addItem("first");
         containerItem.getItemProperty(NAME_PROPERTY)
                 .setValue("1 NAME_PROPERTY");
-        containerItem.getItemProperty(TITLE_PROPERTY).setValue(
-                "1 TITLE_PROPERTY");
+        containerItem.getItemProperty(TITLE_PROPERTY)
+                .setValue("1 TITLE_PROPERTY");
 
         containerItem = treeContainer.addItem("second");
         containerItem.getItemProperty(NAME_PROPERTY)
                 .setValue("2 NAME_PROPERTY");
-        containerItem.getItemProperty(TITLE_PROPERTY).setValue(
-                "2 TITLE_PROPERTY");
+        containerItem.getItemProperty(TITLE_PROPERTY)
+                .setValue("2 TITLE_PROPERTY");
         treetable.setContainerDataSource(treeContainer);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
index de33d26051..35db40b966 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
@@ -74,8 +74,8 @@ public class TreeTableCacheOnPartialUpdates extends TestBase {
             TestBean tb = (TestBean) itemId;
             String identifier = "Item " + itemId + "/" + columnId;
             Button btnCol3 = new NativeButton(identifier);
-            btnCol3.setId("cacheTestButton-" + tb.getCol1() + "-"
-                    + tb.getCol2());
+            btnCol3.setId(
+                    "cacheTestButton-" + tb.getCol1() + "-" + tb.getCol2());
             btnCol3.addClickListener(new Button.ClickListener() {
                 @Override
                 public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
index 79c967914f..eb7053ab0d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
@@ -70,14 +70,16 @@ public class TreeTableExtraScrollbar extends TestBase {
 
     private class EmptyColumnGenerator implements Table.ColumnGenerator {
         @Override
-        public Object generateCell(Table table, Object itemId, Object columnId) {
+        public Object generateCell(Table table, Object itemId,
+                Object columnId) {
             return null;
         }
     }
 
     private class TypeColumnGenerator implements Table.ColumnGenerator {
         @Override
-        public Object generateCell(Table table, Object itemId, Object columnId) {
+        public Object generateCell(Table table, Object itemId,
+                Object columnId) {
             if (itemId instanceof TestObject) {
                 return new Label(((TestObject) itemId).getValue());
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
index 0dc98b2c2e..85d7030b46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
@@ -75,7 +75,8 @@ public class TreeTableExtraScrollbarWithChildren extends TestBase {
 
     private class HierarchyColumnGenerator implements Table.ColumnGenerator {
         @Override
-        public Object generateCell(Table table, Object itemId, Object columnId) {
+        public Object generateCell(Table table, Object itemId,
+                Object columnId) {
             Label label = new Label("this should be mostly hidden");
             label.setSizeUndefined();
             return label;
@@ -84,7 +85,8 @@ public class TreeTableExtraScrollbarWithChildren extends TestBase {
 
     private class TypeColumnGenerator implements Table.ColumnGenerator {
         @Override
-        public Object generateCell(Table table, Object itemId, Object columnId) {
+        public Object generateCell(Table table, Object itemId,
+                Object columnId) {
             if (itemId instanceof TestObject) {
                 return new Label(((TestObject) itemId).getValue());
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
index ba057f4c41..ebe3f0e1a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
@@ -19,8 +19,8 @@ import com.vaadin.tests.components.table.TableItemDescriptionGeneratorUI;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TreeTable;
 
-public class TreeTableItemDescriptionGeneratorUI extends
-        TableItemDescriptionGeneratorUI {
+public class TreeTableItemDescriptionGeneratorUI
+        extends TableItemDescriptionGeneratorUI {
 
     @Override
     protected Table createTable() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
index 02ce397a05..133b024004 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
@@ -33,8 +33,8 @@ public class TreeTableModifyAndSetCollapsed extends TestBase {
                 int parentId = counter++;
                 Item parent = container.addItem(parentId);
                 tt.setCollapsed(parentId, false);
-                parent.getItemProperty("value").setValue(
-                        "parent " + (counter++) + "");
+                parent.getItemProperty("value")
+                        .setValue("parent " + (counter++) + "");
                 for (int i = 0; i < 4; i++) {
                     int childId = counter++;
                     Item child = container.addItem(childId);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 78d67ee090..467eaba120 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
@@ -45,7 +45,8 @@ public class TreeTablePartialUpdates extends AbstractTestUI {
     }
 
     @SuppressWarnings("unchecked")
-    private void addNodesToRoot(HierarchicalContainer hc, Object root, int count) {
+    private void addNodesToRoot(HierarchicalContainer hc, Object root,
+            int count) {
         for (int ix = 0; ix < count; ix++) {
             Object id = hc.addItem();
             hc.getItem(id).getItemProperty("p1").setValue(String.valueOf(ix));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
index 686d86a0dc..002ea08429 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
@@ -50,7 +50,8 @@ public class TreeTablePartialUpdatesPageLength0 extends AbstractTestUI {
     }
 
     @SuppressWarnings("unchecked")
-    private void addNodesToRoot(HierarchicalContainer hc, Object root, int count) {
+    private void addNodesToRoot(HierarchicalContainer hc, Object root,
+            int count) {
         for (int ix = 0; ix < count; ix++) {
             Object id = hc.addItem();
             hc.getItem(id).getItemProperty("p1").setValue(String.valueOf(ix));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
index 0668a6aeeb..b32644cd29 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
@@ -18,8 +18,8 @@ public class TreeTableRowIcons extends AbstractTestUI {
         layout.setSpacing(true);
         addComponent(layout);
 
-        layout.addComponent(createTreeTableAndPopulate(new ThemeResource(
-                "../runo/icons/16/ok.png")));
+        layout.addComponent(createTreeTableAndPopulate(
+                new ThemeResource("../runo/icons/16/ok.png")));
         layout.addComponent(createTreeTableAndPopulate(FontAwesome.ANDROID));
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
index 02f848cd40..f3ac9fc602 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
@@ -17,8 +17,8 @@ import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 import com.vaadin.ui.TreeTable;
 
-public class TreeTableTest extends Tables<TreeTable> implements
-        CollapseListener, ExpandListener {
+public class TreeTableTest extends Tables<TreeTable>
+        implements CollapseListener, ExpandListener {
 
     @Override
     protected Class<TreeTable> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
index d4599fc1a3..c2f640f7c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
@@ -8,10 +8,8 @@ import com.vaadin.ui.Label;
 public class ComboboxSelectedItemText extends AbstractTestUIWithLog {
     @Override
     protected void setup(VaadinRequest request) {
-        getLayout()
-                .addComponent(
-                        new Label(
-                                "Select first ANTIGUA AND BARBUDA from the first combobox. Then select ANTIGUA AND BARBUDA from the second combobox. Finally, click the popup button on the first combobox. Before fix you would see UA AND BAR in the field."));
+        getLayout().addComponent(new Label(
+                "Select first ANTIGUA AND BARBUDA from the first combobox. Then select ANTIGUA AND BARBUDA from the second combobox. Finally, click the popup button on the first combobox. Before fix you would see UA AND BAR in the field."));
 
         ComboBox combobox = new ComboBox("Text input enabled:");
         combobox.setWidth("100px");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
index 984ac69d6e..aa4fee34f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -48,7 +48,8 @@ public class LazyInitUIs extends AbstractTestUIProvider {
                     layout.setMargin(true);
                     setContent(layout);
 
-                    layout.addComponent(getRequestInfo("LazyCreateUI", request));
+                    layout.addComponent(
+                            getRequestInfo("LazyCreateUI", request));
                 }
             };
             return uI;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
index 06abb51b06..01bf8abd53 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
@@ -74,7 +74,8 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog {
 
     }
 
-    private LegacyTextField createIntegerTextField(String caption, int initialValue) {
+    private LegacyTextField createIntegerTextField(String caption,
+            int initialValue) {
         LegacyTextField tf = new LegacyTextField(caption);
         tf.setId(caption);
         tf.setConverter(Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
index 007a49e0e2..4f98f5b7d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
@@ -51,8 +51,8 @@ public class MultiFileUploadTest extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
-        getPage().getStyles().add(
-                ".v-upload-hidden-button .v-button {display:none};");
+        getPage().getStyles()
+                .add(".v-upload-hidden-button .v-button {display:none};");
         addUpload();
         addComponent(uploadsLayout);
         addComponent(new Button("Upload files", new ClickListener() {
@@ -95,7 +95,8 @@ public class MultiFileUploadTest extends AbstractTestUIWithLog {
 
         upload.setReceiver(new Receiver() {
             @Override
-            public OutputStream receiveUpload(String filename, String mimeType) {
+            public OutputStream receiveUpload(String filename,
+                    String mimeType) {
                 return new OutputStream() {
                     @Override
                     public void write(int arg0) throws IOException {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
index f92e22d06b..a44d64db83 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
@@ -58,8 +58,8 @@ public class MultipleUIUploadTest extends AbstractTestUI {
 
     }
 
-    public class MemoryBuffer implements StreamResource.StreamSource,
-            Upload.Receiver {
+    public class MemoryBuffer
+            implements StreamResource.StreamSource, Upload.Receiver {
         ByteArrayOutputStream outputBuffer = null;
 
         String mimeType;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java
index 1ec4f4d9f7..b5f0100982 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java
@@ -34,8 +34,8 @@ public class PollListening extends AbstractTestUI {
             @Override
             public void poll(PollEvent event) {
                 setPollInterval(-1);
-                statusLabel.setValue(event.getClass().getSimpleName()
-                        + " received");
+                statusLabel.setValue(
+                        event.getClass().getSimpleName() + " received");
                 removePollListener(this);
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
index cb62ccdb19..a45ab704d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
@@ -67,8 +67,8 @@ public class TimeoutRedirectResetsOnActivity extends AbstractTestUI {
     }
 
     private void setupTimeout(VaadinRequest request) {
-        request.getService().setSystemMessagesProvider(
-                new SystemMessagesProvider() {
+        request.getService()
+                .setSystemMessagesProvider(new SystemMessagesProvider() {
                     @Override
                     public SystemMessages getSystemMessages(
                             SystemMessagesInfo systemMessagesInfo) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java
index 70a69ef7d3..15643a9700 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java
@@ -52,8 +52,8 @@ public class UIAccess extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
-        addComponent(new Button("Access from UI thread",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Access from UI thread", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -84,14 +84,15 @@ public class UIAccess extends AbstractTestUIWithLog {
                                         .getCurrentResponse() != null;
                                 // session is locked by request thread at this
                                 // point
-                                final Future<Void> initialFuture = access(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        log("Initial background message");
-                                        log("Thread has current response? "
-                                                + threadHasCurrentResponse);
-                                    }
-                                });
+                                final Future<Void> initialFuture = access(
+                                        new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                log("Initial background message");
+                                                log("Thread has current response? "
+                                                        + threadHasCurrentResponse);
+                                            }
+                                        });
 
                                 // Let request thread continue
                                 latch.countDown();
@@ -171,8 +172,8 @@ public class UIAccess extends AbstractTestUIWithLog {
                         log("future was cancelled, should not start");
                     }
                 }));
-        addComponent(new Button("Cancel running future",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Cancel running future", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         log.clear();
@@ -232,10 +233,11 @@ public class UIAccess extends AbstractTestUIWithLog {
                             @Override
                             public void run() {
                                 log.log("accessSynchronously has request? "
-                                        + (VaadinService.getCurrentRequest() != null));
+                                        + (VaadinService
+                                                .getCurrentRequest() != null));
                                 log.log("Test value in accessSynchronously: "
-                                        + CurrentInstance
-                                                .get(CurrentInstanceTestType.class));
+                                        + CurrentInstance.get(
+                                                CurrentInstanceTestType.class));
                                 CurrentInstance.set(
                                         CurrentInstanceTestType.class,
                                         new CurrentInstanceTestType(
@@ -255,18 +257,18 @@ public class UIAccess extends AbstractTestUIWithLog {
                     public void buttonClick(ClickEvent event) {
                         log.clear();
                         // accessSynchronously should maintain values
-                        CurrentInstance
-                                .setInheritable(CurrentInstanceTestType.class,
-                                        new CurrentInstanceTestType(
-                                                "Set before access"));
+                        CurrentInstance.setInheritable(
+                                CurrentInstanceTestType.class,
+                                new CurrentInstanceTestType(
+                                        "Set before access"));
                         access(new Runnable() {
                             @Override
                             public void run() {
-                                log.log("access has request? "
-                                        + (VaadinService.getCurrentRequest() != null));
+                                log.log("access has request? " + (VaadinService
+                                        .getCurrentRequest() != null));
                                 log.log("Test value in access: "
-                                        + CurrentInstance
-                                                .get(CurrentInstanceTestType.class));
+                                        + CurrentInstance.get(
+                                                CurrentInstanceTestType.class));
                                 CurrentInstance.setInheritable(
                                         CurrentInstanceTestType.class,
                                         new CurrentInstanceTestType(
@@ -278,14 +280,13 @@ public class UIAccess extends AbstractTestUIWithLog {
                                 new CurrentInstanceTestType(
                                         "Set before run pending"));
 
-                        getSession().getService().runPendingAccessTasks(
-                                getSession());
+                        getSession().getService()
+                                .runPendingAccessTasks(getSession());
 
                         log.log("has request after access? "
                                 + (VaadinService.getCurrentRequest() != null));
-                        log("Test value after access: "
-                                + CurrentInstance
-                                        .get(CurrentInstanceTestType.class));
+                        log("Test value after access: " + CurrentInstance
+                                .get(CurrentInstanceTestType.class));
                     }
                 }));
 
@@ -294,7 +295,8 @@ public class UIAccess extends AbstractTestUIWithLog {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         log.clear();
-                        if (getPushConfiguration().getPushMode() != PushMode.AUTOMATIC) {
+                        if (getPushConfiguration()
+                                .getPushMode() != PushMode.AUTOMATIC) {
                             log("Can only test with automatic push enabled");
                             return;
                         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
index bd18d93328..0a386fa47a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
@@ -30,8 +30,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;
 
-public class UIAccessExceptionHandling extends AbstractTestUIWithLog implements
-        ErrorHandler {
+public class UIAccessExceptionHandling extends AbstractTestUIWithLog
+        implements ErrorHandler {
 
     private Future<Void> future;
 
@@ -81,35 +81,36 @@ public class UIAccessExceptionHandling extends AbstractTestUIWithLog implements
                     }
                 }));
 
-        addComponent(new Button(
-                "Throw RuntimeException after removing instances",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Throw RuntimeException after removing instances",
+                        new Button.ClickListener() {
 
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
+                            @Override
+                            public void buttonClick(ClickEvent event) {
+                                log.clear();
 
-                        // Ensure beforeClientResponse is invoked
-                        markAsDirty();
+                                // Ensure beforeClientResponse is invoked
+                                markAsDirty();
 
-                        assert UI.getCurrent() == UIAccessExceptionHandling.this;
+                                assert UI
+                                        .getCurrent() == UIAccessExceptionHandling.this;
 
-                        Map<Class<?>, CurrentInstance> instances = CurrentInstance
-                                .getInstances(false);
-                        CurrentInstance.clearAll();
+                                Map<Class<?>, CurrentInstance> instances = CurrentInstance
+                                        .getInstances(false);
+                                CurrentInstance.clearAll();
 
-                        assert UI.getCurrent() == null;
+                                assert UI.getCurrent() == null;
 
-                        future = access(new Runnable() {
-                            @Override
-                            public void run() {
-                                throw new RuntimeException();
-                            }
-                        });
+                                future = access(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        throw new RuntimeException();
+                                    }
+                                });
 
-                        CurrentInstance.restoreInstances(instances);
-                    }
-                }));
+                                CurrentInstance.restoreInstances(instances);
+                            }
+                        }));
 
         addComponent(new Button("Clear", new Button.ClickListener() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
index cbd317b027..b76b2292d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
@@ -55,8 +55,8 @@ public class UISerialization extends AbstractTestUI {
                             .getDiffState(UISerialization.this);
                     UISerialization app = (UISerialization) deserialize(result);
                     log.log("Deserialized UI in " + elapsed + "ms");
-                    Object diffStateAfter = getConnectorTracker().getDiffState(
-                            UISerialization.this);
+                    Object diffStateAfter = getConnectorTracker()
+                            .getDiffState(UISerialization.this);
                     if (diffStateBefore.equals(diffStateAfter)) {
                         log.log("Diff states match, size: "
                                 + diffStateBefore.toString().length());
@@ -67,8 +67,8 @@ public class UISerialization extends AbstractTestUI {
                     log.log("Exception caught: " + e.getMessage());
                     StringWriter sw = new StringWriter();
                     e.printStackTrace(new PrintWriter(sw));
-                    addComponent(new Label(sw.toString(),
-                            ContentMode.PREFORMATTED));
+                    addComponent(
+                            new Label(sw.toString(), ContentMode.PREFORMATTED));
                 }
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java
index c726c49b12..bcad8589d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java
@@ -29,7 +29,8 @@ public class UriFragment extends AbstractTestUI {
         addComponent(createButton("null", "setUriFragment(null)", null));
     }
 
-    private Button createButton(String id, String caption, final String fragment) {
+    private Button createButton(String id, String caption,
+            final String fragment) {
         Button button = new Button(caption, new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
index 51eb776ebf..37168a6033 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
@@ -35,7 +35,8 @@ public class BackButtonTest extends AbstractTestUI {
                 new UriFragmentChangedListener() {
 
                     @Override
-                    public void uriFragmentChanged(UriFragmentChangedEvent event) {
+                    public void uriFragmentChanged(
+                            UriFragmentChangedEvent event) {
                         String f = event.getUriFragment();
                         if ("page2".equals(f)) {
                             showPage2();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java
index fce2ef680d..aac5bdc5e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java
@@ -163,7 +163,8 @@ public class TestSampler extends TabSheet {
         createComponentLayout(caption, hl);
     }
 
-    private void createComponentLayout(String caption, ComponentContainer layout) {
+    private void createComponentLayout(String caption,
+            ComponentContainer layout) {
         addTab(layout, caption);
         currentTab = layout;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
index 57783f6eb3..3108341216 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
@@ -10,8 +10,8 @@ public class EmbeddedCssTest {
     private int debugIdCounter = 0;
 
     public EmbeddedCssTest(TestSampler parent) {
-        Embedded e = new Embedded("Embedded with a caption", new ThemeResource(
-                parent.ICON_URL));
+        Embedded e = new Embedded("Embedded with a caption",
+                new ThemeResource(parent.ICON_URL));
         e.setId("embedded" + debugIdCounter);
         parent.addComponent(e);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
index 0ef37bf5c4..0e4cc931f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
@@ -101,8 +101,8 @@ public class LayoutsCssTest extends GridLayout {
 
         CustomLayout custom;
         try {
-            custom = new CustomLayout(new ByteArrayInputStream(
-                    customLayoutSrc.getBytes()));
+            custom = new CustomLayout(
+                    new ByteArrayInputStream(customLayoutSrc.getBytes()));
             custom.addComponent(new Label("Some content"), "pos1");
             custom.setComponentError(new UserError("A error mesasge..."));
             custom.setCaption("CustomLayout");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
index cf63222ee8..9c3f91c661 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
@@ -76,7 +76,8 @@ public class SelectsCssTest extends GridLayout {
         addComponent(s);
 
         createComboBoxWith(null, null, "100px");
-        createComboBoxWith("CB Search", ChameleonTheme.COMBOBOX_SEARCH, "100px");
+        createComboBoxWith("CB Search", ChameleonTheme.COMBOBOX_SEARCH,
+                "100px");
         createComboBoxWith("SelectButton",
                 ChameleonTheme.COMBOBOX_SELECT_BUTTON, "100px");
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
index b05eb2f32a..40fcac0d82 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
@@ -31,8 +31,8 @@ public class TabSheetsCssTest {
                 Reindeer.TABSHEET_MINIMAL);
         parent.addComponent(minimal);
 
-        TabSheet hoverClosable = createTabSheetWith(
-                "A hover-closable TabSheet", Reindeer.TABSHEET_HOVER_CLOSABLE);
+        TabSheet hoverClosable = createTabSheetWith("A hover-closable TabSheet",
+                Reindeer.TABSHEET_HOVER_CLOSABLE);
         parent.addComponent(hoverClosable);
 
         TabSheet selectedClosable = createTabSheetWith(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
index 2d77354174..2d914f98f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
@@ -67,8 +67,8 @@ public class TablesCssTest extends GridLayout {
         t.setColumnReorderingAllowed(true);
         t.setColumnCollapsingAllowed(true);
         // t.setColumnHeaders(new String[] { "Country", "Code", "Icon file" });
-        t.setColumnIcon(TestUtils.iso3166_PROPERTY_NAME, new ThemeResource(
-                parent.ICON_URL));
+        t.setColumnIcon(TestUtils.iso3166_PROPERTY_NAME,
+                new ThemeResource(parent.ICON_URL));
 
         // Actions (a.k.a context menu)
         t.addActionHandler(new Action.Handler() {
@@ -82,7 +82,8 @@ public class TablesCssTest extends GridLayout {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 // We just want the actions UI.. don't care about the logic...
                 if (ACTION_MARK == action) {
                     markedRows.add(target);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
index 0f50ca9f1b..a1e649884c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
@@ -71,8 +71,8 @@ public class TextFieldsCssTest extends GridLayout {
 
     @Override
     public void addComponent(Component component, int column1, int row1,
-            int column2, int row2) throws OverlapsException,
-            OutOfBoundsException {
+            int column2, int row2)
+            throws OverlapsException, OutOfBoundsException {
 
         parent.registerComponent(component);
         super.addComponent(component, column1, row1, column2, row2);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
index 0508bfc0f9..626d9f47a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
@@ -25,7 +25,8 @@ public class TreeCssTest {
         tree.addActionHandler(new Action.Handler() {
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 // We don't care about functionality, we just want the UI for
                 // testing..
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java
index b57c236b20..621141ce31 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java
@@ -25,7 +25,8 @@ public class TestFileUpload extends TestBase implements Receiver {
         Upload u = new Upload("Upload", new Upload.Receiver() {
 
             @Override
-            public OutputStream receiveUpload(String filename, String mimeType) {
+            public OutputStream receiveUpload(String filename,
+                    String mimeType) {
                 return baos;
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java
index 178f8f9393..4744c935c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java
@@ -29,7 +29,8 @@ public class TestFileUploadSize extends TestBase implements Receiver {
         Upload u = new Upload("Upload", new Upload.Receiver() {
 
             @Override
-            public OutputStream receiveUpload(String filename, String mimeType) {
+            public OutputStream receiveUpload(String filename,
+                    String mimeType) {
                 return baos;
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 7607536357..5ac15a7814 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
@@ -11,8 +11,8 @@ import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.Receiver;
 
-public class TestImmediateUploadInFormLayout extends
-        ComponentTestCase<FormLayout> implements Receiver {
+public class TestImmediateUploadInFormLayout
+        extends ComponentTestCase<FormLayout> implements Receiver {
 
     @Override
     protected String getDescription() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java
index ecde5760c9..a34e0a0d1d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.Upload.FailedEvent;
 import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.Receiver;
 
-public class UploadNoSelection extends AbstractTestUIWithLog implements
-        Receiver {
+public class UploadNoSelection extends AbstractTestUIWithLog
+        implements Receiver {
 
     static final String LOG_ID_PREFIX = "Log_row_";
     static final String UPLOAD_ID = "u";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java
index 428b2ae3f9..c241d42dff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java
@@ -30,8 +30,8 @@ public class CenteredInVisualViewport extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                Window centered = new Window("A window", new Label(
-                        "Centered window"));
+                Window centered = new Window("A window",
+                        new Label("Centered window"));
                 centered.center();
                 getMainWindow().addWindow(centered);
             }
@@ -42,8 +42,8 @@ public class CenteredInVisualViewport extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                Window centered = new Window("A window", new Label(
-                        "Centered window"));
+                Window centered = new Window("A window",
+                        new Label("Centered window"));
                 centered.center();
                 getMainWindow().addWindow(centered);
             }
@@ -54,8 +54,8 @@ public class CenteredInVisualViewport extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                Window centered = new Window("A window", new Label(
-                        "Centered window"));
+                Window centered = new Window("A window",
+                        new Label("Centered window"));
                 centered.center();
                 getMainWindow().addWindow(centered);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
index 573f55b29d..cd057f48b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
@@ -10,8 +10,8 @@ public class DownloadAndUpdate extends TestBase {
 
     @Override
     protected void setup() {
-        addComponent(new Button("Download and update",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Download and update", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         downloadAndUpdate();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java
index 92fbcffd01..925dfd28c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java
@@ -22,8 +22,8 @@ public class ExtraWindowShown extends AbstractTestUI {
                 layout.setMargin(true);
                 final Window w = new Window("Sub window", layout);
                 w.center();
-                layout.addComponent(new Button("Close",
-                        new Button.ClickListener() {
+                layout.addComponent(
+                        new Button("Close", new Button.ClickListener() {
 
                             @Override
                             public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
index ad36e04d88..3a46d8c299 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
@@ -53,7 +53,8 @@ public class LegacyWindowOpenTest extends TestBase {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        win.executeJavaScript("window.open(\"http://www.google.com\", \"_blank\");");
+                        win.executeJavaScript(
+                                "window.open(\"http://www.google.com\", \"_blank\");");
                     }
                 }));
         addComponent(new Button(
@@ -61,7 +62,8 @@ public class LegacyWindowOpenTest extends TestBase {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        win.executeJavaScript("window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");");
+                        win.executeJavaScript(
+                                "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");");
                     }
                 }));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java
index be67cfe9a0..621c869e43 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java
@@ -28,8 +28,7 @@ public class LongNotifications extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
 
-                        getMainWindow().showNotification(
-                                text,
+                        getMainWindow().showNotification(text,
                                 "This is description for the same notifications."
                                         + text,
                                 Notification.TYPE_HUMANIZED_MESSAGE);
@@ -56,12 +55,10 @@ public class LongNotifications extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
 
-                        getMainWindow()
-                                .showNotification(
-                                        text,
-                                        "This is description for the same notifications."
-                                                + text,
-                                        Notification.TYPE_ERROR_MESSAGE);
+                        getMainWindow().showNotification(text,
+                                "This is description for the same notifications."
+                                        + text,
+                                Notification.TYPE_ERROR_MESSAGE);
                     }
                 });
         getLayout().addComponent(b);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java
index 7da1517e8f..fb53eaba72 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java
@@ -42,8 +42,8 @@ public class MaximizedWindowOrder extends AbstractTestUI {
         layout.addComponent(button);
 
         window.setContent(layout);
-        window.setWindowMode(maximized ? WindowMode.MAXIMIZED
-                : WindowMode.NORMAL);
+        window.setWindowMode(
+                maximized ? WindowMode.MAXIMIZED : WindowMode.NORMAL);
 
         addWindow(window);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java
index a566b09cdc..6816417208 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java
@@ -54,10 +54,8 @@ public class PageOpenTest extends AbstractTestUI {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        JavaScript
-                                .getCurrent()
-                                .execute(
-                                        "window.open(\"http://www.google.com\", \"_blank\");");
+                        JavaScript.getCurrent().execute(
+                                "window.open(\"http://www.google.com\", \"_blank\");");
                     }
                 }));
         addComponent(new Button(
@@ -65,10 +63,8 @@ public class PageOpenTest extends AbstractTestUI {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        JavaScript
-                                .getCurrent()
-                                .execute(
-                                        "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");");
+                        JavaScript.getCurrent().execute(
+                                "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");");
                     }
                 }));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
index 2571ab2f02..efea510999 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
@@ -71,8 +71,8 @@ public class SubWindowFocus extends TestBase {
                         if (action == esc) {
                             getMainWindow().removeWindow(win);
                         } else {
-                            getMainWindow().showNotification(
-                                    action.getCaption());
+                            getMainWindow()
+                                    .showNotification(action.getCaption());
                         }
 
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
index 473b3e1f9c..8e47c608f2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
@@ -42,7 +42,8 @@ public class SubWindowWithUndefinedHeight extends TestBase {
         tabsheet.addComponent(table);
         tabsheet.addListener(new TabSheet.SelectedTabChangeListener() {
             @Override
-            public void selectedTabChange(TabSheet.SelectedTabChangeEvent event) {
+            public void selectedTabChange(
+                    TabSheet.SelectedTabChangeEvent event) {
                 if (tabsheet.getSelectedTab() == tabButton) {
                     tabsheet.setSizeUndefined();
                     layout.setSizeUndefined();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 669774f715..d4e94d88cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
@@ -36,12 +36,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI {
         VerticalLayout layout = new VerticalLayout();
         layout.setMargin(true);
         Window w = new Window("Scroll", layout);
-        Label desc = new Label(
-                "This is a new child window with a preset"
-                        + " width, height and position. Resizing has been"
-                        + " disabled for this window. Additionally, this text label"
-                        + " is intentionally too large to fit the window. You can"
-                        + " use the scrollbars to view different parts of the window content.");
+        Label desc = new Label("This is a new child window with a preset"
+                + " width, height and position. Resizing has been"
+                + " disabled for this window. Additionally, this text label"
+                + " is intentionally too large to fit the window. You can"
+                + " use the scrollbars to view different parts of the window content.");
         layout.addComponent(desc);
 
         // Set window position
@@ -62,13 +61,12 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI {
         VerticalLayout layout = new VerticalLayout();
         layout.setMargin(true);
         Window w = new Window("Scroll", layout);
-        Label desc = new Label(
-                "This is a new child window with a preset"
-                        + " width, height and position. Resizing has been"
-                        + " disabled for this window. Additionally, this text label"
-                        + " is intentionally too large to fit the window. You could"
-                        + " use the scrollbars to view different parts of the window content,"
-                        + " except it's too small for that either.");
+        Label desc = new Label("This is a new child window with a preset"
+                + " width, height and position. Resizing has been"
+                + " disabled for this window. Additionally, this text label"
+                + " is intentionally too large to fit the window. You could"
+                + " use the scrollbars to view different parts of the window content,"
+                + " except it's too small for that either.");
         // disable wrapping
         desc.setSizeUndefined();
         layout.addComponent(desc);
@@ -91,12 +89,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI {
         VerticalLayout layout = new VerticalLayout();
         layout.setMargin(true);
         Window w = new Window("Resize", layout);
-        Label desc = new Label(
-                "This is a new child window with a preset"
-                        + " width, height and position. Resizing has not been"
-                        + " disabled for this window. Additionally, this text label"
-                        + " is intentionally too large to fit the window. You can resize or"
-                        + " use the scrollbars to view different parts of the window content.");
+        Label desc = new Label("This is a new child window with a preset"
+                + " width, height and position. Resizing has not been"
+                + " disabled for this window. Additionally, this text label"
+                + " is intentionally too large to fit the window. You can resize or"
+                + " use the scrollbars to view different parts of the window content.");
         layout.addComponent(desc);
 
         // Set window position
@@ -116,12 +113,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI {
         VerticalLayout layout = new VerticalLayout();
         layout.setMargin(true);
         Window w = new Window("Resize", layout);
-        Label desc = new Label(
-                "This is a new child window with a preset"
-                        + " width, height and position. Resizing has not been"
-                        + " disabled for this window. Additionally, this text label"
-                        + " is intentionally too large to fit the window. You can resize"
-                        + " to view different parts of the window content.");
+        Label desc = new Label("This is a new child window with a preset"
+                + " width, height and position. Resizing has not been"
+                + " disabled for this window. Additionally, this text label"
+                + " is intentionally too large to fit the window. You can resize"
+                + " to view different parts of the window content.");
         // disable wrapping
         desc.setSizeUndefined();
         layout.addComponent(desc);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java
index fcb915f363..7e5ec7f4a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java
@@ -48,7 +48,8 @@ public class WindowCaption extends AbstractTestUI {
         Button red = new Button("Red", new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                setWindowCaption("<font style='color: red;'>This may or may not be red</font>");
+                setWindowCaption(
+                        "<font style='color: red;'>This may or may not be red</font>");
             }
         });
         Button plainText = new Button("Plain text", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
index fef6b9c58b..b60ef45d13 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
@@ -135,8 +135,8 @@ public class WindowMaximizeRestoreTest extends AbstractTestUI {
             @Override
             public void windowClose(CloseEvent e) {
                 Item item = addWindowAgain.addItem(w);
-                addWindowAgain.setItemCaption(w, "Window "
-                        + w.getData().toString());
+                addWindowAgain.setItemCaption(w,
+                        "Window " + w.getData().toString());
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 09d03cdd28..94ff75386b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
@@ -60,16 +60,16 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase {
         window.setPositionX(200);
         window.setPositionY(200);
 
-        layout.addComponent(new Button("Scroll mainwin to X9",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Scroll mainwin to X9", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         getMainWindow().scrollIntoView(x9);
 
                     }
                 }));
-        layout.addComponent(new Button("Scroll mainwin to Y9",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Scroll mainwin to Y9", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         getMainWindow().scrollIntoView(y9);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index 172b0f592f..a86475dadd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
@@ -81,7 +81,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("Handling action " + action.getCaption());
             }
 
@@ -101,7 +102,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("Handling action " + action.getCaption());
             }
 
@@ -113,8 +115,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI {
     private void addHandler(Handler actionHandler) {
         actionHandlers.add(actionHandler);
         addActionHandler(actionHandler);
-        state.setValue("An UI with " + actionHandlers.size()
-                + " action handlers");
+        state.setValue(
+                "An UI with " + actionHandlers.size() + " action handlers");
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 55be12f644..7e23b2f8d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -105,8 +105,9 @@ public class BeanItemContainerFilteringTest extends TestBase {
                     new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
-                            container.addItem(new TestBean("addItem() "
-                                    + nextToAdd, "value " + nextToAdd));
+                            container.addItem(
+                                    new TestBean("addItem() " + nextToAdd,
+                                            "value " + nextToAdd));
                             nextToAdd++;
                             nextLabel.setCaption("Next id: " + nextToAdd);
                         }
@@ -122,13 +123,14 @@ public class BeanItemContainerFilteringTest extends TestBase {
                             if (selection == null) {
                                 return;
                             }
-                            TestBean bean = new TestBean("addItemAfter() "
-                                    + nextToAdd, "value " + nextToAdd);
+                            TestBean bean = new TestBean(
+                                    "addItemAfter() " + nextToAdd,
+                                    "value " + nextToAdd);
                             Item item = container.addItemAfter(selection, bean);
                             if (item == null) {
-                                getMainWindow().showNotification(
-                                        "Adding item after " + selection
-                                                + " failed");
+                                getMainWindow()
+                                        .showNotification("Adding item after "
+                                                + selection + " failed");
                             }
                             nextToAdd++;
                             nextLabel.setCaption("Next id: " + nextToAdd);
@@ -144,10 +146,11 @@ public class BeanItemContainerFilteringTest extends TestBase {
                     new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
-                            int index = Integer.parseInt(position.getValue()
-                                    .toString());
-                            TestBean bean = new TestBean("addItemAt() "
-                                    + nextToAdd, "value " + nextToAdd);
+                            int index = Integer
+                                    .parseInt(position.getValue().toString());
+                            TestBean bean = new TestBean(
+                                    "addItemAt() " + nextToAdd,
+                                    "value " + nextToAdd);
                             Item item = container.addItemAt(index, bean);
                             if (item == null) {
                                 getMainWindow().showNotification(
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
index 905ec2f9ff..bb077660f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
@@ -13,8 +13,8 @@ public class BeanItemContainerTest {
      * @throws IllegalAccessException
      * @throws InstantiationException
      */
-    public static void main(String[] args) throws InstantiationException,
-            IllegalAccessException {
+    public static void main(String[] args)
+            throws InstantiationException, IllegalAccessException {
         BeanItemContainer<Hello> c = new BeanItemContainer<Hello>(Hello.class);
         c.addItem(new Hello());
 
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index 82cf5b2da4..85694bfeba 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -55,8 +55,8 @@ public class IndexedContainerFilteringTest extends TestBase {
         cb.addValueChangeListener(event -> {
             container.removeAllContainerFilters();
             if (event.getValue()) {
-                container.addContainerFilter("column1", filterString
-                        .getValue().toString(), false, false);
+                container.addContainerFilter("column1",
+                        filterString.getValue().toString(), false, false);
             }
         });
         cb.setImmediate(true);
@@ -74,8 +74,8 @@ public class IndexedContainerFilteringTest extends TestBase {
                     public void buttonClick(ClickEvent event) {
                         Item item = container.addItem("addItem() " + nextToAdd);
                         if (item != null) {
-                            item.getItemProperty("column1").setValue(
-                                    "addItem() " + nextToAdd);
+                            item.getItemProperty("column1")
+                                    .setValue("addItem() " + nextToAdd);
                         }
                         nextToAdd++;
                         nextLabel.setCaption("Next id: " + nextToAdd);
@@ -98,9 +98,9 @@ public class IndexedContainerFilteringTest extends TestBase {
                             item.getItemProperty("column1").setValue(id);
                             table.setValue(id);
                         } else {
-                            getMainWindow().showNotification(
-                                    "Adding item after " + selection
-                                            + " failed");
+                            getMainWindow()
+                                    .showNotification("Adding item after "
+                                            + selection + " failed");
                         }
                         nextToAdd++;
                         nextLabel.setCaption("Next id: " + nextToAdd);
@@ -116,16 +116,16 @@ public class IndexedContainerFilteringTest extends TestBase {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        int index = Integer.parseInt(position.getValue()
-                                .toString());
+                        int index = Integer
+                                .parseInt(position.getValue().toString());
                         String id = "addItemAt() " + nextToAdd;
                         Item item = container.addItemAt(index, id);
                         if (item != null) {
                             item.getItemProperty("column1").setValue(id);
                             table.setValue(id);
                         } else {
-                            getMainWindow().showNotification(
-                                    "Adding item at index "
+                            getMainWindow()
+                                    .showNotification("Adding item at index "
                                             + position.getValue() + " failed");
                         }
                         nextToAdd++;
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 25d0053fb2..8e9a5bb3af 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
@@ -12,8 +12,8 @@ public class TableWithFileSystemContainer extends TestBase {
 
     @Override
     public void setup() {
-        Table table = new Table("Documents", new FilesystemContainer(new File(
-                testPath)));
+        Table table = new Table("Documents",
+                new FilesystemContainer(new File(testPath)));
         table.setWidth("100%");
         getMainWindow().addComponent(table);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
index 2e217fd961..e9fd01ec71 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
@@ -38,8 +38,8 @@ public class TestItemSorter extends TestBase {
                     return caption1.compareTo(caption2);
 
                 } else if (o1 instanceof String && o2 instanceof String) {
-                    return ((String) o1).toLowerCase().compareTo(
-                            ((String) o2).toLowerCase());
+                    return ((String) o1).toLowerCase()
+                            .compareTo(((String) o2).toLowerCase());
                 }
 
                 return 0;
@@ -61,8 +61,8 @@ public class TestItemSorter extends TestBase {
             Item item = container.getItem(id);
             item.getItemProperty(STRING).setValue(s);
             item.getItemProperty(BUTTON).setValue(new Button(s));
-            item.getItemProperty(CHECKBOX).setValue(
-                    new CheckBox("", s.equals("true")));
+            item.getItemProperty(CHECKBOX)
+                    .setValue(new CheckBox("", s.equals("true")));
         }
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
index c9d4a07c22..57e2ad95ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
@@ -71,16 +71,16 @@ public class FileSystemContainerInTreeTable extends TestBase {
 
             HorizontalLayout buttonLayout = new HorizontalLayout();
             buttonLayout.setSpacing(true);
-            buttonLayout.addComponent(new Button("Create dir11",
-                    new Button.ClickListener() {
+            buttonLayout.addComponent(
+                    new Button("Create dir11", new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
                             new File(folder, "dir11").mkdir();
                             log.log("Row dir11 created");
                         }
                     }));
-            buttonLayout.addComponent(new Button("Delete dir11",
-                    new Button.ClickListener() {
+            buttonLayout.addComponent(
+                    new Button("Delete dir11", new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
                             new File(folder, "dir11").delete();
@@ -88,8 +88,8 @@ public class FileSystemContainerInTreeTable extends TestBase {
                         }
                     }));
             // to clean up explicitly before ending an automated test
-            buttonLayout.addComponent(new Button("Clean all files",
-                    new Button.ClickListener() {
+            buttonLayout.addComponent(
+                    new Button("Clean all files", new Button.ClickListener() {
                         @Override
                         public void buttonClick(ClickEvent event) {
                             folder.delete();
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index 93bd265eda..63e4357621 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
@@ -42,34 +42,22 @@ class DatabaseHelper {
             }
             switch (SQLTestsConstants.db) {
             case HSQLDB:
-                statement
-                        .execute("create table "
-                                + TABLENAME
-                                + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))");
-                statement
-                        .execute("create table "
-                                + LARGE_TABLENAME
-                                + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), primary key(id))");
+                statement.execute("create table " + TABLENAME
+                        + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))");
+                statement.execute("create table " + LARGE_TABLENAME
+                        + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), primary key(id))");
                 break;
             case MYSQL:
-                statement
-                        .execute("create table "
-                                + TABLENAME
-                                + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))");
-                statement
-                        .execute("create table "
-                                + LARGE_TABLENAME
-                                + " (id integer auto_increment not null, field1 varchar(100), primary key(id))");
+                statement.execute("create table " + TABLENAME
+                        + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))");
+                statement.execute("create table " + LARGE_TABLENAME
+                        + " (id integer auto_increment not null, field1 varchar(100), primary key(id))");
                 break;
             case POSTGRESQL:
-                statement
-                        .execute("create table "
-                                + TABLENAME
-                                + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)");
-                statement
-                        .execute("create table "
-                                + LARGE_TABLENAME
-                                + " (\"id\" serial primary key, \"field1\" varchar(100))");
+                statement.execute("create table " + TABLENAME
+                        + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)");
+                statement.execute("create table " + LARGE_TABLENAME
+                        + " (\"id\" serial primary key, \"field1\" varchar(100))");
                 break;
             }
             statement.executeUpdate("insert into " + TABLENAME
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index d099b92fb3..8d368bfa78 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -72,18 +72,18 @@ public class MassInsertMemoryLeakTestApp extends LegacyApplication {
                         SQLContainer c = new SQLContainer(q);
                         for (int i = 0; i < 100; i++) {
                             Object id = c.addItem();
-                            c.getContainerProperty(id, "FIRST_NAMES").setValue(
-                                    getRandonName());
-                            c.getContainerProperty(id, "LAST_NAME").setValue(
-                                    getRandonName());
+                            c.getContainerProperty(id, "FIRST_NAMES")
+                                    .setValue(getRandonName());
+                            c.getContainerProperty(id, "LAST_NAME")
+                                    .setValue(getRandonName());
                         }
                         c.commit();
                         getContext().lock();
                         try {
                             proggress
                                     .setValue(new Float((1.0f * cent) / cents));
-                            proggress.setCaption("" + 100 * cent
-                                    + " rows inserted");
+                            proggress.setCaption(
+                                    "" + 100 * cent + " rows inserted");
                         } finally {
                             getContext().unlock();
                         }
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
index 2ff74a76ef..c4a9385dda 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
@@ -51,8 +51,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
                 @Override
                 public void valueChange(ValueChangeEvent event) {
                     if (myCombo.getValue() != null) {
-                        Item item = myCombo.getItem(event.getProperty()
-                                .getValue());
+                        Item item = myCombo
+                                .getItem(event.getProperty().getValue());
                         String selected = item.getItemProperty("MYFIELD")
                                 .getValue().toString();
                         System.out.println("Selected " + selected);
@@ -80,8 +80,7 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
             } catch (SQLException e) {
             }
             String q = "CREATE TABLE mytable2 (id INTEGER GENERATED BY DEFAULT AS IDENTITY,"
-                    + "  MYFIELD varchar(60),"
-                    + "  PFX varchar(1),"
+                    + "  MYFIELD varchar(60)," + "  PFX varchar(1),"
                     + "  numero integer" + ", PRIMARY KEY (pfx,numero));";
             statement.execute(q);
             statement.close();
@@ -106,8 +105,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
             conn = connectionPool.reserveConnection();
             Statement statement = conn.createStatement();
 
-            statement
-                    .executeUpdate("insert  into mytable2(myfield,pfx,numero) values ('COSTRUEDIL DI GAGLIOSTRO & C.SNC','C',6),('AUTOBUDA SRL','C',7),('CAFARELLI TINDARO AUTORICAMBI','C',8),('LARTE DEL MOBILE DI QUINTO CUTRI','C',9),('GRAPHIC DESIGN','C',10),('FOTI CARMELO','C',11),('MALAGRECA MICHELE OFF.ELETTR.','C',12),('CLIENTE NUOVO FRANCESCO','C',13),('LAROCCA ETTORE','C',14),('ALCAM SNC DI MARAFIOTI ALESSANDRO E','C',15),('EUROPA TYRES S.R.L.','C',16),('CROCE ROSSA ITALIANA COM.LOCALE','C',17),('RUGNETTA BRUNO','C',18),('BOSA VINCENZO TUTTO PER LA PESCA','C',19),('C.P.R.CENTRO POSE ROMEO','C',20),('VIOLI ORESTE  OFF.AUTOCARROZ.','C',21),('LIGATO SALVATORE','C',22),('DECORFORM DI IANNINO DARIO','C',23),('BEVI SUD DI DAGOSTINO GIUSEPPE','C',24),('BUSTE E CARTA DI GALLICO DARIO','C',25),('CELESTINO CRISAFULLI','C',26),('IMPRESA EDILE IS.AS.DI SALVATORE','C',27),('RASO GIUSEPPE','C',28),('EUROTECNICA 3A SAS DI ANELLO FRANC.','C',29),('EXO AUTOMOTIVE S.P.A.','C',30),('GHEA SISTEM S.R.L.','C',31),('AUTOTECNICA DI IANNELLI GIUSEPPE','C',32),('NATURAL SALUMI DI ARENA GIANCARLO','C',33),('LOIACONO PASQUALE & C. S.a.s.','C',34),('LONGO CLAUDIO','C',35),('CLASS SERVICING S.R.L.','C',36),('CADI SNC F.LLI MILASI','C',37),('MARTURANO FRANCESCO','C',38),('ARICOASSICUR.DI ARICOMARIATERESA','C',39),('','C',40),('SICILIANO FRANCESCO','C',41),('PREVITERA CATERINA ALIMENTARI','C',42),('AUTOFFICINA LUCAGIOVANNI','C',43),('NON UTILIZZARE','C',44),('','C',45),('SAFFIOTI MELO MACELLERIA GASTRON.','C',46),('MANGERUGA SERAFINO','C',47),('S.D.A. s.a.s.di Palmitessa Carlo','C',48),('IPER SCAVI S.R.L.','C',49),('','C',50),('FABBRICA ARTIGIANA LUIGI COLOMBO','C',51),('ELETTRO GLOBAL SERVICE DI ELIA','C',52),('FORTUNATO','C',53),('STEFANO BAJLO','C',54),('.','C',55),('FORTUGNO S.R.L.','C',56),('PARRELLO GIUSEPPE','C',57),('GAS E CUCINE DI SANTORO GIOVANNI','C',58),('LUPPINO MAURIZIO','C',59),('','C',60),('CHARTER LINE SAS','C',61),('CAMPAGNA GIUSEPPE EREDE DI CAMPAGNA','C',62),('TREBI DI BARBARO FRANCESCO','C',63),('COOPERATIVA SOCIALE ONLUS','C',64),('','C',65),('SASOL ITALY  S.P.A.','C',66),('AVATI ROCCO','C',67),('DOLCE FREDDO DI DAGOSTINO G.PPE','C',68),('GUERRERA FRANCESCO','C',69),('','C',70),('AGRICOLA PALMESE DI ARICO EMAN.&C.','C',71),('BORRELLO COSIMO TENDAGGI TAPPEZZ.','C',72),('DAMIANO PUTRINO OFF.MECC.','C',73),('CENTRO FORNITURE S.R.L.','C',74),('','C',75),('CLIENTE NUOVO FORTUNATO','C',76),('AVV.FERDINANDO DE LEONARDIS','C',77),('INSTALLAZIONE DI IMPINATI ELETTR.','C',78),('VIOLI PIETRO','C',79),('','C',80),('BASILE VINCENZO','C',81),('SAFFIOTI APPALTI & COSTRUZIONI','C',82),('SOC.COOP.MULTISERVICE MAMMOLA','C',83),('ARCH.TIZIANA GAGLIOTI','C',84),('','C',85),('GAGLIOTI SRL','C',86),('PINO MICHELE IMPRESA COSTRUZ.','C',87),('','C',88),('BORGESE GIUSEPPE','C',89),('','C',90),('PREVITERA SALVATORE','C',91),('PASTORE SRL','C',92),('OFF.LUCI CARMELO','C',93),('GIOFFRE CARMELO','C',94),('','C',95),('COGIMI S.R.L.','C',96),('CANTINE ZAGARI SNC','C',97),('ALBEDA IMPIANTI DI LOPRETE ANTONIO','C',98),('VETRARIA BRUTIA S.R.L. UNIPERSONALE','C',99),('COSTANZO TOTI','C',100),('GRASSO DAVIDE','C',101),('SGROMO BERNARDO','C',102),('PANIFICIO CIAPPINA','C',103),('ARCA INDUSTRIAL SUPPLIES S.R.L.','C',104),('','C',105),('ZUMBO DR.TOMMASO','C',106),('PUNTO SIDIS   DI SACCA PASQUALE','C',107),('BARRARA SALVATORE','C',108),('IMEX P-TRADE S.R.L.','C',109),('','C',110),('DOTT.AGR.VINCENZO CILONA','C',111),('PIANEGONDA DARIO S.A.S.','C',112),('DALOI GIUSEPPE AUTOFFICINA','C',113),('BARBARO MOTO SAS','C',114),('','C',115),('DE FRANCESCO VINCENZO','C',116),('RICAUTO SPA','C',117),('GERICO SAS','C',118),('GISMONDO VINCENZO','C',119),('','C',120),('IMPRESA COSTR.EUROEDIL DI MOIO F.SC','C',121),('SUD.INFORMATICA S.R.L.','C',122),('CRAZY MOBIL SNC DI GAGLIOTI G.PPE','C',123),('A.D.S.S.E. SRL DI RUGGIERO PACIFICO','C',124),('','C',125),('GRAMUGLIA VINCENZO','C',126),('LUIGI NIZZARI SUBAGENTE ALLIANZ SPA','C',127),('BRUZZESE ANNUNZIATA','C',128),('HOTEL STELLA MARIS  SRL','C',129),('','C',130),('ATRE EXPRESS SRL','C',131),('GATTO ANTONINO','C',132),('BO.GE.CO. S.R.L.','C',133),('VALENTINO TECNICA SNC','C',134),('','C',135),('NASO GIUSEPPE','C',136),('GALIBERTI LUCIANO STEFANO','C',137),('MURACE FRANCESCO','C',138),('GEOM.GIOFFRE SAVERIO','C',139),('','C',140),('PIANA PALMI MULTISERVIZI S.P.A.','C',141),('GOLDEN GROUP SNC','C',142),('DE CREA FORTUNATO','C',143),('LUPPINO MICHELE','C',144),('','C',145),('STILLITANO SRL','C',146),('FERREDIL DI MANUCRA GEOM.MARIO','C',147),('L & R LABORATORI E RICERCHE SRL','C',148),('EDIL SUD DI MALACRINOALESSIO G.','C',149),('','C',150),('FRESH BLU DI MELISSARI CETTINA','C',151),('BAGALA ROBERTO','C',152),('SERGI ROSALBA','C',153),('CO.MEC. DI VIOLI DOMENICO','C',154),('','C',155),('RADIO FRECCIA NET WORK','C',156),('GIOVINAZZO IPPOLITO','C',157),('ELECTRONIC CENTER DI ZAGARI ROSARIO','C',158),('EMPORIO ROGGIO GIUSEPPE','C',159),('','C',160),('CALAFIORE ANTONIO','C',161),('PARRELLO GIUSEPPE','C',162),('RUGGERI & PIAZZA SNC','C',163),('FRESCHEZZA IN TAVOLA DI FOTI ROSA','C',164),('','C',165),('AUGIMERI CARMINE AUTOFFICINA','C',166),('MATTIANI DOMENICO','C',167),('CALDERAZZO GIANCARLO','C',168),('ROMANIN ELVIO STUDIO COMMERCIALE','C',169),('','C',170),('G.TRIPODI SRL','C',171),('DEDMONDO FRANCESCO','C',172),('IDROCAR DI IANTORNO MARIO','C',173),('ZAGARI PAOLO IMP.ELETTRICI','C',174),('','C',175),('SELF AREA AGIP \"LA SOSTA S.A.S.\"DI','C',176),('MARKET MIMMO DI MAMMONE ANNA MARIA','C',177),('OSRAV ALFEO MORET S.P.A.','C',178),('A.S.PALLAVOLO PALMI','C',179),('','C',180),('GN.RISTRUTTUR.DI GANGEMI NICOLA','C',181),('ANNULLATO PRESO PER TRADE EVOLUT','C',182),('PULEIO PASQUALE','C',183),('ROTONDO S.R.L.','C',184),('','C',185),('DOMENICO ORTUSO & C. S.a.s','C',186),('FABIO PIERANGELI','C',187),('EDIL PALMI SAS di CRUCITTI F.SCO &C','C',188),('MLD LOGISTICA E DISTRIBUZIONE SRL','C',189),('','C',190),('HOTEL SANTA CROCE','C',191),('CUBA MOTOR','C',192),('CENTRO SERVIZI AUTO DI FURFARO','C',193),('TRAS PUGLIA DI SPINA GIUSEPPE','C',194),('','C',195),('LAMINAZIONE SOTTILE SPA','C',196),('FULCO DOMENICO OFFICINA','C',197),('DAMICO MICHELE AUTOFFICINA','C',198),('CAPRARI ADRIANO','C',199),('','C',200),('FARINA ANTONIO','C',201),('CALABROROSARIO DOMENICO','C',202),('NUOVA CASALAUTO DI CREPALDI GIAN','C',203),('AS TAUREANA CARS DI PALMA FEBBO','C',204),('REPACI TEODORO TRASPORTO MERCI','C',205),('GIEMME IMPIANTI DI IANNELLO MICHELE','C',206),('MUSICO S.R.L.','C',207),('GULLI CARMELO','C',208),('CASCIANO GIACOMO','C',209),('MARKET MARTURANO LETTERIO','C',210),('FOGLIARO FORTUNATO & C. SNC','C',211),('RAVAGLI VITTORIO FERRAMENTA UTENS.','C',212),('GRIMI AUTO DI GRIMI DOMENICO SNC','C',213),('BARONE DOMENICO','C',214),('RANUCCIO SONIA AZIENDA AGRICOLA','C',215),('A.B.COMPUTING DI BAGALAANTONIO','C',216),('GIOIA CAR SRL','C',217),('TOTO MONTAGGI DI MARINO ANTONIO G.','C',218),('GEOM.GIUSEPPE OLIVERI','C',219),('IMPRESA COSTR.EDILI CILONA G.PPE','C',220),('TERMOIDRAULICA DI TALLARIDA G.PPE','C',221),('RIGHETTINI EMANUELE','C',222),('CM INDUSTRIE SRL','C',223),('AUTOGOLD DI DE SANCTIS G.','C',224),('RIGON GIAN CARLO AUTOTRASPORTI','C',225),('IMPIOMBATO ANTONINO','C',226),('I.F.E.S.DI CUTRI GIUSEPPE','C',227),('COMPANIE DHOTELLERIE SUISSE SRL','C',228),('LARTE DEL FALEGNAME SNC','C',230),('AUTOSERVICE 2000 SAS','C',231),('SERVICE RICAMBI E ACCESSORI DI','C',232),('CAPPONE MICHELE LAV.VETRI','C',250),('COLELLA FRANCECSO','C',251),('LA PIANA SNC DI BARBARO ANGELINA','C',252),('SURACE GIANFRANCO','C',253),('EDIL CERAMICHE PALMI DI SCHIPILLITI','C',254),('AGOSTINO ROMEO SRL','C',260),('SGROFRANCESCO','C',261),('IMPRESA EDILE DI CERAVOLO GIUSEPPE','C',262),('FICARRA ROBERTO IMPRESA EDILE MOV.','C',263),('CAR SERVICE DI GALLO DANIELE','C',264),('LAGRICOLA DI BALDO FRANCESCO & C.','C',265),('ARENA VINCENZO','C',266),('ROMEO MARIA','C',267),('BERTIM EDILIZIA E COSTA SRL','C',268),('ITALIA TRASPORTI E LOGISTICA SRL','C',269),('STUDIO DI PROGETTAZIONE ARCHITETTO','C',270),('CALOGERO SALVATORE','C',271),('CANANZI AUTO','C',272),('OLEIFICIO BORGESE FILOMENA','C',273),('ASSOCIAZ.DI VOLONTARIATO PRESENZA','C',274),('IPO S.R.L.','C',275),('SMAC  SNC & C. DI MERCURI SALVATORE','C',276),('MODAFFERI MICHELE ELETTRAUTO','C',277),('ROMEO FORTUNATO','C',278),('BAR BRUZZESE FRANCESCO','C',279),('AUTOFFICINA MARCELLO GULLI','C',280),('SCAVA ROSARIO','C',281),('CASELLA DOTT.MARIO DOMENICO','C',290),('SAFFIOTI ROCCO','C',999),('POINT CAR SERVICE SAS','C',1000),('AUTORICAMBI PRAIA SAS DI UGO','C',3001),('AUTOF.CATANANTI DI DIBIANCO GIOV.NI','C',3002),('AUTOPIU DI GRIFFO V.&.C. sas','C',3003),('ARMENI AUTO DI ARMENI ANDREA & C.','C',3004),('LA BELLA ROBERTO','C',3005),('TERMOIDRAULICA DI IANNINO SOCCORSA','C',3006),('AUTOBUDA DI ZAPPIA ANTONELLA','C',3007),('BELCASTRO ROSARIO R.B.AUTOR.','C',3008),('PNEUSERVICE SRL','C',3009),('AUTOFORNITURE MILANESI SPA','C',3010),('ORTOLANI CARLUMBERTO','C',3011),('AZZARA CARMELO','C',3012),('AUTOSILA S.R.L.','C',3013),('ATTISANO MICHELE','C',3014),('AMMENDOLA GIUSEPPE','C',3023),('ANNULLATO AUTOPARTS DI FIEROMONTE T','C',3026),('CENT.TELEFONIA DE PASCALE DANIELA','C',3027),('TYRE HUNTER DI CANTISANI CARMINE','C',3028),('AUTOFFICINA AMMENDOLA DEMETRIO','C',3029),('CENTER CAR S.R.L.','C',3032),('MACELLERIA DI BARBERA FRANCESCO','C',3101),('BLEVIO PIETRO','C',3103),('AZIENDA AGRICOLA SURACE GIUSEPPINA','C',3104),('C.F.S.CARRELL FULL SERVICE DUE sas','C',3106),('IMPRESA COSTRUZ.GEOM.CIAPPINA F.SCO','C',3107),('BELLISSIMO ANTONIO','C',3108),('BARBARO GIUSEPPE  DITTA','C',3111),('BARILLARI GABRIELE AUTORICAMBI','C',3112),('BORGESE GIUSEPPE','C',3113),('BARA GIUSEPPE OFF.& RICAMBI','C',3114),('AUTO IARIA S.R.L.','C',3115),('TRIPODI GEOM.ANTONINO IMPRESA EDILE','C',3120),('BARRECA DEMETRIO','C',3129),('BOVA VINCENZO','C',3139),('BRUNO AUTORICAMBI S.a.s.','C',3145),('CILIONE & C. SRL','C',3200),('CANDIDO GIULIO','C',3202),('LUDDENI MARIO MARKET DEL RIC.','C',3205),('RIOTTO SAVERIO','C',3207),('MOTORSPORT DI CIRICOSTA G.PPE','C',3209),('CE.D.R.A. DI CUCUNATO NATALE','C',3211),('S.D.S. CARBURANTI S.A.S.','C',3215),('TURANO G.PPE & C.snc AUTORICAMBI','C',3216),('CILIONE CONSOLATO !! SOSPESO !!','C',3217),('PUGLIESE ERNESTO','C',3219),('CALABRO LORENZO','C',3220),('LAGANADOMENICO','C',3222),('ANNULLATO  INVIATO A TETI A.','C',3224),('AUTO SERVICE DI IOPPOLO G.GIULINO','C',3226),('TRIPODI FORTUNATO','C',3228),('COMEDIL DI P.SGRO & C. sas','C',3232),('SGROORLANDO AUTORICAMBI','C',3234),('DOTT.PALMIRO ZAPPONE','C',3236),('POLIRICAMBI SRLS','C',3240),('ROCCHETTO RENATO','C',3241),('CURRA ANTONINO','C',3242),('COLOSI FRANCESCO INFISSI IN','C',3244),('CUORE ANTONIO','C',3245),('GRAMUGLIA DOMENICO OFF.MECC.','C',3246),('CALIO srl RICAMBI AUTO','C',3248),('COZZA ELIO','C',3252),('OERRE PARTS S.R.L.','C',3257),('EURODIESEL DI CASSALIA MAURIZIO','C',3262),('@ 2X INSTALLAZIONI DI PUGLIESE A.','C',3263),('TECNO TRADE SRL','C',3265),('CROCCO FRANCO','C',3267),('CARTELLA MASSIMO','C',3269),('SCARMATO FORTUNATO','C',3275),('C.M.G. BRAM  SRL','C',3278),('CARONZOLO ROSARIO','C',3279),('CALIPARI SERAFINO','C',3286),('EDIL DORA DI BRUNO ROMEO','C',3294),('EXIDE TECHNOLOGIES SRL','C',3295),('IL TEMPIO DEL RIC.DI GIORDANO LUIGI','C',3301),('OFFICINA DE GRAZIA SAS','C',3302),('REGALI E SORRISI DI GUERRERA D.CO','C',3304),('UNIFLUID SUD SRL','C',3305),('CONSORZIO PDA','C',3307),('SURACE ROCCO','C',3308),('DITTA CILONA VINCENZO','C',3309),('DAGOSTINO AUTORICAMBI','C',3310),('DATTOLA AUTO & C. snc','C',3312),('DE NISI DOMENICO','C',3315),('IMPRESA COSTRUZ.SIMONETTA VINCENZO','C',3316),('AUTORICAMBI E ACCESSORI DI MARZIA','C',3317),('CHIAPPALONE ANNUNZIATO','C',3319),('EUROPA RICAMBI DI DE MARIA CARLO &','C',3320),('BRUZZESE FRANCESCO','C',3323),('DE GREGORIO SRL','C',3325),('LOGATTO VINCENZO V.L AUTORICAMBI','C',3326),('TARUSCIO GIOVANNI','C',3331),('TODARO SAVERIO','C',3334),('FERRARO LUIGI','C',3403),('AUTORICAMBI ERRIGO C.& C. S.A.S','C',3404),('PISANO GAETANO','C',3409),('AGRINOVA DI CORRADO NICOLA','C',3501),('FE e SA & C. DI SANTORO B. sas','C',3502),('CAR SHOP AUTORICAMBI','C',3503),('BRIGA LUCIANO','C',3504),('FIDALE GIACOMO & C.sas CAR SERVICES','C',3505),('FERRERO MASSIMILIANO IF.AUTORIC.','C',3506),('ASSOCIAZIONE RADIOAMATORI ITALIANI','C',3507),('FALBO ANTONIO','C',3508),('DAGOSTINO BIRRE DI GINO','C',3510),('FULLONE MARIO','C',3512),('EMMEDUE COSTRUZIONI','C',3514),('PALMCART OLIVERIO GIUSEPPE','C',3516),('BORGESE RANIERI & CLAUDIO SNC','C',3519),('FUTIA SALVATORE','C',3522),('FRANCHINA MASSIMILIANO Autoricambi','C',3523),('FUTIA DOMENICO Ricambi Auto','C',3525),('IMPRESA EDILE SCHIPILLITI V.ZO','C',3526),('MEDITERRANEA TRASPORTI SOC.COOP','C',3527),('AGENZIA LOGISTICA MERIDIONALE','C',3528),('RAGO UMILE RICAMBI-OFFICINA','C',3531),('SE.MA.C. SRL','C',3534),('IMPRESA EDILE GAGLIOSTRO V.ZO','C',3541),('FIGLIUZZI SALVATORE','C',3544),('FRAGOMENI DOMENICO','C',3548),('FIEROMONTE & CHIAPPALONE sas','C',3551),('F.T.R. F.LLI TRIULCIO SRL','C',3553),('GIORDANELLI SERGIO','C',3602),('F.LLI GUIDA sas','C',3603),('GRILLO GIUSEPPE','C',3604),('GALLO STANISLAO MANGIMI CONCIMI','C',3605),('COARSA SOC.CONS.IMP.SANLURESI SRL','C',3606),('PASCHOU MARIA','C',3607),('PELLEGRINO PIETRO ROCCO  AZIENDA','C',3608),('ROSANNA EX GRM RICAMBI','C',3609),('INDUSTRIA BOSCHIVA DICH.STEL.','C',3610),('GILBERTO DROGHETTI DOTT.','C',3611),('GALLE  NICOLA','C',3615),('EUROELETTRA S.N.C.DI NICOLOSI &','C',3616),('PALETTA ALBERTO AUTORIC.','C',3617),('GIOFFRE GIUSEPPE','C',3620),('PRINTING CENTER S.A.S.','C',3621),('SUD CARNI DI LEONELLO PASQUALE','C',3622),('GIOVINAZZO AUTORICAMBI','C',3623),('GENCARELLI GIUSEPPE','C',3627),('GRASSO FRANCESCO','C',3631),('GALLO GIOVANBATTISTA','C',3632),('CIESSEGI SNC DI CATOZZA MARIO & C.','C',3639),('AUTOMARKET DI PAPALIA ROBERTO','C',3646),('CENTRO RICAMBI DI MARINO & C.SNC','C',3700),('IMPRESA EDILE RECHICHI GIANCARLO','C',3701),('G.R.RICAMBI SRL','C',3704),('BRUZIA RICAMBI DI HRISCU CARMEN','C',3705),('AUTORIC.IANNI DI IANNI FRANCESCO','C',3706),('ITAL RICAMBI DI IAROPOLI V.& C.sas','C',3708),('INFORTUNA SANTO','C',3710),('IOVINE NICOLA','C',3711),('FILIPPONE ANTONINO','C',3712),('INFANTINO GIUSEPPE ELETTRAUTO','C',3717),('IDA RAG.ENZO','C',3719),('DE MASI PASQUALE DE.CA AUTORICAMBI','C',3800),('CANTIERI NAUTICI COSTA VIOLA','C',3803),('BG.CAFFE DI GIUSEPPE BALO','C',3805),('GUARASCIO LUIGI AUTORICAMBI','C',3806),('GIOFFREGAETANO','C',3807),('CENTRO AUTO MOTO DI LAGANA sas','C',3810),('LONGO CLAUDIO','C',3811),('LAGANA GIOVANNI','C',3814),('EDILDECORO DI FORTUGNO & SAFFIOTI','C',3815),('ATC DI PUGLIESE ALBERTO & C.SAS','C',3818),('LONDINO SERGIO','C',3822),('ANANIA ROCCO & GRILLO F.SCO SNC','C',3825),('FARMACIA FORGIONE DANIELA','C',3827),('AUTORICAMBI RAG.SAVERIO LAGAZZO','C',3828),('SERVICE AUTO SAS CENTRO REVISIONI','C',3829),('MASSARA NICOLA ACCESSORI PER AUTO','C',3832),('FANELLI GIOVANNI','C',3833),('LOIACONO GIUSEPPE','C',3835),('ANNULLATO UTILIZZATO PER IL WEB','C',3843),('ANNULLATO','C',3844),('AUTORICAMBI LAGANAROBERTO DI','C',3845),('ANNULLATO UTILIZZATO PER IL WEB','C',3846),('MELITO GIAMPIERO','C',3901),('MRC RICAMBI S.R.L.','C',3903),('MARONGELLI ANTONIO','C',3908),('MORELLO ANTONIO','C',3911),('M.A.I.R.S.AGATA DI DE BENEDETTO N.A','C',3912),('MONTELEONE MICHELE Autoricambi','C',3913),('FOTI PASQUALE','C',3914),('METALLURGICA RIVORALESE SPA','C',3915),('MARTINO DOMENICO','C',3917),('MALIZIA PASQUALE','C',3918),('DE SIBIO MECCANICA sas DI DESIBIO D','C',3924),('PUBBLIWORLD DI GULLO ANTONINO','C',3926),('MAZZITELLI & TASSONE S.N.C.','C',3927),('LANDRO AUTOMOBILI','C',3928),('MEZZATESTA ANTONIO','C',3931),('MOTOR SHOP Autoricambi sas','C',3932),('REPACI GIOVANNI','C',3933),('MERLINO CARMELO','C',3934),('ONESHOT S.A.S.','C',3935),('MANARITI GIUSEPPE','C',3936),('FESTA LEONA','C',3937),('CB SPECIAL COMPONENTS DI BERTOT','C',3939),('EDICOLA ARCURI LUCIA','C',3942),('LANDRO LEONE','C',3943),('COOPERATIVA REGGINA 08','C',3944),('MUZZI BRUNO','C',3952),('CAMERA ANTONIO','C',3957),('MAMONE GERARDO CENTRO RICAMBI AUTO','C',3961),('MALARA GIUSEPPE','C',3962),('R.C. TUNING DI LORENZO ANTIMO','C',3963),('MAIO CESARE','C',3966),('MACELLERIA LEONELLO SALVATORE','C',3967),('CAMERA DOMENICO','C',3972),('COZZOLINO SAVERIO AUTOPARTS','C',3976),('MARINO GABRIELE & F. sas','C',3978),('SYSTEM SUD SNC','C',3981),('MSC AUTOVEICOLI DI MUSICOARNALDO','C',4001),('GALATI ANTONIO AUTOTRASPORTI','C',4003),('NILAUTO srl','C',4004),('NUCERA FILOMENO','C',4007),('NUCERA MAURIZIO','C',4008),('OTTOBRE TRADE SRL','C',4205),('CONDOLUCI MARIA GIUSEPPA','C',4207),('PUGLIESE SALVATORE RICAMBI AUTO','C',4208),('NOVEMBRE ROSANNA MINUT.E MECC.','C',4210),('CABBOI GRAZIELLA','C',4212),('PETRONAS LUBRICANTS ITALY SPA','C',4213),('PERRI MIMMO','C',4215),('D.SSA ZAPPONE LILIANA','C',4222),('PUPO GIUSEPPE AUTORICAMBI','C',4226),('OFF.MECC.FRATELLI PIRILLI','C',4229),('RACO ELISABETTA RIF.TAMOIL','C',4230),('PICCOLO MARIO AUTORICAMBI','C',4232),('AUTORICAMBI VENTURA VINCENZO','C',4236),('TECNO EDIL DI VIOLA SANTO','C',4242),('PALMA AUTORICAMBI S.R.L.','C',4243),('PULIMENI ANTONIO & C. sas','C',4244),('PALERMO OLIVA Autoricambi','C',4246),('MAX MOTO DI PELLEGRINO M.A.','C',4249),('POLIMENI FRANCO','C',4256),('PEZZANO PIETRO','C',4261),('POLITI FRANCESCO Elettrauto','C',4263),('TROPEANO STEFANO RICAMBI AUTO','C',4303),('ROPERTO ALDO CENTRO COMMERC.RICAMBI','C',4304),('TENUTA GIANFRANCO AUTORICAMBI','C',4305),('F.LLI ROSE Snc di UMILE & FRANCO R','C',4308),('AUTORICAMBI RUGGIERO sas','C',4310),('VIOLA ERMANNO STAZ.SERV.ERG','C',4312),('R.AUTO IN snc','C',4313),('GOMMAUTO DI RODA & C. snc','C',4314),('DECA S.a.s. DI G.PPE DE PASCALI &C.','C',4318),('A.G.C.SRL','C',4320),('NUOVA RIMA DI CAPULA RAFFAELE','C',4324),('CRUCITTI GROUP SRL','C',4325),('INFORAMA DI DENISI V.ZO E C.SAS','C',4328),('EVALTO FRANCESCO & FIGLI','C',4401),('SCHIPANI RICAMBI','C',4404),('SPINA ALEXANDRO','C',4405),('SCUOLA CALCIO VIGOR PALMI 2004','C',4406),('SURIANO ALV SAS','C',4407),('AUDINO SAVERIO','C',4408),('SOBER RICAMBI AUTO sas','C',4409),('ROMEO VINCENZO & C. SNC','C',4411),('SAIM snc DI TAVELLA ANTONIA','C',4414),('SAINATO PASQUALE','C',4415),('SMEC SRL','C',4416),('F.LLI SINOPOLI snc Ric.Auto-Moto','C',4417),('F.LLI SPINELLI snc','C',4418),('AZ.AGR SORGES DI ROSA SORLETI','C',4420),('DUEMME S.A.S.','C',4421),('SPOLETO NUOVA AUTOACCESSORI','C',4422),('LOMBARDO DOMENICO FU GREGORIO','C',4423),('MULTISERVIZI M.G.D. DI PARRELLO','C',4427),('SCIARRONE SPA','C',4429),('SCRIVO ANTONIO','C',4432),('SERRATORE FRANCESCO','C',4440),('ANNULLATO UTILIZZATO PER IL WEB','C',4441),('LA BOTTEGA DEL RESTAURO DI FOTI R.','C',4442),('EREDI SURACE LORENZO di SURACE','C',4443),('S.D.R. sas','C',4446),('SAMA & CODISPOTI SAS','C',4451),('SCIONTI ROCCO Jr.','C',4452),('SOFI PAOLO','C',4454),('SISCA ANTONIO MECCANICO ARTIGIANO','C',4460),('ITALCOGE SPA','C',4463),('ANNULLATO TASSO SAL','C',4466),('BISCARDI LUIGI TUTTO PER LAUTO','C',4501),('B.P.SOLLEVAMENTI di ETTORE BELLINI','C',4502),('TROVATO AUTORIPARAZIONE','C',4506),('TASSONE PASQUALE','C',4514),('LA TIRRENICA DI CAPUA GIUSEPPE','C',4517),('TASSONE sas DI TASSONE GUERINO & C.','C',4521),('TASSO ANTONIO LEONE AUTORICAMBI','C',4522),('MAZZA ANDREA','C',4523),('TORCHIA ANGELO','C',4525),('TAVELLA ANTONIO','C',4533),('ANNULATO','C',4600),('VENTRA SAS di VENTRA VINCENZO & C.','C',4601),('VALOTTA FRANCESCO','C',4606),('VONO S.A.S. DI VONO G.& CO.','C',4607),('MEG DI ROMEO CARMELO','C',4611),('VENTRE AUTORICAMBI DI VENTRE G.PPE','C',4612),('TECHNO BUS SRL','C',4613),('LA FLAVIA DI FILIPPO SPINELLI','C',4614),('VRENNA LUCA MECC.& SICUREZZA','C',4615),('DELIZIE DI CALABRIA S.A.S DI ARENA','C',4621),('GENTILE FRANCESCO','C',4702),('ZICARELLI SALVATORE','C',4704),('ZAPPIA CARMELO','C',4705),('ATTENZIONE ! LA MECCANICA 2','C',5000),('EVA TECH S.A.S.DI DANIELE MEGALIZZI','C',5002),('RESTUCCIA ROSA RITA BOSCH CAR SERV.','C',5003),('PIMEC SRL','C',5004),('DAVIGIUSEPPE','C',5007),('VITETTA ANTONINO','C',5009),('STIL GOMMA DI NINO IANNELLI','C',5011),('ANNULLATO UTILIZZATO PER IL WEB','C',5017),('OFF.MECCANICA ROTONDO ANTONIO','C',5019),('COMBUSTION AND ENERGEY SRL','C',5020),('HOTEL RESIDENCE \"ARCOBALENO\"','C',5022),('BRANDO CARMELO','C',5024),('CASILE ROBERTO','C',5029),('AVVENTURA SOC.COOPERATIVA ARL','C',5035),('RA.DI SRL','C',5036),('CENTRO GOMME DI CONDINA GIOVANNI','C',5040),('JOLLY FRUTTA DI PAPASERGIO ANGELA','C',5043),('SURACE ANTONINO','C',5055),('FORTEBUONO METALLINFISSI S.r.l.','C',5056),('BAGALAGIUSEPPE','C',5057),('CASEIFICIO IL GRANATORE DI ZAGARI','C',5060),('RUSSO GAETANO AUTORICAMBI','C',5062),('RAFFAELI SRL','C',5073),('ALESSI PINA IMPRESA EDILE','C',5075),('ERREBI SRL','C',5076),('LA CORTE DELLA CARNE DI PEPPINO','C',5078),('MANOCCIO GENNARO','C',5084),('DE CARIA MOTORS SRL','C',5085),('DOTT.MARCELLO MELARA','C',5087),('F.LLI ATTISANO SRL ORTOFRUTTA','C',5088),('GIOFFRE PASQUALE','C',5089),('M.G. LOGISTIES SERVICES SRL','C',5091),('CONSORZIO ACQUEDOTTO VINA','C',5094),('MD COLLECTION DI MARRA DOMENICO','C',5100),('CRUCITTI SRL','C',5101),('VITALONE ROCCO OFF.MECC.','C',5102),('MOTORCYCLE & AUTO REPAIRS','C',5107),('QUASED SRL','C',5108),('CADI SERVICE S.A.S.','C',5110),('CO.DI.M. SRL','C',5114),('LEUZZI GIANCARLO','C',5115),('SCUTERI FRANCESCO','C',5116),('DI PINO TINDARO AUTORICAMBI','C',5117),('COMUNE DI SEMINARA','C',5123),('MATINA DOMENICO','C',5125),('ACCARDO ANNUNZIATO FILIPPO','C',5127),('BOLIGNANO ROBERTA DONATELLA','C',5131),('EVENTI FIORITI DI ROBERTA ANGALO','C',5132),('RAZIONALE ROSARIO HIPPONIO AUTO EL.','C',5133),('ERREMME di ROMEO DOMENICO MASSIMO','C',5134),('MAXICAR DI A.TRICOMI','C',5136),('MONTELEONE MARIA MADDALENA','C',5141),('REGGIORICAMBI DI MICHELANGELO','C',5142),('IL GENIO DEL PANE DI GARZO GREGORIO','C',5143),('ANNULLATO UTILIZZATO PER IL WEB','C',5144),('DAL MASO GIADOMENICO','C',5146),('RIZZITANO ANTONINO','C',5147),('MAURO AUTORICAMBI DI BADAMI MARIA','C',5150),('EDIL QUATTRO DI SAPONE G.& C. SNC','C',5151),('MARIA MADDALENA SICA','C',5163),('CILONA ANTONINO','C',5164),('MAGAZZU ARREDAMENTI','C',5165),('BORGESE VINCENZO','C',5166),('ARCHIMEDE DI MATTIANI PASQUALE','C',5169),('BAR RISTORANTE ULIVARELLA','C',5174),('CENTRO RICAMBI CALABRESI SNC    CRC','C',5178),('PINNERI ANTONINO','C',5179),('F.LLI SCORDAMAGLIA S.N.C DI F.SCO','C',5182),('PANUCCIO ING.DOMENICO IMPR.COSTRUZ.','C',5183),('LOMBARDO ALLESTIMENTI','C',5195),('BOSCHETTO FRANCESCO ELETTRAUTO','C',5198),('PONTECOPROGES SRL','C',5199),('G.C.SERVICE DI GAGLIOSTRO CARMELO','C',5203),('PELLICANO S.R.L.','C',5208),('MACELLERIA DA ROCCO DI PRONESTI','C',5209),('MAGNETI MARELLI AFTER MARKET PARTS','C',5210),('IL POLLICE VERDE DI FARFAGLIA','C',5212),('COMUNE DI PALMI','C',5215),('BARA MOTO DI BARA FABIO','C',5225),('SAFFIOTI MASSIMO EMILIANO','C',5226),('LOIACONO GIULIO','C',5231),('SETTECERZE VINCENZO','C',5232),('BAGNOLI ROBERTO ELETTRAUTO','C',5234),('ALAMPI SALAVATORE IMPRESA EDILE','C',5236),('PANETTA CARLO','C',5239),('MYPLANET SRL','C',5240),('AUTO 3 snc F.LLI ARTESI','C',5241),('MATTIANI GIUSEPPE','C',5243),('ASP N.5 DI REGGIO CALABRIA','C',5244),('CANNIZZARO GIUSEPPE','C',5246),('SORICAL SPA','C',5248),('ROSACE GIUSEPPE','C',5249),('MOTORSPORT SNC DI SALVATI G.PPE & C','C',5250),('SLESC-SCHITRY DI SCHIPILLITI C.LO','C',5251),('LAURENDI GIOVANNA','C',5252),('OFF.MECC.GANGEMI DOMENICO','C',5253),('CUSAN di SANTORO & C. snc','C',5256),('MAISANO MARIANNA EURORICAMBI','C',5259),('NICOLI SANTINO ASS.PIAGGIO','C',5260),('ELETTROSISTEM DI LAFACE GIUSEPPE','C',5261),('F.LLI CAPOGRECO snc','C',5263),('COSENTINO FRANCESCA','C',5264),('TERMINE CLAUDIO AUTORICAMBI','C',5266),('CHIRICO PAOLO','C',5267),('MERCURI VINCENZA','C',5268),('AZIENDA AGRICOLA BIVONE MARIA','C',5269),('ANDREARCHIO ALESSANDRO','C',5271),('SICILIANO PASQUALE','C',5272),('APEIRON S.A.S DI F.SCO BARONE & C.','C',5273),('STAR SERVICE PICCOLA SOC.COOP.ARL','C',5274),('ZOCCALI ANTONIO','C',5276),('CONDELLO MARCO ALIMENTARI','C',5278),('MARTINO PAOLO PIETRO','C',5279),('PRELIBATEZZE DI RITA ARICO','C',5280),('AMORUSO LUIGI SRL','C',5281),('MAZZULLO LUCIANO','C',5282),('POLIAUTO DI POLIZZO UMILE','C',5286),('RIGANOFRANCESCO','C',5289),('AMBROGIO GIUSEPPE','C',5290),('ISOTERM DI VIGLIANTE GEOM.D.CO','C',5296),('MACELLERIA MICHELE LUPPINO','C',5297),('MARTORANO PASQUALE','C',5299),('TECNOVIDEO DI LAGANA','C',5301),('ASSIST.RENAULT ARCISIACONO ORAZIO','C',5302),('AUTOSERVICE MINNITI S.A.S.','C',5305),('CRO.MAR TRONIC DI G.MARZULLO','C',5308),('CRD  SRL','C',5310),('VALENTE PNEUMATICI srl','C',5312),('SPADA AGOSTINO','C',5316),('RAMONDINO MARCO','C',5317),('SHOPSTORE SRL','C',5319),('LOIACONO ANNALISA','C',5321),('COLLURA ALESSANDRO','C',5324),('AP.RICAMBI DI PLUMARI ANTONINO','C',5325),('CENTRO DIAGNOSI DI GRAZIANO','C',5326),('MILITANO FRANCESCANTONIO','C',5327),('EUROSERVICE 2000 DI GIANLUCA CIMINO','C',5329),('CELESTI PIETRO ELETTRAUTO','C',5336),('AUTORICAMBI GABRIELE DI GABRIELE','C',5337),('JONICA RICAMBI SNC DI MUSCOLINO E','C',5338),('THE BEST AUTORIC.S.A.S.DI GALLO','C',5339),('VOLPE CARMELA OFF.RICAMBI AUTO','C',5341),('LOCCASIONE snc di PELLICANO P & C.','C',5342),('AZ.AGR.CARMELITANO MATTEO','C',5343),('PRISCOGLIO GIUSEPPE FRANCESCO','C',5344),('ANNULLATO INVIATO A motorline','C',5347),('PUTRINO DOMENICO STUDIO DI GEOLOGIA','C',5348),('CAPUTO NATALE AUTORIC.','C',5350),('SPORTAUTO di GAGLIOSTRO VINCENZO','C',5355),('ZERBI FABIO','C',5357),('ARICONATALE','C',5358),('VALOTTA LEOLUCA OFF.ELETTROMEC.','C',5360),('BARBARO CONCETTA LUCIA','C',5361),('PENNESTRILUIGI  OFF.MECC.','C',5364),('RETTIFICHE MANNINO SRL','C',5366),('SPAGNOLO DOMENICO','C',5373),('AUTORICAMBI DLC DI ABOSSIDA G&C sas','C',5375),('AMBROGIO DOMENICO','C',5376),('BENEDETTO STEFANO','C',5377),('NICOLETTA GIUSEPPE','C',5378),('ESSERICAMBI DI ANNA MARIA SCHIRRIPA','C',5379),('DOTT.DOMENICO FARERI','C',5383),('V.I.M.A.R. SAS','C',5384),('AUTORICAMBI \"RUGGERI\" DI C.&D.CAR','C',5385),('ICOREL DI IERACE ROBERTO','C',5386),('S.G.AVIATION SRL','C',5387),('SUPERMERCATO PRINCI SAS','C',5388),('CALABRIA LUCIANO AUTORICAMBI C.D.R','C',5389),('MISALE GIUSEPPE','C',5390),('LASCALA DOMENICO','C',5393),('DELIVERY EXPRESS DI NUCARA A.','C',5394),('CUCCI FERDINANDO AUTORICAMBI','C',5402),('LENTINI MONTEDORO AUTORICAMBI','C',5407),('BORGESE CARMELO','C',5408),('TECNOSTUDIO DI ZACCURI GIOVANNI','C',5409),('SOC.COOP.ARCOBALENO A.R.L.','C',5411),('DE.SAL.CAR. DI DE SALVO ROBERTO','C',5412),('PM 2 DI MILITANO NATALE','C',5416),('EURO CAR DI BARONE ANTONINO','C',5417),('ROSINA ANTONINO','C',5418),('PALMERI MICHELE','C',5419),('S.D.CAR DI SALVATORE DOMENICO','C',5421),('CENTRO RICAMBI MINNITI','C',5422),('A.B.S. AQUILA BROADCASTING SETS','C',5424),('EDIL CASA DI DANDREA DOMENICA','C',5427),('RICAMBI 2000 S.N.C. DI LAGONIA &','C',5428),('KRIOS AC S.R.L.','C',5429),('MUSICO ANTONINO','C',5430),('NSA NUOVI SERVIZI AUTO S.P.A','C',5432),('FRAMEL SRL','C',5433),('ANNUL.LA BELLA FRANCESCO','C',5434),('IMPIOMBATO ANTONIO','C',5435),('ALFIERI SALVATORE','C',5436),('PASTIFICIO LANTICO MULINO','C',5437),('RICAMBI INDUSTRIALI S.R.L.','C',5438),('ANNULLATO INVIATO A CARPOINT','C',5439),('BARBIERI AUTORICAMBI di COSMA','C',5440),('SGRO GIUSEPPE','C',5441),('GIOIA HOSPITAL','C',5442),('AUTORICAMBI MAMONE PEPPINO','C',5444),('LA SOSPENS LIDO DI GABRIELE PIETRO','C',5445),('MICHELE SURACE DOTT.COMMERCIALISTA','C',5446),('CERENZIA GAETANO','C',5447),('BARBARO CARMINE','C',5448),('CALANNI RINDINA SPRINT AUTORICAMBI','C',5449),('ALAMPI SANTO','C',5450),('GIDAR srl','C',5451),('MARTELLI GIUSEPPE','C',5452),('OFF.MECC.BARBERA MATTEO','C',5453),('MARIANO GAETANO RIC.OFF.GOMME','C',5454),('CANNISTRA FRANCESCO','C',5455),('PIZZINO GIUSEPPE','C',5456),('GRIPPAUDO VINCENZO','C',5457),('SCANDURRA TIZIANA DIMENSIONE AUTO','C',5458),('AUTOSHOP S.R.L.','C',5459),('AUTORICAMBI DIANA ROBERTO & C.SAS','C',5460),('OLIVERI FRANCESCO','C',5461),('COSENTINO VITTORIO','C',5462),('C&P CERTIFICAZIONI S.R.L..','C',5463),('AR.RICAMBI SNC ARUTA SALV.& SANDRO','C',5464),('MAZZA ANTONIO','C',5466),('GANGEMI GIUSEPPE','C',5467),('STUDIO LEG.AVV.PELLEGRINO PASQUALE','C',5468),('OLIVERIO GIOVANNI','C',5469),('CASTAGNA PASQUALE AUTORICAMBI GOMME','C',5470),('GRAFIA PUBLICITA DI CIPRI GIUSEPPE','C',5471),('SAIJA ANGELO','C',5472),('CILIBERTO RENATO','C',5473),('CATANZARO SALVATORE','C',5474),('EUROAUTO srl','C',5475),('AGENZ.VIAGGI E TURISMO DE NICOLA','C',5476),('LA CONCORDIA SNC','C',5477),('MACOS srl','C',5478),('SIC.COM. S.A.S.','C',5479),('DONATO DANIELE AUTOR.','C',5480),('TROPICAL FRUIT DI LUPPINO FRANCESCO','C',5481),('SCIARRONE VINCENZO RICAMBI','C',5482),('CLIMAUTO DI TRAPASSO GIUSEPPE SNC','C',5483),('DABATE ORAZIO C.R. CENTRO RICAMBI','C',5484),('LB RICAMBI AUTO SAS','C',5485),('FAR.O.L.RICAMBI srl           FAROL','C',5486),('CAPRINO ANTONIO AUTORICAMBI','C',5487),('MEGNA ANTONIO','C',5488),('MARINCOLO SERAFINO ELETTRAUTO','C',5489),('TECNORICAMBI SNC','C',5490),('PRESTIPINO SALVATORE','C',5491),('COSENTINO GIUSEPPE','C',5492),('SANTORO ANTONINO','C',5493),('R.S.STORE SRL','C',5494),('DE LUCA SERVICE DI DELUCA F.SCO SAS','C',5495),('AUTORICAMBI BRUNO SERGIO','C',5496),('INDUSTRIAL POINT S.R.L.','C',5497),('ANNULLATO PRESO PER IL WEB','C',5498),('MORABITO LEONARDO ITALRICAMBI','C',5499),('PENNA ANTONINO IMP.AGIP 8898','C',5500),('CARUSO ROCCO','C',5501),('COMPUTER & INTERNET DI FORTUNATO','C',5502),('IGRO SUD DI MERCURI GIANCARLO','C',5503),('PISANELLI SANTO','C',5504),('PISANO ANTONIO','C',5505),('RUFFO GELSOMINA GFC AUTORICAMBI','C',5506),('SUORE SALESIANE DEI SACRI CUORI','C',5507),('ALPA AUTO S.R.L.','C',5508),('ESPOSITO LORENZO','C',5509),('GAGLIOSTRO STEFANO','C',5510),('SIRIO AUTORICAMBI DI UFRASCATI G.','C',5511),('ELETTRAUTO AMATO FAUSTO','C',5512),('ALBANESE GIUSEPPE','C',5513),('ANNULLATO PRESO PER IL WEB','C',5514),('RI.A  S.R.L.','C',5515),('AUTOFORNITURE TINO DAGATE','C',5516),('GLORIOSO ADRIANO','C',5517),('AUTORICAMBI ITALIANO di CURCURUTO','C',5518),('AUTOFORNITURE GULLOTTA','C',5519),('MANGIARRATTI EMANUELE IDROTEC','C',5520),('DOMINICI SRL','C',5521),('C.R.A.E.di DI BENEDETTO PROVVIDENZA','C',5522),('SPADA CARMELA SRL','C',5523),('LOMBARDO GIUSEPPE','C',5524),('MANOLA SALVATORE SA.MA','C',5525),('FARACI RAFFAELE TUTTAUTO','C',5526),('AUTORICAMBI CIARCIA CARMELO','C',5527),('MESSINA GIUSEPPE','C',5528),('AUTORICAMBI MEGARA SNC','C',5529),('MOTORPOINT SRL','C',5530),('ANASTASI GIOVANNI','C',5531),('AUTORICAMBI G.S.di SCOZZARICARLO','C',5532),('MA.DI.DI snc AUTOMARKET 2000','C',5533),('R.A.V. DI SORRENTINO LUIGI S.A.S','C',5534),('SA.MA RICAMBI DI SALAFIA MAURO','C',5535),('O.R.A. SPALLITTA & C. snc','C',5536),('TUTTAUTO ALBERGHINA GIANFRANCO','C',5537),('VINCI CONCETTO AUTOTECNICA AUTOR.','C',5538),('ANULLATO UTILIZZATO PER IL WEB','C',5539),('GIANNUSO GIOVANNI','C',5540),('CE.RI. DI CATANIA BIAGIO & C. SAS','C',5541),('ILARDI MARGHERITA & C. SNC','C',5542),('PUNTO RICAMBI SRL','C',5543),('NIGRELLI LUIGI','C',5544),('A.R.A.T. DI MARIO DI GIOVANNI','C',5545),('DILIBERTO AUTORICAMBI','C',5546),('DI COSTA S.R.L.','C',5547),('C.R.SERVICE SRL','C',5548),('ALOISI ANTONIO','C',5549),('PAONE RICAMBI DI PAONE G. SAS','C',5550),('FERICAM DI PISU FEDERICO','C',5551),('SANTOCONO & C.  R.A.I.E.snc','C',5552),('VESPO SALVATORE','C',5553),('AUTORICAMBI MOTTA srl','C',5554),('GRASSO & FIGLI sas DI GRASSO D.e C.','C',5555),('VECCHI SNC','C',5556),('F.LLI CHIARAMIDA AUTORICAMBI sas','C',5557),('FUTURA RICAMBI DI SCACCIAFERRO','C',5558),('COSENTINO F.e G. snc','C',5559),('FENECH AUTORICAMBI srl','C',5560),('SAMMITO ANGELA','C',5561),('CENTRO RICAMBI SRL','C',5562),('AUTORICAMBI STRANO SRL','C',5563),('SURIANO PAOLO','C',5564),('AUTORICAMBI GLORIOSO srl','C',5565),('VECAM DI OLIVELLI VENERANDO E C.snc','C',5566),('MEC.CARS RICAMBI DI SCIALFA G.PPE','C',5567),('PENNISI AUTO DI G.PENNISI','C',5568),('AUTORICAMBI MAGGIO GIUSEPPE','C',5569),('GRILLO NICOLA AUTOFORN.','C',5570),('AUTORICAMBI TROGYLOS SRL','C',5571),('PRIVITERA STEFANO','C',5572),('AUTOFFICINA M.A.&.V  S.a.s di OSCAR','C',5573),('IEMMOLO VINCENZO','C',5574),('GENNUSA GIUSEPPE AUTORICAMBI','C',5575),('C.R.A. Snc di Salvatore Tanasi & C.','C',5576),('F.LLI MUSARRA sas','C',5577),('S.G.R. DI ROSANO V.ZO & C. sas','C',5578),('ADAMO ROBERTO','C',5579),('ELIOS AUTORICAMBI SRL','C',5580),('DIEMME SRL','C',5581),('NUZZO FILIPPO','C',5582),('AUTOR.FISICARO DI FISICARO FILIPPO','C',5583),('CENTRO RICAMBI DESARI GIUSEPPE','C',5584),('AUTORIC.PROFETA DI PROFETA ONOFRIO','C',5585),('MARTUCCI REMO AUTORICAMBI','C',5586),('CHECKS SRL','C',5587),('AUTOETNA DI INTRESSALVI M.& C. snc','C',5588),('FRICANO ROBERTO & C.RI.AS.sas','C',5589),('GAGLIARDI VALENTINO','C',5590),('MICIELI SALVATORE SNC','C',5591),('GIARDINA GIOVANNI','C',5592),('BOCCHIARO GIUSTO & C. snc','C',5593),('R.D.C. DI VALERIA FILI','C',5594),('PALAZZOLO GIUSEPPE','C',5595),('CARILLO MARTINO AUTORICAMBI','C',5596),('AUTORIC.FAVUZZA SOC.COOP.','C',5597),('F.LLI RUSSO DI GAETANO RUSSO & C','C',5598),('DI.R.MEC SRL','C',5599),('AUTOCOMPONENTI COSENTINO','C',5600),('OLIVERI FRANCESCO AUTORICAMBI','C',5601),('PULIZZI GIOACCHINO','C',5602),('AUTORICAMBI RIITANO DOMENICO','C',5603),('FARRUGGIO BIAGIO','C',5604),('DISTEFANO M.& PELLEGRINO A. S.N.C.','C',5605),('SORTINO S.r.l.','C',5606),('B.R.M. di MARINELLI G.PPE & C. snc','C',5607),('C.A.R. DI CAMPISI ISABELLA','C',5608),('ARENA SRL','C',5609),('AUTOMECHANIKA SRL','C',5610),('PRECAV S.N.C. DI CAVALLARO ROSARIO','C',5611),('COIR srl','C',5612),('DI BELLA SERVICE','C',5613),('GARDEN BAR RACITI PAOLA & C. SNC','C',5614),('TUTTORICAMBI snc DI MUSCIA V.& G.','C',5615),('RICAS RICAMBI E ACCESSORI DI','C',5616),('DI PIETRO AUTOSERVICE DI PIETRO C.','C',5617),('EUROPARTIAUTO DI COCO CARMELO','C',5618),('AUTORICAMBI ODDO CARMELO','C',5619),('LAUTORICAMBI SRL','C',5620),('CUNSOLO MARIO AUTORICAMBI','C',5621),('AUTORICAMBI GRECO FINA','C',5622),('CORRADO CASALE SNC','C',5623),('R.A.I.A.R. srl','C',5624),('CASA DEL RADIATORE','C',5625),('CENTRO CLIMA SNC','C',5626),('SCARLATO SALVATORE ELETTROCAR','C',5627),('VIOLA FRANCESCO','C',5628),('CENTRORICAMBI NIGRO srl','C',5629),('MASTROGIOVANNI SRL','C',5630),('F.LLI PIZZA SNC','C',5631),('VIOLI CARLO','C',5632),('AVV.CARMELA CLEMENTE','C',5633),('DE CARIA ROCCO AUTORICAMBI','C',5634),('DIESEL TRUCKS DI SCADUTO ANGELO','C',5635),('MESSINA FILIPPO AUTORICAMBI','C',5636),('ERRECI DI RAFFAELE CANTAFIO','C',5637),('DOTT.GIUSEPPE FAVIA GUARNIERI SRL','C',5638),('ROSSETTI ALESSANDRO','C',5639),('STAZIONE DI SERVIZIO MANGANI','C',5640),('RONDINELLI GIOVANNI BATTISTA','C',5641),('DALTORICAMBI SRL','C',5642),('CORDIANO MARCELLO','C',5643),('EURORICAMBI DI TUSCIANO GIUSEPPE','C',5644),('AUTORIPARAZIONI IORI SNC.DI GRASSI','C',5645),('RI.CAR. srl','C',5646),('CAPPARELLI FRANCESCO','C',5647),('TUTTO MARMITTE DI BORSELLINO TANINA','C',5648),('PUGLIESE ANTONINO','C',5649),('AUTOFFICINA FUDA DI','C',5650),('TUTTO RICAMBI DI PRIOLO MARCO','C',5651),('LUCKY BAR RUGARI & GALLETTA S.A.S','C',5652),('ROCCAFORTE EURORICAMBI','C',5653),('CENTRO MIDAS REGGIO CALABRIA','C',5654),('BELLANTONI VINCENZO','C',5655),('AUTOFFICINA MISIANO SALVATORE','C',5656),('DEMASI GIUSEPPE','C',5657),('DIESELTRUCK DI ALFANO FABIO','C',5658),('ARIGANELLO MASSIMO AUTORICAMBI','C',5659),('MI.RA. RICAMBI SAS           MIRA','C',5660),('AGF SICILIA srl','C',5661),('MOLISE RICAMBI di A.Tamburri SNC','C',5662),('GARANZIA EUROPA GROUP SPA','C',5663),('FORESTIERI BRUNO ITALTRONYC','C',5664),('MORABITO VITO','C',5666),('MORABITO SALVATORE','C',5667),('LA MECCANICA SRL','C',5668),('GENNARO CACCIAPUOTI','C',5669),('PALAMARA GIUSEPPE PIT STOP','C',5670),('POLITO CARBURANTI DI ROCCO POLITO','C',5671),('STAZ.SERV.AGIP DI FRUCI GIUSEPPE','C',5672),('MARTINO SRL','C',5673),('SCHIPANI MARIANGELA AUTORICAMBI','C',5674),('AUTO VIP SRL','C',5675),('VECCHI GIUSEPPE RICAMBI','C',5676),('FARNO FULVIO & S. snc','C',5677),('CIRIMELLI AUTORICAMBI DI SAVERIO P.','C',5678),('IL CANNETO TAMOIL DI POLITO A. SAS','C',5679),('CARDINALE AUTOMOBILI SRL','C',5680),('D.R.A.M. snc','C',5681),('MANCUSO ILARIA AUTORICAMBI','C',5682),('COTRONEO DOMENICO','C',5683),('GRANATA F.CO F.G. AUTORICAMBI','C',5684),('RE.MA.DI ESPOSITO R.& BELSITO M.SRL','C',5685),('STAZ.SERV.AGIP DI BAGNATO SALVATORE','C',5686),('CAMMILLERI GAETANO AUTO GT','C',5687),('AGRILU DI MALVASI LUCIA','C',5688),('R.G. di ROSARIO GAROFOLO','C',5689),('AUTOELETTRONICA F.LLI DOMINICI snc','C',5690),('MELI CAR RENTALS LTD','C',5691),('RF srl','C',5692),('RUSSO GIUSEPPE','C',5693),('FALCONE FRANCESCO','C',5694),('STEFANELLI DOMENICO','C',5695),('GR srl','C',5696),('DIMENSIONE AUTO SRL','C',5697),('LATTANZIO DONATELLA','C',5698),('AUTOCOM SRL','C',5699),('GIORDANO SALVATORE OFF.CHEVROLET','C',5700),('CO.R.A.R.09 SRL','C',5701),('TRIMARCAR AUTORIC.DI MACRI PALMA','C',5702),('VIOLAUTO SRL','C',5703),('G.& V.POLICASTRI SNC','C',5704),('A.G.S.RICAMBI SRL','C',5705),('FLORI MOTORI SRL unipersonale','C',5706),('CUCINOTTA ANGELO AUTORICAMBI','C',5707),('ARCURI MARCELLO AUTORICAMBI','C',5708),('GAMMA RICAMBI SRL','C',5709),('VIOLA VINCENZO AUTORICAMBI','C',5710),('BELLOCCO RAFFAELE','C',5711),('BELCASTRO ANGELO ACCESSORI','C',5712),('SAFFIOTI CARMELO IMPRESA EDILE','C',5713),('A.M.RICAMBI DI ESPOSITO S.','C',5714),('3C RICAMBI DI COLAPRISTI VINCENZO','C',5715),('SURACE AUTO DI SURACE ROCCO','C',5716),('DIEMME SRL','C',5717),('F.LLI SCANGA SRL','C',5718),('ARTE FERRO DI ROSARIO BAGNATO','C',5719),('AUTORIC.CHIURCO DI LORICCHIO V.ZO','C',5720),('TIRRENO SNC.DI LUCCHESE V.ZO','C',5721),('CO.GE.TECH SRL','C',5722),('SALADINI SRL','C',5723),('TURANO ARMANDO','C',5724),('G.E.S.T. AUTORICAMBI SRL','C',5725),('CONDO ANTONIO','C',5726),('PUNTO MARMITTE DI FERRARA DOMENICO','C',5727),('INTERNAZIONALE RICAMBI SRL','C',5728),('A.A.R. DI CURCIO VINCENZO','C',5729),('RIC.PIAGGIO F.LLI SERGI DI SERGI G.','C',5730),('LAURITO GIUSEPPE AUTORICAMBI','C',5731),('AUTORICAMBI TRE A DI A.LUZZI','C',5732),('VISCOMI AGOSTINO','C',5733),('GROUP ECO ITALIA SRL','C',5734),('MESITI LUCA','C',5735),('AUTORICAMBI SCHIRRIPA SAS','C',5736),('TRUSCELLI ANTONIO','C',5737),('AUTORIC.GODINO DI MENDICINO LORETTA','C',5739),('MICHELE CAROLI SRL','C',5741),('CIRIA ALESSIO AUTORICAMBI','C',5742),('F.LLI LORENTI RICAMBI AUTO SRL','C',5743),('R.S.RICAMBI DI ROBERTO SGAMBELLURI','C',5744),('ARCURI SISTINO AUTORICAMBI','C',5745),('2V CAR PARTS DI VALERIO MACRI','C',5746),('BARILLARI GIUSEPPE AUTORICAMBI','C',5747),('AUTORICAMBI COSENTINO SRL uniperson','C',5748),('EURORICAMBI SRLS','C',5749),('AUTORICAMBI 2G DI GIANFRANCO GARUFI','C',9002),('A.R.A. RICAMBI VENETICO srl','C',9005),('BELLANTONI DOMENICO','C',9034),('BASILE SANTO','C',9036),('AUTORICAMBIFOX DI FOSSATI MATTEO','C',9062),('GRANDI RICAMBI DI GRANDI SIMONE','C',9070),('CARUSO CALOGERO','C',9071),('CALDERONE PAOLO FRANCESCO','C',9074),('GAGLIO GIUSEPPE Ricambi Auto e Acc.','C',9185),('GIORGIANNI AUTORICAMBI S.N.C.','C',9190),('SAPORITO MASSIMO LAUTORICAMBIO','C',9284),('LOMBARDO SANTO','C',9285),('MICALI GIOVANNI','C',9324),('MERLINO ANTONINO','C',9331),('MILONE GIUSEPPE','C',9352),('CENTRO AUTO DI TRAMONTANO','C',9380),('PINTAUDI ROCCO','C',9422),('AUTORICAMBI DI PINO SRL','C',9475),('SETTIMO GIOVANNI','C',9502),('SANFILIPPO GIUSEPPE','C',9505),('STURNIOLO ANTONINO Elettrauto','C',9507),('SUD RICAMBI snc DI GUGLIOTTA C.& C.','C',9508),('SPRINT CAR AUTORICAMBI DI GRECO A.','C',9511),('GIORGIO FRANCESCO','C',9534),('TRIFILO FILIPPO TUTTO AUTORICAMBI','C',9537),('RIGGIO GIUSEPPE & C. SNC','C',9620),('CORRISPETTIVI','C',999999),('','F',0),('SAFFIOTI CARMELO SNC','F',1),('TRENTINELLA FRANCESCO','F',2),('PRINTING.CENTER','F',3),('MAZZULLO FORTUNATO','F',4),('MGG ITALIA S.R.L. GRUPPO IMCO','F',5),('GLS GENERAL LOGISTICS SYSTEMS','F',6),('CIFANI SRL','F',7),('BARTOLINI spa','F',8),('ITALIA RECAPITI S.R.L','F',9),('UNI EURO S.P.A','F',10),('FORMAT S.A.S. DI PISCOPO ANTONIO &C','F',11),('GIAMMARRESI NICOLO','F',12),('CANNATA VINCENZO srl','F',13),('GRIMAS srl Etichette','F',14),('CONSORZIO ASSORICAMBI','F',15),('B.C.R. srl','F',16),('CADI snc F.LLI MILASI','F',17),('JET EXPRESS srl CORRIERE ESPRESSO','F',18),('PAPERNET SPA','F',19),('FIAMMA DI A.SEMINARA','F',20),('COSTANZO SALVATORE','F',21),('MONDOFFICE SRL','F',22),('SOF.INN. INFORMATICA srl','F',23),('G.TRIPODI SRL','F',24),('ARMES SPA','F',25),('J-SOFTWARE SRL','F',26),('SARITEL','F',27),('SDA  EXPRESS COURIER','F',28),('TRASPORTI PE.CAM','F',29),('CONSOZIO PDA','F',30),('OPITERGINA MARMITTE DI NESPOLO','F',31),('SCATOLIFICIO VENETO S.R.L.','F',32),('AUTOCOM SRL','F',33),('LT SRL LOGISTICA E TRASPORTI','F',34),('FUTIA DOMENICO','F',35),('SETEFI  SPA   GRUPPO INTESABCI','F',36),('ELPIDA D.O.O.','F',37),('I.F.R. DI MAURIZIO ROMANO','F',38),('CRUCITTI SRL','F',39),('GRAFICAJONICA SNC','F',40),('PANALPINA TRASP.MOND.SPA','F',41),('ARUBA SPA','F',42),('ENGINET SRL','F',43),('POLIGRAFICO SRL','F',44),('SERIBAG DI ZAGARI DANIELA','F',46),('PISANI FRANCESCO & FIGLI SPA','F',50),('INGROSUD DI PRATICO ANTONIO','F',51),('MEDIA WORLD COMPRA ON-LINE','F',53),('PM2 DI MILITANO NATALE','F',58),('RAG.PARISI GIUSEPPE','F',60),('REDOIL ITALIA spa','F',64),('BARBARO SPORT S.A.S.','F',75),('KRIOS  A.C. srl','F',83),('SERFEM DI SERGIO FEMIA','F',86),('SOVEB AUTO SRL','F',90),('SUSA TRASPORTI SPA','F',93),('SDA sas DI PALMITESSA (UNIGOM)','F',94),('NOTAIO MARCELLA CLARA RENI','F',96),('AB ELETTROSISTEMI','F',97),('SOCET srl  (TOTAL)','F',100),('DELIVERY EXPRESS','F',101),('TAZZETTI GUIDO & C. SPA Div.ACR','F',102),('COMPUTER ASSIST S.A.S. DI RUFFOLO','F',103),('ALDASA DI FRANCO SILENO','F',104),('STUDIO LEGALE AVV.GIULIANA METE','F',105),('TRIONE RICAMBI S.P.A','F',107),('RICAMBIFLEX GM srl','F',110),('CASA DEL RICAMBIO SRL','F',111),('LEONARDO SNC DIGITAL STUDIO','F',112),('MUSICO MACCHINE AGRICOLE','F',115),('ROBERT BOSCH spa','F',116),('C.B.F. BALDUCCI SPA','F',117),('ENGINE COMPONENTS srl GLASER','F',118),('SEAL-TECH SRL','F',119),('SMAT NORD srl','F',120),('RIVOIRA S.P.A','F',121),('BRENTA SRL','F',122),('RAPISARDA CARLO CARMELO','F',123),('CIEFFEBI TRASPORTI','F',124),('CAST BOLZONELLA S.A.S.','F',125),('EURODECOS S.R.L.','F',126),('DALTORICAMBI SRL','F',127),('LUBEX S.P.A.','F',128),('ITALTRADE SRL','F',129),('SAMAUTO SPA','F',130),('FRAP srl','F',135),('SOGEFI FILTRATION SPA','F',140),('UNIPART NV INTERNATIONAL RADIATOR','F',145),('EXIDE ITALIA SRL','F',150),('IBS SRL','F',155),('ASSOMARMITTE SRL','F',160),('IPS PARTS SRL','F',165),('OSRAV ALFEO MORET SPA         DAMPO','F',170),('EXO AUTOMOTIVE SPA  REMSA-OPENPARTS','F',175),('KAYABA ITALY GmbH','F',180),('SALADINI SRL','F',185),('CARTIERA LUCCHESE SPA (LUCART)','F',190),('TIRRENA IMPEX SRL','F',195),('FAAL BATTERIE SRL','F',200),('NRF ITALIA SRL','F',205),('DICRA SPA','F',210),('MECARM srl','F',215),('LEART-DIVISIONE EUROLITES SPA','F',1202),('EUROLITES S.P.A     ARIC','F',1203),('MORONI CESARE & C. snc','F',1307),('M.T.S. spa','F',1310),('MAGNETI MARELLI AFTERMARKET AND SER','F',1323),('MALO spa','F',1329),('NEWFREN SPA','F',1401),('OLYMPIA srl','F',1501),('F.LLI TRIPODI  SNC','F',1502),('FL.ITALIA srl OLEOBLITZ','F',1505),('OSRAM spa','F',1507),('PHILIPS SPA','F',1602),('DAYCO EUROPE SRL','F',1605),('RICAUTO SPA','F',1804),('R.M.S. S.P.A.','F',1817),('COMMERCIALE LUCANA snc','F',1901),('ENZO PARISI S.R.L.','F',1902),('SIOM S.R.L.','F',1908),('SIA INDUSTRIA ACCUMULATORI spa','F',1914),('SIMAKA','F',1923),('SITO GRUPPO INDISTRIALE spa','F',1935),('TOMAS RENATO & BRUNO sas','F',2001),('UMMAC srl','F',2201),('VEMA srl','F',2306),('VALEO SERVICE ITALIA S.P.A.','F',2308),('WD-40 COMPANY LTD','F',2309),('A.C.S. DI CORDOVANA SALVATORE','F',3101),('DELTA SERVICE snc','F',3103),('AUTOFORNITURE MILANESI spa','F',3104),('AGIP PETROLI ( Agenzia RC )','F',3105),('ARSAUTO SRL','F',3110),('AREXONS DIVISIONE DI FL SELENIA SPA','F',3116),('BOSATTA F.LLI \"F.B.\"srl','F',3201),('BIFFI & PREMOLI srl','F',3205),('BERGAMASCHI & F. spa','F',3213),('F.G.WOLF SRL','F',3302),('C.D.A. spa','F',3303),('CENTAURO srl','F',3307),('CASA DEL BULLONE sas','F',3311),('ORIGINAL BIRTH spa','F',3314),('FORTEBUONO METALLINFISSI SRL','F',3321),('C.C.R. srl CENTRO CUSCINETTI','F',3325),('CRAMER SRL','F',3328),('TOMMASELLI srl','F',3401),('DELLORTO spa','F',3403),('FEDERAL MOGUL ITALY SRL','F',3408),('F.A. ITALIA snc','F',3620),('FODONE sas','F',3621),('GUARNITAUTO spa','F',3707),('G.V.S. DI SALA RINALDO','F',3718),('PRES-SING S.A.S.','F',3906),('CODICI ANNULLATI','F',9999),('','F',999999);");
+            statement.executeUpdate(
+                    "insert  into mytable2(myfield,pfx,numero) values ('COSTRUEDIL DI GAGLIOSTRO & C.SNC','C',6),('AUTOBUDA SRL','C',7),('CAFARELLI TINDARO AUTORICAMBI','C',8),('LARTE DEL MOBILE DI QUINTO CUTRI','C',9),('GRAPHIC DESIGN','C',10),('FOTI CARMELO','C',11),('MALAGRECA MICHELE OFF.ELETTR.','C',12),('CLIENTE NUOVO FRANCESCO','C',13),('LAROCCA ETTORE','C',14),('ALCAM SNC DI MARAFIOTI ALESSANDRO E','C',15),('EUROPA TYRES S.R.L.','C',16),('CROCE ROSSA ITALIANA COM.LOCALE','C',17),('RUGNETTA BRUNO','C',18),('BOSA VINCENZO TUTTO PER LA PESCA','C',19),('C.P.R.CENTRO POSE ROMEO','C',20),('VIOLI ORESTE  OFF.AUTOCARROZ.','C',21),('LIGATO SALVATORE','C',22),('DECORFORM DI IANNINO DARIO','C',23),('BEVI SUD DI DAGOSTINO GIUSEPPE','C',24),('BUSTE E CARTA DI GALLICO DARIO','C',25),('CELESTINO CRISAFULLI','C',26),('IMPRESA EDILE IS.AS.DI SALVATORE','C',27),('RASO GIUSEPPE','C',28),('EUROTECNICA 3A SAS DI ANELLO FRANC.','C',29),('EXO AUTOMOTIVE S.P.A.','C',30),('GHEA SISTEM S.R.L.','C',31),('AUTOTECNICA DI IANNELLI GIUSEPPE','C',32),('NATURAL SALUMI DI ARENA GIANCARLO','C',33),('LOIACONO PASQUALE & C. S.a.s.','C',34),('LONGO CLAUDIO','C',35),('CLASS SERVICING S.R.L.','C',36),('CADI SNC F.LLI MILASI','C',37),('MARTURANO FRANCESCO','C',38),('ARICOASSICUR.DI ARICOMARIATERESA','C',39),('','C',40),('SICILIANO FRANCESCO','C',41),('PREVITERA CATERINA ALIMENTARI','C',42),('AUTOFFICINA LUCAGIOVANNI','C',43),('NON UTILIZZARE','C',44),('','C',45),('SAFFIOTI MELO MACELLERIA GASTRON.','C',46),('MANGERUGA SERAFINO','C',47),('S.D.A. s.a.s.di Palmitessa Carlo','C',48),('IPER SCAVI S.R.L.','C',49),('','C',50),('FABBRICA ARTIGIANA LUIGI COLOMBO','C',51),('ELETTRO GLOBAL SERVICE DI ELIA','C',52),('FORTUNATO','C',53),('STEFANO BAJLO','C',54),('.','C',55),('FORTUGNO S.R.L.','C',56),('PARRELLO GIUSEPPE','C',57),('GAS E CUCINE DI SANTORO GIOVANNI','C',58),('LUPPINO MAURIZIO','C',59),('','C',60),('CHARTER LINE SAS','C',61),('CAMPAGNA GIUSEPPE EREDE DI CAMPAGNA','C',62),('TREBI DI BARBARO FRANCESCO','C',63),('COOPERATIVA SOCIALE ONLUS','C',64),('','C',65),('SASOL ITALY  S.P.A.','C',66),('AVATI ROCCO','C',67),('DOLCE FREDDO DI DAGOSTINO G.PPE','C',68),('GUERRERA FRANCESCO','C',69),('','C',70),('AGRICOLA PALMESE DI ARICO EMAN.&C.','C',71),('BORRELLO COSIMO TENDAGGI TAPPEZZ.','C',72),('DAMIANO PUTRINO OFF.MECC.','C',73),('CENTRO FORNITURE S.R.L.','C',74),('','C',75),('CLIENTE NUOVO FORTUNATO','C',76),('AVV.FERDINANDO DE LEONARDIS','C',77),('INSTALLAZIONE DI IMPINATI ELETTR.','C',78),('VIOLI PIETRO','C',79),('','C',80),('BASILE VINCENZO','C',81),('SAFFIOTI APPALTI & COSTRUZIONI','C',82),('SOC.COOP.MULTISERVICE MAMMOLA','C',83),('ARCH.TIZIANA GAGLIOTI','C',84),('','C',85),('GAGLIOTI SRL','C',86),('PINO MICHELE IMPRESA COSTRUZ.','C',87),('','C',88),('BORGESE GIUSEPPE','C',89),('','C',90),('PREVITERA SALVATORE','C',91),('PASTORE SRL','C',92),('OFF.LUCI CARMELO','C',93),('GIOFFRE CARMELO','C',94),('','C',95),('COGIMI S.R.L.','C',96),('CANTINE ZAGARI SNC','C',97),('ALBEDA IMPIANTI DI LOPRETE ANTONIO','C',98),('VETRARIA BRUTIA S.R.L. UNIPERSONALE','C',99),('COSTANZO TOTI','C',100),('GRASSO DAVIDE','C',101),('SGROMO BERNARDO','C',102),('PANIFICIO CIAPPINA','C',103),('ARCA INDUSTRIAL SUPPLIES S.R.L.','C',104),('','C',105),('ZUMBO DR.TOMMASO','C',106),('PUNTO SIDIS   DI SACCA PASQUALE','C',107),('BARRARA SALVATORE','C',108),('IMEX P-TRADE S.R.L.','C',109),('','C',110),('DOTT.AGR.VINCENZO CILONA','C',111),('PIANEGONDA DARIO S.A.S.','C',112),('DALOI GIUSEPPE AUTOFFICINA','C',113),('BARBARO MOTO SAS','C',114),('','C',115),('DE FRANCESCO VINCENZO','C',116),('RICAUTO SPA','C',117),('GERICO SAS','C',118),('GISMONDO VINCENZO','C',119),('','C',120),('IMPRESA COSTR.EUROEDIL DI MOIO F.SC','C',121),('SUD.INFORMATICA S.R.L.','C',122),('CRAZY MOBIL SNC DI GAGLIOTI G.PPE','C',123),('A.D.S.S.E. SRL DI RUGGIERO PACIFICO','C',124),('','C',125),('GRAMUGLIA VINCENZO','C',126),('LUIGI NIZZARI SUBAGENTE ALLIANZ SPA','C',127),('BRUZZESE ANNUNZIATA','C',128),('HOTEL STELLA MARIS  SRL','C',129),('','C',130),('ATRE EXPRESS SRL','C',131),('GATTO ANTONINO','C',132),('BO.GE.CO. S.R.L.','C',133),('VALENTINO TECNICA SNC','C',134),('','C',135),('NASO GIUSEPPE','C',136),('GALIBERTI LUCIANO STEFANO','C',137),('MURACE FRANCESCO','C',138),('GEOM.GIOFFRE SAVERIO','C',139),('','C',140),('PIANA PALMI MULTISERVIZI S.P.A.','C',141),('GOLDEN GROUP SNC','C',142),('DE CREA FORTUNATO','C',143),('LUPPINO MICHELE','C',144),('','C',145),('STILLITANO SRL','C',146),('FERREDIL DI MANUCRA GEOM.MARIO','C',147),('L & R LABORATORI E RICERCHE SRL','C',148),('EDIL SUD DI MALACRINOALESSIO G.','C',149),('','C',150),('FRESH BLU DI MELISSARI CETTINA','C',151),('BAGALA ROBERTO','C',152),('SERGI ROSALBA','C',153),('CO.MEC. DI VIOLI DOMENICO','C',154),('','C',155),('RADIO FRECCIA NET WORK','C',156),('GIOVINAZZO IPPOLITO','C',157),('ELECTRONIC CENTER DI ZAGARI ROSARIO','C',158),('EMPORIO ROGGIO GIUSEPPE','C',159),('','C',160),('CALAFIORE ANTONIO','C',161),('PARRELLO GIUSEPPE','C',162),('RUGGERI & PIAZZA SNC','C',163),('FRESCHEZZA IN TAVOLA DI FOTI ROSA','C',164),('','C',165),('AUGIMERI CARMINE AUTOFFICINA','C',166),('MATTIANI DOMENICO','C',167),('CALDERAZZO GIANCARLO','C',168),('ROMANIN ELVIO STUDIO COMMERCIALE','C',169),('','C',170),('G.TRIPODI SRL','C',171),('DEDMONDO FRANCESCO','C',172),('IDROCAR DI IANTORNO MARIO','C',173),('ZAGARI PAOLO IMP.ELETTRICI','C',174),('','C',175),('SELF AREA AGIP \"LA SOSTA S.A.S.\"DI','C',176),('MARKET MIMMO DI MAMMONE ANNA MARIA','C',177),('OSRAV ALFEO MORET S.P.A.','C',178),('A.S.PALLAVOLO PALMI','C',179),('','C',180),('GN.RISTRUTTUR.DI GANGEMI NICOLA','C',181),('ANNULLATO PRESO PER TRADE EVOLUT','C',182),('PULEIO PASQUALE','C',183),('ROTONDO S.R.L.','C',184),('','C',185),('DOMENICO ORTUSO & C. S.a.s','C',186),('FABIO PIERANGELI','C',187),('EDIL PALMI SAS di CRUCITTI F.SCO &C','C',188),('MLD LOGISTICA E DISTRIBUZIONE SRL','C',189),('','C',190),('HOTEL SANTA CROCE','C',191),('CUBA MOTOR','C',192),('CENTRO SERVIZI AUTO DI FURFARO','C',193),('TRAS PUGLIA DI SPINA GIUSEPPE','C',194),('','C',195),('LAMINAZIONE SOTTILE SPA','C',196),('FULCO DOMENICO OFFICINA','C',197),('DAMICO MICHELE AUTOFFICINA','C',198),('CAPRARI ADRIANO','C',199),('','C',200),('FARINA ANTONIO','C',201),('CALABROROSARIO DOMENICO','C',202),('NUOVA CASALAUTO DI CREPALDI GIAN','C',203),('AS TAUREANA CARS DI PALMA FEBBO','C',204),('REPACI TEODORO TRASPORTO MERCI','C',205),('GIEMME IMPIANTI DI IANNELLO MICHELE','C',206),('MUSICO S.R.L.','C',207),('GULLI CARMELO','C',208),('CASCIANO GIACOMO','C',209),('MARKET MARTURANO LETTERIO','C',210),('FOGLIARO FORTUNATO & C. SNC','C',211),('RAVAGLI VITTORIO FERRAMENTA UTENS.','C',212),('GRIMI AUTO DI GRIMI DOMENICO SNC','C',213),('BARONE DOMENICO','C',214),('RANUCCIO SONIA AZIENDA AGRICOLA','C',215),('A.B.COMPUTING DI BAGALAANTONIO','C',216),('GIOIA CAR SRL','C',217),('TOTO MONTAGGI DI MARINO ANTONIO G.','C',218),('GEOM.GIUSEPPE OLIVERI','C',219),('IMPRESA COSTR.EDILI CILONA G.PPE','C',220),('TERMOIDRAULICA DI TALLARIDA G.PPE','C',221),('RIGHETTINI EMANUELE','C',222),('CM INDUSTRIE SRL','C',223),('AUTOGOLD DI DE SANCTIS G.','C',224),('RIGON GIAN CARLO AUTOTRASPORTI','C',225),('IMPIOMBATO ANTONINO','C',226),('I.F.E.S.DI CUTRI GIUSEPPE','C',227),('COMPANIE DHOTELLERIE SUISSE SRL','C',228),('LARTE DEL FALEGNAME SNC','C',230),('AUTOSERVICE 2000 SAS','C',231),('SERVICE RICAMBI E ACCESSORI DI','C',232),('CAPPONE MICHELE LAV.VETRI','C',250),('COLELLA FRANCECSO','C',251),('LA PIANA SNC DI BARBARO ANGELINA','C',252),('SURACE GIANFRANCO','C',253),('EDIL CERAMICHE PALMI DI SCHIPILLITI','C',254),('AGOSTINO ROMEO SRL','C',260),('SGROFRANCESCO','C',261),('IMPRESA EDILE DI CERAVOLO GIUSEPPE','C',262),('FICARRA ROBERTO IMPRESA EDILE MOV.','C',263),('CAR SERVICE DI GALLO DANIELE','C',264),('LAGRICOLA DI BALDO FRANCESCO & C.','C',265),('ARENA VINCENZO','C',266),('ROMEO MARIA','C',267),('BERTIM EDILIZIA E COSTA SRL','C',268),('ITALIA TRASPORTI E LOGISTICA SRL','C',269),('STUDIO DI PROGETTAZIONE ARCHITETTO','C',270),('CALOGERO SALVATORE','C',271),('CANANZI AUTO','C',272),('OLEIFICIO BORGESE FILOMENA','C',273),('ASSOCIAZ.DI VOLONTARIATO PRESENZA','C',274),('IPO S.R.L.','C',275),('SMAC  SNC & C. DI MERCURI SALVATORE','C',276),('MODAFFERI MICHELE ELETTRAUTO','C',277),('ROMEO FORTUNATO','C',278),('BAR BRUZZESE FRANCESCO','C',279),('AUTOFFICINA MARCELLO GULLI','C',280),('SCAVA ROSARIO','C',281),('CASELLA DOTT.MARIO DOMENICO','C',290),('SAFFIOTI ROCCO','C',999),('POINT CAR SERVICE SAS','C',1000),('AUTORICAMBI PRAIA SAS DI UGO','C',3001),('AUTOF.CATANANTI DI DIBIANCO GIOV.NI','C',3002),('AUTOPIU DI GRIFFO V.&.C. sas','C',3003),('ARMENI AUTO DI ARMENI ANDREA & C.','C',3004),('LA BELLA ROBERTO','C',3005),('TERMOIDRAULICA DI IANNINO SOCCORSA','C',3006),('AUTOBUDA DI ZAPPIA ANTONELLA','C',3007),('BELCASTRO ROSARIO R.B.AUTOR.','C',3008),('PNEUSERVICE SRL','C',3009),('AUTOFORNITURE MILANESI SPA','C',3010),('ORTOLANI CARLUMBERTO','C',3011),('AZZARA CARMELO','C',3012),('AUTOSILA S.R.L.','C',3013),('ATTISANO MICHELE','C',3014),('AMMENDOLA GIUSEPPE','C',3023),('ANNULLATO AUTOPARTS DI FIEROMONTE T','C',3026),('CENT.TELEFONIA DE PASCALE DANIELA','C',3027),('TYRE HUNTER DI CANTISANI CARMINE','C',3028),('AUTOFFICINA AMMENDOLA DEMETRIO','C',3029),('CENTER CAR S.R.L.','C',3032),('MACELLERIA DI BARBERA FRANCESCO','C',3101),('BLEVIO PIETRO','C',3103),('AZIENDA AGRICOLA SURACE GIUSEPPINA','C',3104),('C.F.S.CARRELL FULL SERVICE DUE sas','C',3106),('IMPRESA COSTRUZ.GEOM.CIAPPINA F.SCO','C',3107),('BELLISSIMO ANTONIO','C',3108),('BARBARO GIUSEPPE  DITTA','C',3111),('BARILLARI GABRIELE AUTORICAMBI','C',3112),('BORGESE GIUSEPPE','C',3113),('BARA GIUSEPPE OFF.& RICAMBI','C',3114),('AUTO IARIA S.R.L.','C',3115),('TRIPODI GEOM.ANTONINO IMPRESA EDILE','C',3120),('BARRECA DEMETRIO','C',3129),('BOVA VINCENZO','C',3139),('BRUNO AUTORICAMBI S.a.s.','C',3145),('CILIONE & C. SRL','C',3200),('CANDIDO GIULIO','C',3202),('LUDDENI MARIO MARKET DEL RIC.','C',3205),('RIOTTO SAVERIO','C',3207),('MOTORSPORT DI CIRICOSTA G.PPE','C',3209),('CE.D.R.A. DI CUCUNATO NATALE','C',3211),('S.D.S. CARBURANTI S.A.S.','C',3215),('TURANO G.PPE & C.snc AUTORICAMBI','C',3216),('CILIONE CONSOLATO !! SOSPESO !!','C',3217),('PUGLIESE ERNESTO','C',3219),('CALABRO LORENZO','C',3220),('LAGANADOMENICO','C',3222),('ANNULLATO  INVIATO A TETI A.','C',3224),('AUTO SERVICE DI IOPPOLO G.GIULINO','C',3226),('TRIPODI FORTUNATO','C',3228),('COMEDIL DI P.SGRO & C. sas','C',3232),('SGROORLANDO AUTORICAMBI','C',3234),('DOTT.PALMIRO ZAPPONE','C',3236),('POLIRICAMBI SRLS','C',3240),('ROCCHETTO RENATO','C',3241),('CURRA ANTONINO','C',3242),('COLOSI FRANCESCO INFISSI IN','C',3244),('CUORE ANTONIO','C',3245),('GRAMUGLIA DOMENICO OFF.MECC.','C',3246),('CALIO srl RICAMBI AUTO','C',3248),('COZZA ELIO','C',3252),('OERRE PARTS S.R.L.','C',3257),('EURODIESEL DI CASSALIA MAURIZIO','C',3262),('@ 2X INSTALLAZIONI DI PUGLIESE A.','C',3263),('TECNO TRADE SRL','C',3265),('CROCCO FRANCO','C',3267),('CARTELLA MASSIMO','C',3269),('SCARMATO FORTUNATO','C',3275),('C.M.G. BRAM  SRL','C',3278),('CARONZOLO ROSARIO','C',3279),('CALIPARI SERAFINO','C',3286),('EDIL DORA DI BRUNO ROMEO','C',3294),('EXIDE TECHNOLOGIES SRL','C',3295),('IL TEMPIO DEL RIC.DI GIORDANO LUIGI','C',3301),('OFFICINA DE GRAZIA SAS','C',3302),('REGALI E SORRISI DI GUERRERA D.CO','C',3304),('UNIFLUID SUD SRL','C',3305),('CONSORZIO PDA','C',3307),('SURACE ROCCO','C',3308),('DITTA CILONA VINCENZO','C',3309),('DAGOSTINO AUTORICAMBI','C',3310),('DATTOLA AUTO & C. snc','C',3312),('DE NISI DOMENICO','C',3315),('IMPRESA COSTRUZ.SIMONETTA VINCENZO','C',3316),('AUTORICAMBI E ACCESSORI DI MARZIA','C',3317),('CHIAPPALONE ANNUNZIATO','C',3319),('EUROPA RICAMBI DI DE MARIA CARLO &','C',3320),('BRUZZESE FRANCESCO','C',3323),('DE GREGORIO SRL','C',3325),('LOGATTO VINCENZO V.L AUTORICAMBI','C',3326),('TARUSCIO GIOVANNI','C',3331),('TODARO SAVERIO','C',3334),('FERRARO LUIGI','C',3403),('AUTORICAMBI ERRIGO C.& C. S.A.S','C',3404),('PISANO GAETANO','C',3409),('AGRINOVA DI CORRADO NICOLA','C',3501),('FE e SA & C. DI SANTORO B. sas','C',3502),('CAR SHOP AUTORICAMBI','C',3503),('BRIGA LUCIANO','C',3504),('FIDALE GIACOMO & C.sas CAR SERVICES','C',3505),('FERRERO MASSIMILIANO IF.AUTORIC.','C',3506),('ASSOCIAZIONE RADIOAMATORI ITALIANI','C',3507),('FALBO ANTONIO','C',3508),('DAGOSTINO BIRRE DI GINO','C',3510),('FULLONE MARIO','C',3512),('EMMEDUE COSTRUZIONI','C',3514),('PALMCART OLIVERIO GIUSEPPE','C',3516),('BORGESE RANIERI & CLAUDIO SNC','C',3519),('FUTIA SALVATORE','C',3522),('FRANCHINA MASSIMILIANO Autoricambi','C',3523),('FUTIA DOMENICO Ricambi Auto','C',3525),('IMPRESA EDILE SCHIPILLITI V.ZO','C',3526),('MEDITERRANEA TRASPORTI SOC.COOP','C',3527),('AGENZIA LOGISTICA MERIDIONALE','C',3528),('RAGO UMILE RICAMBI-OFFICINA','C',3531),('SE.MA.C. SRL','C',3534),('IMPRESA EDILE GAGLIOSTRO V.ZO','C',3541),('FIGLIUZZI SALVATORE','C',3544),('FRAGOMENI DOMENICO','C',3548),('FIEROMONTE & CHIAPPALONE sas','C',3551),('F.T.R. F.LLI TRIULCIO SRL','C',3553),('GIORDANELLI SERGIO','C',3602),('F.LLI GUIDA sas','C',3603),('GRILLO GIUSEPPE','C',3604),('GALLO STANISLAO MANGIMI CONCIMI','C',3605),('COARSA SOC.CONS.IMP.SANLURESI SRL','C',3606),('PASCHOU MARIA','C',3607),('PELLEGRINO PIETRO ROCCO  AZIENDA','C',3608),('ROSANNA EX GRM RICAMBI','C',3609),('INDUSTRIA BOSCHIVA DICH.STEL.','C',3610),('GILBERTO DROGHETTI DOTT.','C',3611),('GALLE  NICOLA','C',3615),('EUROELETTRA S.N.C.DI NICOLOSI &','C',3616),('PALETTA ALBERTO AUTORIC.','C',3617),('GIOFFRE GIUSEPPE','C',3620),('PRINTING CENTER S.A.S.','C',3621),('SUD CARNI DI LEONELLO PASQUALE','C',3622),('GIOVINAZZO AUTORICAMBI','C',3623),('GENCARELLI GIUSEPPE','C',3627),('GRASSO FRANCESCO','C',3631),('GALLO GIOVANBATTISTA','C',3632),('CIESSEGI SNC DI CATOZZA MARIO & C.','C',3639),('AUTOMARKET DI PAPALIA ROBERTO','C',3646),('CENTRO RICAMBI DI MARINO & C.SNC','C',3700),('IMPRESA EDILE RECHICHI GIANCARLO','C',3701),('G.R.RICAMBI SRL','C',3704),('BRUZIA RICAMBI DI HRISCU CARMEN','C',3705),('AUTORIC.IANNI DI IANNI FRANCESCO','C',3706),('ITAL RICAMBI DI IAROPOLI V.& C.sas','C',3708),('INFORTUNA SANTO','C',3710),('IOVINE NICOLA','C',3711),('FILIPPONE ANTONINO','C',3712),('INFANTINO GIUSEPPE ELETTRAUTO','C',3717),('IDA RAG.ENZO','C',3719),('DE MASI PASQUALE DE.CA AUTORICAMBI','C',3800),('CANTIERI NAUTICI COSTA VIOLA','C',3803),('BG.CAFFE DI GIUSEPPE BALO','C',3805),('GUARASCIO LUIGI AUTORICAMBI','C',3806),('GIOFFREGAETANO','C',3807),('CENTRO AUTO MOTO DI LAGANA sas','C',3810),('LONGO CLAUDIO','C',3811),('LAGANA GIOVANNI','C',3814),('EDILDECORO DI FORTUGNO & SAFFIOTI','C',3815),('ATC DI PUGLIESE ALBERTO & C.SAS','C',3818),('LONDINO SERGIO','C',3822),('ANANIA ROCCO & GRILLO F.SCO SNC','C',3825),('FARMACIA FORGIONE DANIELA','C',3827),('AUTORICAMBI RAG.SAVERIO LAGAZZO','C',3828),('SERVICE AUTO SAS CENTRO REVISIONI','C',3829),('MASSARA NICOLA ACCESSORI PER AUTO','C',3832),('FANELLI GIOVANNI','C',3833),('LOIACONO GIUSEPPE','C',3835),('ANNULLATO UTILIZZATO PER IL WEB','C',3843),('ANNULLATO','C',3844),('AUTORICAMBI LAGANAROBERTO DI','C',3845),('ANNULLATO UTILIZZATO PER IL WEB','C',3846),('MELITO GIAMPIERO','C',3901),('MRC RICAMBI S.R.L.','C',3903),('MARONGELLI ANTONIO','C',3908),('MORELLO ANTONIO','C',3911),('M.A.I.R.S.AGATA DI DE BENEDETTO N.A','C',3912),('MONTELEONE MICHELE Autoricambi','C',3913),('FOTI PASQUALE','C',3914),('METALLURGICA RIVORALESE SPA','C',3915),('MARTINO DOMENICO','C',3917),('MALIZIA PASQUALE','C',3918),('DE SIBIO MECCANICA sas DI DESIBIO D','C',3924),('PUBBLIWORLD DI GULLO ANTONINO','C',3926),('MAZZITELLI & TASSONE S.N.C.','C',3927),('LANDRO AUTOMOBILI','C',3928),('MEZZATESTA ANTONIO','C',3931),('MOTOR SHOP Autoricambi sas','C',3932),('REPACI GIOVANNI','C',3933),('MERLINO CARMELO','C',3934),('ONESHOT S.A.S.','C',3935),('MANARITI GIUSEPPE','C',3936),('FESTA LEONA','C',3937),('CB SPECIAL COMPONENTS DI BERTOT','C',3939),('EDICOLA ARCURI LUCIA','C',3942),('LANDRO LEONE','C',3943),('COOPERATIVA REGGINA 08','C',3944),('MUZZI BRUNO','C',3952),('CAMERA ANTONIO','C',3957),('MAMONE GERARDO CENTRO RICAMBI AUTO','C',3961),('MALARA GIUSEPPE','C',3962),('R.C. TUNING DI LORENZO ANTIMO','C',3963),('MAIO CESARE','C',3966),('MACELLERIA LEONELLO SALVATORE','C',3967),('CAMERA DOMENICO','C',3972),('COZZOLINO SAVERIO AUTOPARTS','C',3976),('MARINO GABRIELE & F. sas','C',3978),('SYSTEM SUD SNC','C',3981),('MSC AUTOVEICOLI DI MUSICOARNALDO','C',4001),('GALATI ANTONIO AUTOTRASPORTI','C',4003),('NILAUTO srl','C',4004),('NUCERA FILOMENO','C',4007),('NUCERA MAURIZIO','C',4008),('OTTOBRE TRADE SRL','C',4205),('CONDOLUCI MARIA GIUSEPPA','C',4207),('PUGLIESE SALVATORE RICAMBI AUTO','C',4208),('NOVEMBRE ROSANNA MINUT.E MECC.','C',4210),('CABBOI GRAZIELLA','C',4212),('PETRONAS LUBRICANTS ITALY SPA','C',4213),('PERRI MIMMO','C',4215),('D.SSA ZAPPONE LILIANA','C',4222),('PUPO GIUSEPPE AUTORICAMBI','C',4226),('OFF.MECC.FRATELLI PIRILLI','C',4229),('RACO ELISABETTA RIF.TAMOIL','C',4230),('PICCOLO MARIO AUTORICAMBI','C',4232),('AUTORICAMBI VENTURA VINCENZO','C',4236),('TECNO EDIL DI VIOLA SANTO','C',4242),('PALMA AUTORICAMBI S.R.L.','C',4243),('PULIMENI ANTONIO & C. sas','C',4244),('PALERMO OLIVA Autoricambi','C',4246),('MAX MOTO DI PELLEGRINO M.A.','C',4249),('POLIMENI FRANCO','C',4256),('PEZZANO PIETRO','C',4261),('POLITI FRANCESCO Elettrauto','C',4263),('TROPEANO STEFANO RICAMBI AUTO','C',4303),('ROPERTO ALDO CENTRO COMMERC.RICAMBI','C',4304),('TENUTA GIANFRANCO AUTORICAMBI','C',4305),('F.LLI ROSE Snc di UMILE & FRANCO R','C',4308),('AUTORICAMBI RUGGIERO sas','C',4310),('VIOLA ERMANNO STAZ.SERV.ERG','C',4312),('R.AUTO IN snc','C',4313),('GOMMAUTO DI RODA & C. snc','C',4314),('DECA S.a.s. DI G.PPE DE PASCALI &C.','C',4318),('A.G.C.SRL','C',4320),('NUOVA RIMA DI CAPULA RAFFAELE','C',4324),('CRUCITTI GROUP SRL','C',4325),('INFORAMA DI DENISI V.ZO E C.SAS','C',4328),('EVALTO FRANCESCO & FIGLI','C',4401),('SCHIPANI RICAMBI','C',4404),('SPINA ALEXANDRO','C',4405),('SCUOLA CALCIO VIGOR PALMI 2004','C',4406),('SURIANO ALV SAS','C',4407),('AUDINO SAVERIO','C',4408),('SOBER RICAMBI AUTO sas','C',4409),('ROMEO VINCENZO & C. SNC','C',4411),('SAIM snc DI TAVELLA ANTONIA','C',4414),('SAINATO PASQUALE','C',4415),('SMEC SRL','C',4416),('F.LLI SINOPOLI snc Ric.Auto-Moto','C',4417),('F.LLI SPINELLI snc','C',4418),('AZ.AGR SORGES DI ROSA SORLETI','C',4420),('DUEMME S.A.S.','C',4421),('SPOLETO NUOVA AUTOACCESSORI','C',4422),('LOMBARDO DOMENICO FU GREGORIO','C',4423),('MULTISERVIZI M.G.D. DI PARRELLO','C',4427),('SCIARRONE SPA','C',4429),('SCRIVO ANTONIO','C',4432),('SERRATORE FRANCESCO','C',4440),('ANNULLATO UTILIZZATO PER IL WEB','C',4441),('LA BOTTEGA DEL RESTAURO DI FOTI R.','C',4442),('EREDI SURACE LORENZO di SURACE','C',4443),('S.D.R. sas','C',4446),('SAMA & CODISPOTI SAS','C',4451),('SCIONTI ROCCO Jr.','C',4452),('SOFI PAOLO','C',4454),('SISCA ANTONIO MECCANICO ARTIGIANO','C',4460),('ITALCOGE SPA','C',4463),('ANNULLATO TASSO SAL','C',4466),('BISCARDI LUIGI TUTTO PER LAUTO','C',4501),('B.P.SOLLEVAMENTI di ETTORE BELLINI','C',4502),('TROVATO AUTORIPARAZIONE','C',4506),('TASSONE PASQUALE','C',4514),('LA TIRRENICA DI CAPUA GIUSEPPE','C',4517),('TASSONE sas DI TASSONE GUERINO & C.','C',4521),('TASSO ANTONIO LEONE AUTORICAMBI','C',4522),('MAZZA ANDREA','C',4523),('TORCHIA ANGELO','C',4525),('TAVELLA ANTONIO','C',4533),('ANNULATO','C',4600),('VENTRA SAS di VENTRA VINCENZO & C.','C',4601),('VALOTTA FRANCESCO','C',4606),('VONO S.A.S. DI VONO G.& CO.','C',4607),('MEG DI ROMEO CARMELO','C',4611),('VENTRE AUTORICAMBI DI VENTRE G.PPE','C',4612),('TECHNO BUS SRL','C',4613),('LA FLAVIA DI FILIPPO SPINELLI','C',4614),('VRENNA LUCA MECC.& SICUREZZA','C',4615),('DELIZIE DI CALABRIA S.A.S DI ARENA','C',4621),('GENTILE FRANCESCO','C',4702),('ZICARELLI SALVATORE','C',4704),('ZAPPIA CARMELO','C',4705),('ATTENZIONE ! LA MECCANICA 2','C',5000),('EVA TECH S.A.S.DI DANIELE MEGALIZZI','C',5002),('RESTUCCIA ROSA RITA BOSCH CAR SERV.','C',5003),('PIMEC SRL','C',5004),('DAVIGIUSEPPE','C',5007),('VITETTA ANTONINO','C',5009),('STIL GOMMA DI NINO IANNELLI','C',5011),('ANNULLATO UTILIZZATO PER IL WEB','C',5017),('OFF.MECCANICA ROTONDO ANTONIO','C',5019),('COMBUSTION AND ENERGEY SRL','C',5020),('HOTEL RESIDENCE \"ARCOBALENO\"','C',5022),('BRANDO CARMELO','C',5024),('CASILE ROBERTO','C',5029),('AVVENTURA SOC.COOPERATIVA ARL','C',5035),('RA.DI SRL','C',5036),('CENTRO GOMME DI CONDINA GIOVANNI','C',5040),('JOLLY FRUTTA DI PAPASERGIO ANGELA','C',5043),('SURACE ANTONINO','C',5055),('FORTEBUONO METALLINFISSI S.r.l.','C',5056),('BAGALAGIUSEPPE','C',5057),('CASEIFICIO IL GRANATORE DI ZAGARI','C',5060),('RUSSO GAETANO AUTORICAMBI','C',5062),('RAFFAELI SRL','C',5073),('ALESSI PINA IMPRESA EDILE','C',5075),('ERREBI SRL','C',5076),('LA CORTE DELLA CARNE DI PEPPINO','C',5078),('MANOCCIO GENNARO','C',5084),('DE CARIA MOTORS SRL','C',5085),('DOTT.MARCELLO MELARA','C',5087),('F.LLI ATTISANO SRL ORTOFRUTTA','C',5088),('GIOFFRE PASQUALE','C',5089),('M.G. LOGISTIES SERVICES SRL','C',5091),('CONSORZIO ACQUEDOTTO VINA','C',5094),('MD COLLECTION DI MARRA DOMENICO','C',5100),('CRUCITTI SRL','C',5101),('VITALONE ROCCO OFF.MECC.','C',5102),('MOTORCYCLE & AUTO REPAIRS','C',5107),('QUASED SRL','C',5108),('CADI SERVICE S.A.S.','C',5110),('CO.DI.M. SRL','C',5114),('LEUZZI GIANCARLO','C',5115),('SCUTERI FRANCESCO','C',5116),('DI PINO TINDARO AUTORICAMBI','C',5117),('COMUNE DI SEMINARA','C',5123),('MATINA DOMENICO','C',5125),('ACCARDO ANNUNZIATO FILIPPO','C',5127),('BOLIGNANO ROBERTA DONATELLA','C',5131),('EVENTI FIORITI DI ROBERTA ANGALO','C',5132),('RAZIONALE ROSARIO HIPPONIO AUTO EL.','C',5133),('ERREMME di ROMEO DOMENICO MASSIMO','C',5134),('MAXICAR DI A.TRICOMI','C',5136),('MONTELEONE MARIA MADDALENA','C',5141),('REGGIORICAMBI DI MICHELANGELO','C',5142),('IL GENIO DEL PANE DI GARZO GREGORIO','C',5143),('ANNULLATO UTILIZZATO PER IL WEB','C',5144),('DAL MASO GIADOMENICO','C',5146),('RIZZITANO ANTONINO','C',5147),('MAURO AUTORICAMBI DI BADAMI MARIA','C',5150),('EDIL QUATTRO DI SAPONE G.& C. SNC','C',5151),('MARIA MADDALENA SICA','C',5163),('CILONA ANTONINO','C',5164),('MAGAZZU ARREDAMENTI','C',5165),('BORGESE VINCENZO','C',5166),('ARCHIMEDE DI MATTIANI PASQUALE','C',5169),('BAR RISTORANTE ULIVARELLA','C',5174),('CENTRO RICAMBI CALABRESI SNC    CRC','C',5178),('PINNERI ANTONINO','C',5179),('F.LLI SCORDAMAGLIA S.N.C DI F.SCO','C',5182),('PANUCCIO ING.DOMENICO IMPR.COSTRUZ.','C',5183),('LOMBARDO ALLESTIMENTI','C',5195),('BOSCHETTO FRANCESCO ELETTRAUTO','C',5198),('PONTECOPROGES SRL','C',5199),('G.C.SERVICE DI GAGLIOSTRO CARMELO','C',5203),('PELLICANO S.R.L.','C',5208),('MACELLERIA DA ROCCO DI PRONESTI','C',5209),('MAGNETI MARELLI AFTER MARKET PARTS','C',5210),('IL POLLICE VERDE DI FARFAGLIA','C',5212),('COMUNE DI PALMI','C',5215),('BARA MOTO DI BARA FABIO','C',5225),('SAFFIOTI MASSIMO EMILIANO','C',5226),('LOIACONO GIULIO','C',5231),('SETTECERZE VINCENZO','C',5232),('BAGNOLI ROBERTO ELETTRAUTO','C',5234),('ALAMPI SALAVATORE IMPRESA EDILE','C',5236),('PANETTA CARLO','C',5239),('MYPLANET SRL','C',5240),('AUTO 3 snc F.LLI ARTESI','C',5241),('MATTIANI GIUSEPPE','C',5243),('ASP N.5 DI REGGIO CALABRIA','C',5244),('CANNIZZARO GIUSEPPE','C',5246),('SORICAL SPA','C',5248),('ROSACE GIUSEPPE','C',5249),('MOTORSPORT SNC DI SALVATI G.PPE & C','C',5250),('SLESC-SCHITRY DI SCHIPILLITI C.LO','C',5251),('LAURENDI GIOVANNA','C',5252),('OFF.MECC.GANGEMI DOMENICO','C',5253),('CUSAN di SANTORO & C. snc','C',5256),('MAISANO MARIANNA EURORICAMBI','C',5259),('NICOLI SANTINO ASS.PIAGGIO','C',5260),('ELETTROSISTEM DI LAFACE GIUSEPPE','C',5261),('F.LLI CAPOGRECO snc','C',5263),('COSENTINO FRANCESCA','C',5264),('TERMINE CLAUDIO AUTORICAMBI','C',5266),('CHIRICO PAOLO','C',5267),('MERCURI VINCENZA','C',5268),('AZIENDA AGRICOLA BIVONE MARIA','C',5269),('ANDREARCHIO ALESSANDRO','C',5271),('SICILIANO PASQUALE','C',5272),('APEIRON S.A.S DI F.SCO BARONE & C.','C',5273),('STAR SERVICE PICCOLA SOC.COOP.ARL','C',5274),('ZOCCALI ANTONIO','C',5276),('CONDELLO MARCO ALIMENTARI','C',5278),('MARTINO PAOLO PIETRO','C',5279),('PRELIBATEZZE DI RITA ARICO','C',5280),('AMORUSO LUIGI SRL','C',5281),('MAZZULLO LUCIANO','C',5282),('POLIAUTO DI POLIZZO UMILE','C',5286),('RIGANOFRANCESCO','C',5289),('AMBROGIO GIUSEPPE','C',5290),('ISOTERM DI VIGLIANTE GEOM.D.CO','C',5296),('MACELLERIA MICHELE LUPPINO','C',5297),('MARTORANO PASQUALE','C',5299),('TECNOVIDEO DI LAGANA','C',5301),('ASSIST.RENAULT ARCISIACONO ORAZIO','C',5302),('AUTOSERVICE MINNITI S.A.S.','C',5305),('CRO.MAR TRONIC DI G.MARZULLO','C',5308),('CRD  SRL','C',5310),('VALENTE PNEUMATICI srl','C',5312),('SPADA AGOSTINO','C',5316),('RAMONDINO MARCO','C',5317),('SHOPSTORE SRL','C',5319),('LOIACONO ANNALISA','C',5321),('COLLURA ALESSANDRO','C',5324),('AP.RICAMBI DI PLUMARI ANTONINO','C',5325),('CENTRO DIAGNOSI DI GRAZIANO','C',5326),('MILITANO FRANCESCANTONIO','C',5327),('EUROSERVICE 2000 DI GIANLUCA CIMINO','C',5329),('CELESTI PIETRO ELETTRAUTO','C',5336),('AUTORICAMBI GABRIELE DI GABRIELE','C',5337),('JONICA RICAMBI SNC DI MUSCOLINO E','C',5338),('THE BEST AUTORIC.S.A.S.DI GALLO','C',5339),('VOLPE CARMELA OFF.RICAMBI AUTO','C',5341),('LOCCASIONE snc di PELLICANO P & C.','C',5342),('AZ.AGR.CARMELITANO MATTEO','C',5343),('PRISCOGLIO GIUSEPPE FRANCESCO','C',5344),('ANNULLATO INVIATO A motorline','C',5347),('PUTRINO DOMENICO STUDIO DI GEOLOGIA','C',5348),('CAPUTO NATALE AUTORIC.','C',5350),('SPORTAUTO di GAGLIOSTRO VINCENZO','C',5355),('ZERBI FABIO','C',5357),('ARICONATALE','C',5358),('VALOTTA LEOLUCA OFF.ELETTROMEC.','C',5360),('BARBARO CONCETTA LUCIA','C',5361),('PENNESTRILUIGI  OFF.MECC.','C',5364),('RETTIFICHE MANNINO SRL','C',5366),('SPAGNOLO DOMENICO','C',5373),('AUTORICAMBI DLC DI ABOSSIDA G&C sas','C',5375),('AMBROGIO DOMENICO','C',5376),('BENEDETTO STEFANO','C',5377),('NICOLETTA GIUSEPPE','C',5378),('ESSERICAMBI DI ANNA MARIA SCHIRRIPA','C',5379),('DOTT.DOMENICO FARERI','C',5383),('V.I.M.A.R. SAS','C',5384),('AUTORICAMBI \"RUGGERI\" DI C.&D.CAR','C',5385),('ICOREL DI IERACE ROBERTO','C',5386),('S.G.AVIATION SRL','C',5387),('SUPERMERCATO PRINCI SAS','C',5388),('CALABRIA LUCIANO AUTORICAMBI C.D.R','C',5389),('MISALE GIUSEPPE','C',5390),('LASCALA DOMENICO','C',5393),('DELIVERY EXPRESS DI NUCARA A.','C',5394),('CUCCI FERDINANDO AUTORICAMBI','C',5402),('LENTINI MONTEDORO AUTORICAMBI','C',5407),('BORGESE CARMELO','C',5408),('TECNOSTUDIO DI ZACCURI GIOVANNI','C',5409),('SOC.COOP.ARCOBALENO A.R.L.','C',5411),('DE.SAL.CAR. DI DE SALVO ROBERTO','C',5412),('PM 2 DI MILITANO NATALE','C',5416),('EURO CAR DI BARONE ANTONINO','C',5417),('ROSINA ANTONINO','C',5418),('PALMERI MICHELE','C',5419),('S.D.CAR DI SALVATORE DOMENICO','C',5421),('CENTRO RICAMBI MINNITI','C',5422),('A.B.S. AQUILA BROADCASTING SETS','C',5424),('EDIL CASA DI DANDREA DOMENICA','C',5427),('RICAMBI 2000 S.N.C. DI LAGONIA &','C',5428),('KRIOS AC S.R.L.','C',5429),('MUSICO ANTONINO','C',5430),('NSA NUOVI SERVIZI AUTO S.P.A','C',5432),('FRAMEL SRL','C',5433),('ANNUL.LA BELLA FRANCESCO','C',5434),('IMPIOMBATO ANTONIO','C',5435),('ALFIERI SALVATORE','C',5436),('PASTIFICIO LANTICO MULINO','C',5437),('RICAMBI INDUSTRIALI S.R.L.','C',5438),('ANNULLATO INVIATO A CARPOINT','C',5439),('BARBIERI AUTORICAMBI di COSMA','C',5440),('SGRO GIUSEPPE','C',5441),('GIOIA HOSPITAL','C',5442),('AUTORICAMBI MAMONE PEPPINO','C',5444),('LA SOSPENS LIDO DI GABRIELE PIETRO','C',5445),('MICHELE SURACE DOTT.COMMERCIALISTA','C',5446),('CERENZIA GAETANO','C',5447),('BARBARO CARMINE','C',5448),('CALANNI RINDINA SPRINT AUTORICAMBI','C',5449),('ALAMPI SANTO','C',5450),('GIDAR srl','C',5451),('MARTELLI GIUSEPPE','C',5452),('OFF.MECC.BARBERA MATTEO','C',5453),('MARIANO GAETANO RIC.OFF.GOMME','C',5454),('CANNISTRA FRANCESCO','C',5455),('PIZZINO GIUSEPPE','C',5456),('GRIPPAUDO VINCENZO','C',5457),('SCANDURRA TIZIANA DIMENSIONE AUTO','C',5458),('AUTOSHOP S.R.L.','C',5459),('AUTORICAMBI DIANA ROBERTO & C.SAS','C',5460),('OLIVERI FRANCESCO','C',5461),('COSENTINO VITTORIO','C',5462),('C&P CERTIFICAZIONI S.R.L..','C',5463),('AR.RICAMBI SNC ARUTA SALV.& SANDRO','C',5464),('MAZZA ANTONIO','C',5466),('GANGEMI GIUSEPPE','C',5467),('STUDIO LEG.AVV.PELLEGRINO PASQUALE','C',5468),('OLIVERIO GIOVANNI','C',5469),('CASTAGNA PASQUALE AUTORICAMBI GOMME','C',5470),('GRAFIA PUBLICITA DI CIPRI GIUSEPPE','C',5471),('SAIJA ANGELO','C',5472),('CILIBERTO RENATO','C',5473),('CATANZARO SALVATORE','C',5474),('EUROAUTO srl','C',5475),('AGENZ.VIAGGI E TURISMO DE NICOLA','C',5476),('LA CONCORDIA SNC','C',5477),('MACOS srl','C',5478),('SIC.COM. S.A.S.','C',5479),('DONATO DANIELE AUTOR.','C',5480),('TROPICAL FRUIT DI LUPPINO FRANCESCO','C',5481),('SCIARRONE VINCENZO RICAMBI','C',5482),('CLIMAUTO DI TRAPASSO GIUSEPPE SNC','C',5483),('DABATE ORAZIO C.R. CENTRO RICAMBI','C',5484),('LB RICAMBI AUTO SAS','C',5485),('FAR.O.L.RICAMBI srl           FAROL','C',5486),('CAPRINO ANTONIO AUTORICAMBI','C',5487),('MEGNA ANTONIO','C',5488),('MARINCOLO SERAFINO ELETTRAUTO','C',5489),('TECNORICAMBI SNC','C',5490),('PRESTIPINO SALVATORE','C',5491),('COSENTINO GIUSEPPE','C',5492),('SANTORO ANTONINO','C',5493),('R.S.STORE SRL','C',5494),('DE LUCA SERVICE DI DELUCA F.SCO SAS','C',5495),('AUTORICAMBI BRUNO SERGIO','C',5496),('INDUSTRIAL POINT S.R.L.','C',5497),('ANNULLATO PRESO PER IL WEB','C',5498),('MORABITO LEONARDO ITALRICAMBI','C',5499),('PENNA ANTONINO IMP.AGIP 8898','C',5500),('CARUSO ROCCO','C',5501),('COMPUTER & INTERNET DI FORTUNATO','C',5502),('IGRO SUD DI MERCURI GIANCARLO','C',5503),('PISANELLI SANTO','C',5504),('PISANO ANTONIO','C',5505),('RUFFO GELSOMINA GFC AUTORICAMBI','C',5506),('SUORE SALESIANE DEI SACRI CUORI','C',5507),('ALPA AUTO S.R.L.','C',5508),('ESPOSITO LORENZO','C',5509),('GAGLIOSTRO STEFANO','C',5510),('SIRIO AUTORICAMBI DI UFRASCATI G.','C',5511),('ELETTRAUTO AMATO FAUSTO','C',5512),('ALBANESE GIUSEPPE','C',5513),('ANNULLATO PRESO PER IL WEB','C',5514),('RI.A  S.R.L.','C',5515),('AUTOFORNITURE TINO DAGATE','C',5516),('GLORIOSO ADRIANO','C',5517),('AUTORICAMBI ITALIANO di CURCURUTO','C',5518),('AUTOFORNITURE GULLOTTA','C',5519),('MANGIARRATTI EMANUELE IDROTEC','C',5520),('DOMINICI SRL','C',5521),('C.R.A.E.di DI BENEDETTO PROVVIDENZA','C',5522),('SPADA CARMELA SRL','C',5523),('LOMBARDO GIUSEPPE','C',5524),('MANOLA SALVATORE SA.MA','C',5525),('FARACI RAFFAELE TUTTAUTO','C',5526),('AUTORICAMBI CIARCIA CARMELO','C',5527),('MESSINA GIUSEPPE','C',5528),('AUTORICAMBI MEGARA SNC','C',5529),('MOTORPOINT SRL','C',5530),('ANASTASI GIOVANNI','C',5531),('AUTORICAMBI G.S.di SCOZZARICARLO','C',5532),('MA.DI.DI snc AUTOMARKET 2000','C',5533),('R.A.V. DI SORRENTINO LUIGI S.A.S','C',5534),('SA.MA RICAMBI DI SALAFIA MAURO','C',5535),('O.R.A. SPALLITTA & C. snc','C',5536),('TUTTAUTO ALBERGHINA GIANFRANCO','C',5537),('VINCI CONCETTO AUTOTECNICA AUTOR.','C',5538),('ANULLATO UTILIZZATO PER IL WEB','C',5539),('GIANNUSO GIOVANNI','C',5540),('CE.RI. DI CATANIA BIAGIO & C. SAS','C',5541),('ILARDI MARGHERITA & C. SNC','C',5542),('PUNTO RICAMBI SRL','C',5543),('NIGRELLI LUIGI','C',5544),('A.R.A.T. DI MARIO DI GIOVANNI','C',5545),('DILIBERTO AUTORICAMBI','C',5546),('DI COSTA S.R.L.','C',5547),('C.R.SERVICE SRL','C',5548),('ALOISI ANTONIO','C',5549),('PAONE RICAMBI DI PAONE G. SAS','C',5550),('FERICAM DI PISU FEDERICO','C',5551),('SANTOCONO & C.  R.A.I.E.snc','C',5552),('VESPO SALVATORE','C',5553),('AUTORICAMBI MOTTA srl','C',5554),('GRASSO & FIGLI sas DI GRASSO D.e C.','C',5555),('VECCHI SNC','C',5556),('F.LLI CHIARAMIDA AUTORICAMBI sas','C',5557),('FUTURA RICAMBI DI SCACCIAFERRO','C',5558),('COSENTINO F.e G. snc','C',5559),('FENECH AUTORICAMBI srl','C',5560),('SAMMITO ANGELA','C',5561),('CENTRO RICAMBI SRL','C',5562),('AUTORICAMBI STRANO SRL','C',5563),('SURIANO PAOLO','C',5564),('AUTORICAMBI GLORIOSO srl','C',5565),('VECAM DI OLIVELLI VENERANDO E C.snc','C',5566),('MEC.CARS RICAMBI DI SCIALFA G.PPE','C',5567),('PENNISI AUTO DI G.PENNISI','C',5568),('AUTORICAMBI MAGGIO GIUSEPPE','C',5569),('GRILLO NICOLA AUTOFORN.','C',5570),('AUTORICAMBI TROGYLOS SRL','C',5571),('PRIVITERA STEFANO','C',5572),('AUTOFFICINA M.A.&.V  S.a.s di OSCAR','C',5573),('IEMMOLO VINCENZO','C',5574),('GENNUSA GIUSEPPE AUTORICAMBI','C',5575),('C.R.A. Snc di Salvatore Tanasi & C.','C',5576),('F.LLI MUSARRA sas','C',5577),('S.G.R. DI ROSANO V.ZO & C. sas','C',5578),('ADAMO ROBERTO','C',5579),('ELIOS AUTORICAMBI SRL','C',5580),('DIEMME SRL','C',5581),('NUZZO FILIPPO','C',5582),('AUTOR.FISICARO DI FISICARO FILIPPO','C',5583),('CENTRO RICAMBI DESARI GIUSEPPE','C',5584),('AUTORIC.PROFETA DI PROFETA ONOFRIO','C',5585),('MARTUCCI REMO AUTORICAMBI','C',5586),('CHECKS SRL','C',5587),('AUTOETNA DI INTRESSALVI M.& C. snc','C',5588),('FRICANO ROBERTO & C.RI.AS.sas','C',5589),('GAGLIARDI VALENTINO','C',5590),('MICIELI SALVATORE SNC','C',5591),('GIARDINA GIOVANNI','C',5592),('BOCCHIARO GIUSTO & C. snc','C',5593),('R.D.C. DI VALERIA FILI','C',5594),('PALAZZOLO GIUSEPPE','C',5595),('CARILLO MARTINO AUTORICAMBI','C',5596),('AUTORIC.FAVUZZA SOC.COOP.','C',5597),('F.LLI RUSSO DI GAETANO RUSSO & C','C',5598),('DI.R.MEC SRL','C',5599),('AUTOCOMPONENTI COSENTINO','C',5600),('OLIVERI FRANCESCO AUTORICAMBI','C',5601),('PULIZZI GIOACCHINO','C',5602),('AUTORICAMBI RIITANO DOMENICO','C',5603),('FARRUGGIO BIAGIO','C',5604),('DISTEFANO M.& PELLEGRINO A. S.N.C.','C',5605),('SORTINO S.r.l.','C',5606),('B.R.M. di MARINELLI G.PPE & C. snc','C',5607),('C.A.R. DI CAMPISI ISABELLA','C',5608),('ARENA SRL','C',5609),('AUTOMECHANIKA SRL','C',5610),('PRECAV S.N.C. DI CAVALLARO ROSARIO','C',5611),('COIR srl','C',5612),('DI BELLA SERVICE','C',5613),('GARDEN BAR RACITI PAOLA & C. SNC','C',5614),('TUTTORICAMBI snc DI MUSCIA V.& G.','C',5615),('RICAS RICAMBI E ACCESSORI DI','C',5616),('DI PIETRO AUTOSERVICE DI PIETRO C.','C',5617),('EUROPARTIAUTO DI COCO CARMELO','C',5618),('AUTORICAMBI ODDO CARMELO','C',5619),('LAUTORICAMBI SRL','C',5620),('CUNSOLO MARIO AUTORICAMBI','C',5621),('AUTORICAMBI GRECO FINA','C',5622),('CORRADO CASALE SNC','C',5623),('R.A.I.A.R. srl','C',5624),('CASA DEL RADIATORE','C',5625),('CENTRO CLIMA SNC','C',5626),('SCARLATO SALVATORE ELETTROCAR','C',5627),('VIOLA FRANCESCO','C',5628),('CENTRORICAMBI NIGRO srl','C',5629),('MASTROGIOVANNI SRL','C',5630),('F.LLI PIZZA SNC','C',5631),('VIOLI CARLO','C',5632),('AVV.CARMELA CLEMENTE','C',5633),('DE CARIA ROCCO AUTORICAMBI','C',5634),('DIESEL TRUCKS DI SCADUTO ANGELO','C',5635),('MESSINA FILIPPO AUTORICAMBI','C',5636),('ERRECI DI RAFFAELE CANTAFIO','C',5637),('DOTT.GIUSEPPE FAVIA GUARNIERI SRL','C',5638),('ROSSETTI ALESSANDRO','C',5639),('STAZIONE DI SERVIZIO MANGANI','C',5640),('RONDINELLI GIOVANNI BATTISTA','C',5641),('DALTORICAMBI SRL','C',5642),('CORDIANO MARCELLO','C',5643),('EURORICAMBI DI TUSCIANO GIUSEPPE','C',5644),('AUTORIPARAZIONI IORI SNC.DI GRASSI','C',5645),('RI.CAR. srl','C',5646),('CAPPARELLI FRANCESCO','C',5647),('TUTTO MARMITTE DI BORSELLINO TANINA','C',5648),('PUGLIESE ANTONINO','C',5649),('AUTOFFICINA FUDA DI','C',5650),('TUTTO RICAMBI DI PRIOLO MARCO','C',5651),('LUCKY BAR RUGARI & GALLETTA S.A.S','C',5652),('ROCCAFORTE EURORICAMBI','C',5653),('CENTRO MIDAS REGGIO CALABRIA','C',5654),('BELLANTONI VINCENZO','C',5655),('AUTOFFICINA MISIANO SALVATORE','C',5656),('DEMASI GIUSEPPE','C',5657),('DIESELTRUCK DI ALFANO FABIO','C',5658),('ARIGANELLO MASSIMO AUTORICAMBI','C',5659),('MI.RA. RICAMBI SAS           MIRA','C',5660),('AGF SICILIA srl','C',5661),('MOLISE RICAMBI di A.Tamburri SNC','C',5662),('GARANZIA EUROPA GROUP SPA','C',5663),('FORESTIERI BRUNO ITALTRONYC','C',5664),('MORABITO VITO','C',5666),('MORABITO SALVATORE','C',5667),('LA MECCANICA SRL','C',5668),('GENNARO CACCIAPUOTI','C',5669),('PALAMARA GIUSEPPE PIT STOP','C',5670),('POLITO CARBURANTI DI ROCCO POLITO','C',5671),('STAZ.SERV.AGIP DI FRUCI GIUSEPPE','C',5672),('MARTINO SRL','C',5673),('SCHIPANI MARIANGELA AUTORICAMBI','C',5674),('AUTO VIP SRL','C',5675),('VECCHI GIUSEPPE RICAMBI','C',5676),('FARNO FULVIO & S. snc','C',5677),('CIRIMELLI AUTORICAMBI DI SAVERIO P.','C',5678),('IL CANNETO TAMOIL DI POLITO A. SAS','C',5679),('CARDINALE AUTOMOBILI SRL','C',5680),('D.R.A.M. snc','C',5681),('MANCUSO ILARIA AUTORICAMBI','C',5682),('COTRONEO DOMENICO','C',5683),('GRANATA F.CO F.G. AUTORICAMBI','C',5684),('RE.MA.DI ESPOSITO R.& BELSITO M.SRL','C',5685),('STAZ.SERV.AGIP DI BAGNATO SALVATORE','C',5686),('CAMMILLERI GAETANO AUTO GT','C',5687),('AGRILU DI MALVASI LUCIA','C',5688),('R.G. di ROSARIO GAROFOLO','C',5689),('AUTOELETTRONICA F.LLI DOMINICI snc','C',5690),('MELI CAR RENTALS LTD','C',5691),('RF srl','C',5692),('RUSSO GIUSEPPE','C',5693),('FALCONE FRANCESCO','C',5694),('STEFANELLI DOMENICO','C',5695),('GR srl','C',5696),('DIMENSIONE AUTO SRL','C',5697),('LATTANZIO DONATELLA','C',5698),('AUTOCOM SRL','C',5699),('GIORDANO SALVATORE OFF.CHEVROLET','C',5700),('CO.R.A.R.09 SRL','C',5701),('TRIMARCAR AUTORIC.DI MACRI PALMA','C',5702),('VIOLAUTO SRL','C',5703),('G.& V.POLICASTRI SNC','C',5704),('A.G.S.RICAMBI SRL','C',5705),('FLORI MOTORI SRL unipersonale','C',5706),('CUCINOTTA ANGELO AUTORICAMBI','C',5707),('ARCURI MARCELLO AUTORICAMBI','C',5708),('GAMMA RICAMBI SRL','C',5709),('VIOLA VINCENZO AUTORICAMBI','C',5710),('BELLOCCO RAFFAELE','C',5711),('BELCASTRO ANGELO ACCESSORI','C',5712),('SAFFIOTI CARMELO IMPRESA EDILE','C',5713),('A.M.RICAMBI DI ESPOSITO S.','C',5714),('3C RICAMBI DI COLAPRISTI VINCENZO','C',5715),('SURACE AUTO DI SURACE ROCCO','C',5716),('DIEMME SRL','C',5717),('F.LLI SCANGA SRL','C',5718),('ARTE FERRO DI ROSARIO BAGNATO','C',5719),('AUTORIC.CHIURCO DI LORICCHIO V.ZO','C',5720),('TIRRENO SNC.DI LUCCHESE V.ZO','C',5721),('CO.GE.TECH SRL','C',5722),('SALADINI SRL','C',5723),('TURANO ARMANDO','C',5724),('G.E.S.T. AUTORICAMBI SRL','C',5725),('CONDO ANTONIO','C',5726),('PUNTO MARMITTE DI FERRARA DOMENICO','C',5727),('INTERNAZIONALE RICAMBI SRL','C',5728),('A.A.R. DI CURCIO VINCENZO','C',5729),('RIC.PIAGGIO F.LLI SERGI DI SERGI G.','C',5730),('LAURITO GIUSEPPE AUTORICAMBI','C',5731),('AUTORICAMBI TRE A DI A.LUZZI','C',5732),('VISCOMI AGOSTINO','C',5733),('GROUP ECO ITALIA SRL','C',5734),('MESITI LUCA','C',5735),('AUTORICAMBI SCHIRRIPA SAS','C',5736),('TRUSCELLI ANTONIO','C',5737),('AUTORIC.GODINO DI MENDICINO LORETTA','C',5739),('MICHELE CAROLI SRL','C',5741),('CIRIA ALESSIO AUTORICAMBI','C',5742),('F.LLI LORENTI RICAMBI AUTO SRL','C',5743),('R.S.RICAMBI DI ROBERTO SGAMBELLURI','C',5744),('ARCURI SISTINO AUTORICAMBI','C',5745),('2V CAR PARTS DI VALERIO MACRI','C',5746),('BARILLARI GIUSEPPE AUTORICAMBI','C',5747),('AUTORICAMBI COSENTINO SRL uniperson','C',5748),('EURORICAMBI SRLS','C',5749),('AUTORICAMBI 2G DI GIANFRANCO GARUFI','C',9002),('A.R.A. RICAMBI VENETICO srl','C',9005),('BELLANTONI DOMENICO','C',9034),('BASILE SANTO','C',9036),('AUTORICAMBIFOX DI FOSSATI MATTEO','C',9062),('GRANDI RICAMBI DI GRANDI SIMONE','C',9070),('CARUSO CALOGERO','C',9071),('CALDERONE PAOLO FRANCESCO','C',9074),('GAGLIO GIUSEPPE Ricambi Auto e Acc.','C',9185),('GIORGIANNI AUTORICAMBI S.N.C.','C',9190),('SAPORITO MASSIMO LAUTORICAMBIO','C',9284),('LOMBARDO SANTO','C',9285),('MICALI GIOVANNI','C',9324),('MERLINO ANTONINO','C',9331),('MILONE GIUSEPPE','C',9352),('CENTRO AUTO DI TRAMONTANO','C',9380),('PINTAUDI ROCCO','C',9422),('AUTORICAMBI DI PINO SRL','C',9475),('SETTIMO GIOVANNI','C',9502),('SANFILIPPO GIUSEPPE','C',9505),('STURNIOLO ANTONINO Elettrauto','C',9507),('SUD RICAMBI snc DI GUGLIOTTA C.& C.','C',9508),('SPRINT CAR AUTORICAMBI DI GRECO A.','C',9511),('GIORGIO FRANCESCO','C',9534),('TRIFILO FILIPPO TUTTO AUTORICAMBI','C',9537),('RIGGIO GIUSEPPE & C. SNC','C',9620),('CORRISPETTIVI','C',999999),('','F',0),('SAFFIOTI CARMELO SNC','F',1),('TRENTINELLA FRANCESCO','F',2),('PRINTING.CENTER','F',3),('MAZZULLO FORTUNATO','F',4),('MGG ITALIA S.R.L. GRUPPO IMCO','F',5),('GLS GENERAL LOGISTICS SYSTEMS','F',6),('CIFANI SRL','F',7),('BARTOLINI spa','F',8),('ITALIA RECAPITI S.R.L','F',9),('UNI EURO S.P.A','F',10),('FORMAT S.A.S. DI PISCOPO ANTONIO &C','F',11),('GIAMMARRESI NICOLO','F',12),('CANNATA VINCENZO srl','F',13),('GRIMAS srl Etichette','F',14),('CONSORZIO ASSORICAMBI','F',15),('B.C.R. srl','F',16),('CADI snc F.LLI MILASI','F',17),('JET EXPRESS srl CORRIERE ESPRESSO','F',18),('PAPERNET SPA','F',19),('FIAMMA DI A.SEMINARA','F',20),('COSTANZO SALVATORE','F',21),('MONDOFFICE SRL','F',22),('SOF.INN. INFORMATICA srl','F',23),('G.TRIPODI SRL','F',24),('ARMES SPA','F',25),('J-SOFTWARE SRL','F',26),('SARITEL','F',27),('SDA  EXPRESS COURIER','F',28),('TRASPORTI PE.CAM','F',29),('CONSOZIO PDA','F',30),('OPITERGINA MARMITTE DI NESPOLO','F',31),('SCATOLIFICIO VENETO S.R.L.','F',32),('AUTOCOM SRL','F',33),('LT SRL LOGISTICA E TRASPORTI','F',34),('FUTIA DOMENICO','F',35),('SETEFI  SPA   GRUPPO INTESABCI','F',36),('ELPIDA D.O.O.','F',37),('I.F.R. DI MAURIZIO ROMANO','F',38),('CRUCITTI SRL','F',39),('GRAFICAJONICA SNC','F',40),('PANALPINA TRASP.MOND.SPA','F',41),('ARUBA SPA','F',42),('ENGINET SRL','F',43),('POLIGRAFICO SRL','F',44),('SERIBAG DI ZAGARI DANIELA','F',46),('PISANI FRANCESCO & FIGLI SPA','F',50),('INGROSUD DI PRATICO ANTONIO','F',51),('MEDIA WORLD COMPRA ON-LINE','F',53),('PM2 DI MILITANO NATALE','F',58),('RAG.PARISI GIUSEPPE','F',60),('REDOIL ITALIA spa','F',64),('BARBARO SPORT S.A.S.','F',75),('KRIOS  A.C. srl','F',83),('SERFEM DI SERGIO FEMIA','F',86),('SOVEB AUTO SRL','F',90),('SUSA TRASPORTI SPA','F',93),('SDA sas DI PALMITESSA (UNIGOM)','F',94),('NOTAIO MARCELLA CLARA RENI','F',96),('AB ELETTROSISTEMI','F',97),('SOCET srl  (TOTAL)','F',100),('DELIVERY EXPRESS','F',101),('TAZZETTI GUIDO & C. SPA Div.ACR','F',102),('COMPUTER ASSIST S.A.S. DI RUFFOLO','F',103),('ALDASA DI FRANCO SILENO','F',104),('STUDIO LEGALE AVV.GIULIANA METE','F',105),('TRIONE RICAMBI S.P.A','F',107),('RICAMBIFLEX GM srl','F',110),('CASA DEL RICAMBIO SRL','F',111),('LEONARDO SNC DIGITAL STUDIO','F',112),('MUSICO MACCHINE AGRICOLE','F',115),('ROBERT BOSCH spa','F',116),('C.B.F. BALDUCCI SPA','F',117),('ENGINE COMPONENTS srl GLASER','F',118),('SEAL-TECH SRL','F',119),('SMAT NORD srl','F',120),('RIVOIRA S.P.A','F',121),('BRENTA SRL','F',122),('RAPISARDA CARLO CARMELO','F',123),('CIEFFEBI TRASPORTI','F',124),('CAST BOLZONELLA S.A.S.','F',125),('EURODECOS S.R.L.','F',126),('DALTORICAMBI SRL','F',127),('LUBEX S.P.A.','F',128),('ITALTRADE SRL','F',129),('SAMAUTO SPA','F',130),('FRAP srl','F',135),('SOGEFI FILTRATION SPA','F',140),('UNIPART NV INTERNATIONAL RADIATOR','F',145),('EXIDE ITALIA SRL','F',150),('IBS SRL','F',155),('ASSOMARMITTE SRL','F',160),('IPS PARTS SRL','F',165),('OSRAV ALFEO MORET SPA         DAMPO','F',170),('EXO AUTOMOTIVE SPA  REMSA-OPENPARTS','F',175),('KAYABA ITALY GmbH','F',180),('SALADINI SRL','F',185),('CARTIERA LUCCHESE SPA (LUCART)','F',190),('TIRRENA IMPEX SRL','F',195),('FAAL BATTERIE SRL','F',200),('NRF ITALIA SRL','F',205),('DICRA SPA','F',210),('MECARM srl','F',215),('LEART-DIVISIONE EUROLITES SPA','F',1202),('EUROLITES S.P.A     ARIC','F',1203),('MORONI CESARE & C. snc','F',1307),('M.T.S. spa','F',1310),('MAGNETI MARELLI AFTERMARKET AND SER','F',1323),('MALO spa','F',1329),('NEWFREN SPA','F',1401),('OLYMPIA srl','F',1501),('F.LLI TRIPODI  SNC','F',1502),('FL.ITALIA srl OLEOBLITZ','F',1505),('OSRAM spa','F',1507),('PHILIPS SPA','F',1602),('DAYCO EUROPE SRL','F',1605),('RICAUTO SPA','F',1804),('R.M.S. S.P.A.','F',1817),('COMMERCIALE LUCANA snc','F',1901),('ENZO PARISI S.R.L.','F',1902),('SIOM S.R.L.','F',1908),('SIA INDUSTRIA ACCUMULATORI spa','F',1914),('SIMAKA','F',1923),('SITO GRUPPO INDISTRIALE spa','F',1935),('TOMAS RENATO & BRUNO sas','F',2001),('UMMAC srl','F',2201),('VEMA srl','F',2306),('VALEO SERVICE ITALIA S.P.A.','F',2308),('WD-40 COMPANY LTD','F',2309),('A.C.S. DI CORDOVANA SALVATORE','F',3101),('DELTA SERVICE snc','F',3103),('AUTOFORNITURE MILANESI spa','F',3104),('AGIP PETROLI ( Agenzia RC )','F',3105),('ARSAUTO SRL','F',3110),('AREXONS DIVISIONE DI FL SELENIA SPA','F',3116),('BOSATTA F.LLI \"F.B.\"srl','F',3201),('BIFFI & PREMOLI srl','F',3205),('BERGAMASCHI & F. spa','F',3213),('F.G.WOLF SRL','F',3302),('C.D.A. spa','F',3303),('CENTAURO srl','F',3307),('CASA DEL BULLONE sas','F',3311),('ORIGINAL BIRTH spa','F',3314),('FORTEBUONO METALLINFISSI SRL','F',3321),('C.C.R. srl CENTRO CUSCINETTI','F',3325),('CRAMER SRL','F',3328),('TOMMASELLI srl','F',3401),('DELLORTO spa','F',3403),('FEDERAL MOGUL ITALY SRL','F',3408),('F.A. ITALIA snc','F',3620),('FODONE sas','F',3621),('GUARNITAUTO spa','F',3707),('G.V.S. DI SALA RINALDO','F',3718),('PRES-SING S.A.S.','F',3906),('CODICI ANNULLATI','F',9999),('','F',999999);");
 
             statement.close();
             conn.commit();
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
index e1d741ee88..73498ed973 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
@@ -89,9 +89,9 @@ public abstract class AbstractContextClickUI<T extends AbstractComponent, E exte
 
     protected HorizontalLayout createContextClickControls() {
         HorizontalLayout contextClickControls = new HorizontalLayout();
-        contextClickControls.addComponent(new Button(
-                "Add/Remove default listener", new ListenerHandler(
-                        defaultListener)));
+        contextClickControls
+                .addComponent(new Button("Add/Remove default listener",
+                        new ListenerHandler(defaultListener)));
         contextClickControls
                 .addComponent(new Button("Add/Remove typed listener",
                         new ListenerHandler(typedListener)));
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
index 77009a0762..498b8b4fba 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.GridContextClickEvent;
 import com.vaadin.ui.HorizontalLayout;
 
-public class GridContextClick extends
-        AbstractContextClickUI<Grid, GridContextClickEvent> {
+public class GridContextClick
+        extends AbstractContextClickUI<Grid, GridContextClickEvent> {
 
     @Override
     protected Grid createTestComponent() {
@@ -66,8 +66,8 @@ public class GridContextClick extends
     @Override
     protected HorizontalLayout createContextClickControls() {
         HorizontalLayout controls = super.createContextClickControls();
-        controls.addComponent(new Button("Remove all content",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Remove all content", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
index 95fa85dc90..52ec68127f 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.TableContextClickEvent;
 
-public class TableContextClick extends
-        AbstractContextClickUI<Table, TableContextClickEvent> {
+public class TableContextClick
+        extends AbstractContextClickUI<Table, TableContextClickEvent> {
 
     @Override
     protected Table createTestComponent() {
@@ -57,8 +57,8 @@ public class TableContextClick extends
     @Override
     protected HorizontalLayout createContextClickControls() {
         HorizontalLayout controls = super.createContextClickControls();
-        controls.addComponent(new Button("Remove all content",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Remove all content", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
index 6b58138ab2..e0d763a937 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.contextclick;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Tree.TreeContextClickEvent;
 
-public class TreeContextClick extends
-        AbstractContextClickUI<Tree, TreeContextClickEvent> {
+public class TreeContextClick
+        extends AbstractContextClickUI<Tree, TreeContextClickEvent> {
 
     @Override
     protected Tree createTestComponent() {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
index 406f5d589e..ceb8ab416c 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table.TableContextClickEvent;
 import com.vaadin.ui.TreeTable;
 
-public class TreeTableContextClick extends
-        AbstractContextClickUI<TreeTable, TableContextClickEvent> {
+public class TreeTableContextClick
+        extends AbstractContextClickUI<TreeTable, TableContextClickEvent> {
 
     @Override
     protected TreeTable createTestComponent() {
@@ -58,8 +58,8 @@ public class TreeTableContextClick extends
     @Override
     protected HorizontalLayout createContextClickControls() {
         HorizontalLayout controls = super.createContextClickControls();
-        controls.addComponent(new Button("Remove all content",
-                new Button.ClickListener() {
+        controls.addComponent(
+                new Button("Remove all content", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index f94aecd3de..f640061a6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
@@ -21,15 +21,14 @@ public class ConverterThatEnforcesAFormat extends AbstractTestUIWithLog {
         tf.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                log("Value changed to "
-                        + event.getProperty().getValue()
-                        + "(converted value is "
-                        + tf.getConvertedValue()
+                log("Value changed to " + event.getProperty().getValue()
+                        + "(converted value is " + tf.getConvertedValue()
                         + "). Two-way conversion gives: "
                         + tf.getConverter().convertToPresentation(
                                 tf.getConverter().convertToModel(tf.getValue(),
                                         Double.class, tf.getLocale()),
-                                String.class, tf.getLocale()) + ")");
+                                String.class, tf.getLocale())
+                        + ")");
             }
         });
         tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index 7ea644c3cb..f6eee3cbc0 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
@@ -5,8 +5,8 @@ import java.util.Locale;
 
 import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
 
-public class StringToDoubleConverterWithThreeFractionDigits extends
-        LegacyStringToDoubleConverter {
+public class StringToDoubleConverterWithThreeFractionDigits
+        extends LegacyStringToDoubleConverter {
 
     @Override
     protected NumberFormat getFormat(Locale locale) {
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java
index afdf8dcfa1..159333212f 100644
--- a/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.data.bean;
 
 public enum Country {
 
-    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS(
-            "Netherlands"), SOUTH_AFRICA("South Africa");
+    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA(
+            "Russia"), NETHERLANDS("Netherlands"), SOUTH_AFRICA("South Africa");
 
     private String name;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java
index f7bad31d0e..00d28a1cd8 100644
--- a/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java
@@ -136,8 +136,8 @@ public class Person {
     }
 
     public static Person createTestPerson2() {
-        return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18,
-                Sex.FEMALE, new Address("Red street", 12, "Amsterdam",
+        return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18, Sex.FEMALE,
+                new Address("Red street", 12, "Amsterdam",
                         Country.NETHERLANDS));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
index 5d57de388c..c978455cd7 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
@@ -77,8 +77,8 @@ public class AcceptAnythingWindow extends Window {
                         int clientY = eventDetails.getClientY();
 
                         try {
-                            layout.getPosition(component).setTopValue(
-                                    Float.valueOf(clientY - top));
+                            layout.getPosition(component)
+                                    .setTopValue(Float.valueOf(clientY - top));
                             layout.getPosition(component).setLeftValue(
                                     Float.valueOf(clientX - left));
                         } catch (Exception e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
index 99dd069142..b01ea3c163 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -78,8 +78,9 @@ public class AcceptFromComponent extends Window {
                             // Item id
                             Label l = new Label();
                             l.setSizeUndefined();
-                            l.setValue("ItemId : "
-                                    + ((DataBoundTransferable) ctr).getItemId());
+                            l.setValue(
+                                    "ItemId : " + ((DataBoundTransferable) ctr)
+                                            .getItemId());
                             layout.addComponent(l);
                             component = l;
 
@@ -100,8 +101,8 @@ public class AcceptFromComponent extends Window {
                         int clientY = eventDetails.getClientY();
 
                         try {
-                            layout.getPosition(component).setTopValue(
-                                    Float.valueOf(clientY - top));
+                            layout.getPosition(component)
+                                    .setTopValue(Float.valueOf(clientY - top));
                             layout.getPosition(component).setLeftValue(
                                     Float.valueOf(clientX - left));
                         } catch (Exception e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java
index 9ef1b4029b..7f60dacecf 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java
@@ -94,8 +94,8 @@ public class ActiveDragSourceClassName extends TestBase {
                         }
                         next = componentIterator.next();
                     }
-                    if (dropTargetData.getData("horizontalLocation").equals(
-                            "LEFT")) {
+                    if (dropTargetData.getData("horizontalLocation")
+                            .equals("LEFT")) {
                         index--;
                         if (index < 0) {
                             index = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
index 1939bbbce5..e377ea4402 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
@@ -46,7 +46,8 @@ public class DDInterrupt extends AbstractTestUI {
         DragAndDropWrapper dndLayoutWrapper = new DragAndDropWrapper(layout);
         addComponent(dndLayoutWrapper);
 
-        DragAndDropWrapper labelWrapper = new DragAndDropWrapper(draggableLabel);
+        DragAndDropWrapper labelWrapper = new DragAndDropWrapper(
+                draggableLabel);
         draggableLabel.setSizeUndefined();
         labelWrapper.setDragStartMode(DragStartMode.COMPONENT);
         labelWrapper.setSizeUndefined();
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
index 161a9b423e..64778858f2 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
@@ -46,8 +46,8 @@ public class DDTest1 extends TestBase {
 
         pane1.addComponent(label);
 
-        Link l = new Link("This is link", new ExternalResource(
-                "http://www.google.com/"));
+        Link l = new Link("This is link",
+                new ExternalResource("http://www.google.com/"));
         pane1.addComponent(l, "top:100px; left: 20px;");
 
         label = new Label("Bar");
@@ -55,7 +55,8 @@ public class DDTest1 extends TestBase {
         pane1.addComponent(label);
 
         DragDropPane pane2 = new DragDropPane();
-        pane2.setCaption("Pane2 (accept needs server side visit, check for \"Bar\")");
+        pane2.setCaption(
+                "Pane2 (accept needs server side visit, check for \"Bar\")");
         final AcceptCriterion crit = new ServerSideCriterion() {
             /**
              * 
@@ -139,10 +140,8 @@ public class DDTest1 extends TestBase {
                             Collection<?> itemPropertyIds = item
                                     .getItemPropertyIds();
                             for (Object propId : itemPropertyIds) {
-                                addItem.getItemProperty(propId)
-                                        .setValue(
-                                                item.getItemProperty(propId)
-                                                        .getValue());
+                                addItem.getItemProperty(propId).setValue(item
+                                        .getItemProperty(propId).getValue());
                             }
                         }
                         idx.setParent(childId, itemId);
@@ -178,10 +177,8 @@ public class DDTest1 extends TestBase {
                         Collection<?> itemPropertyIds = item
                                 .getItemPropertyIds();
                         for (Object propertyId : itemPropertyIds) {
-                            addedItem.getItemProperty(propertyId)
-                                    .setValue(
-                                            item.getItemProperty(propertyId)
-                                                    .getValue());
+                            addedItem.getItemProperty(propertyId).setValue(item
+                                    .getItemProperty(propertyId).getValue());
                         }
                         copyChildren(source, target, childId);
                     }
@@ -249,8 +246,8 @@ public class DDTest1 extends TestBase {
         main.addComponent(pane3);
         main.addComponent(t);
         main.addComponent(ta);
-        main.addComponent(new Link("Foo", new ExternalResource(
-                "http://www.itmill.com/")));
+        main.addComponent(new Link("Foo",
+                new ExternalResource("http://www.itmill.com/")));
 
         getLayout().setSizeFull();
         addComponent(main);
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
index e9fb2910b0..81fe3a2df1 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
@@ -272,8 +272,8 @@ public class DDTest2 extends TestBase {
         for (int i = 0; i < 10; i++) {
             Item addItem = table.addItem("Item" + i);
             Person p = testData.getIdByIndex(i);
-            addItem.getItemProperty("Name").setValue(
-                    p.getFirstName() + " " + p.getLastName());
+            addItem.getItemProperty("Name")
+                    .setValue(p.getFirstName() + " " + p.getLastName());
             addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60));
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
index acd54274da..c2af2cca77 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
@@ -30,16 +30,14 @@ public class DDTest4 extends TestBase {
     protected void setup() {
         UI w = getLayout().getUI();
 
-        TestUtils
-                .injectCSS(
-                        w,
-                        ".v-table-row-drag-middle .v-table-cell-content {"
-                                + "        background-color: inherit ; border-bottom: 1px solid cyan;"
-                                + "}"
-                                + ".v-table-row-drag-middle .v-table-cell-wrapper {"
-                                + "        margin-bottom: -1px;" + "}" + ""
+        TestUtils.injectCSS(w,
+                ".v-table-row-drag-middle .v-table-cell-content {"
+                        + "        background-color: inherit ; border-bottom: 1px solid cyan;"
+                        + "}"
+                        + ".v-table-row-drag-middle .v-table-cell-wrapper {"
+                        + "        margin-bottom: -1px;" + "}" + ""
 
-                );
+        );
 
         // hl.addComponent(tree1);
         hl.addComponent(table);
@@ -86,7 +84,8 @@ public class DDTest4 extends TestBase {
                 IndexedContainer containerDataSource = (IndexedContainer) table
                         .getContainerDataSource();
                 int newIndex = containerDataSource.indexOfId(itemIdOver) - 1;
-                if (dropTargetData.getDropLocation() != VerticalDropLocation.TOP) {
+                if (dropTargetData
+                        .getDropLocation() != VerticalDropLocation.TOP) {
                     newIndex++;
                 }
                 if (newIndex < 0) {
@@ -143,8 +142,8 @@ public class DDTest4 extends TestBase {
         for (int i = 0; i < 10; i++) {
             Item addItem = table.addItem("Item" + i);
             Person p = testData.getIdByIndex(i);
-            addItem.getItemProperty("Name").setValue(
-                    p.getFirstName() + " " + p.getLastName());
+            addItem.getItemProperty("Name")
+                    .setValue(p.getFirstName() + " " + p.getLastName());
             addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60));
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java
index 43342fdc35..0e7fd737d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java
@@ -52,14 +52,11 @@ public class DDTest5 extends TestBase {
         HorizontalSortableCssLayoutWithWrappers verticalSortableCssLayoutWithWrappers = new HorizontalSortableCssLayoutWithWrappers();
         w.addWindow(verticalSortableCssLayoutWithWrappers);
         verticalSortableCssLayoutWithWrappers.setPositionX(200);
-        verticalSortableCssLayoutWithWrappers.setPositionY(40); /*
-                                                                 * FIXME:
-                                                                 * subwindow
-                                                                 * horizontal
-                                                                 * position does
-                                                                 * not work if
-                                                                 * only x set
-                                                                 */
+        verticalSortableCssLayoutWithWrappers
+                .setPositionY(40); /*
+                                    * FIXME: subwindow horizontal position does
+                                    * not work if only x set
+                                    */
 
         Label l;
 
@@ -81,8 +78,8 @@ public class DDTest5 extends TestBase {
         cssLayout.setHeight("300px");
 
         dragAndDropWrapper2 = new DragAndDropWrapper(cssLayout);
-        dragAndDropWrapper2
-                .setCaption("Drop here or sort with dd (wrapper(csslayout(n*wrapper(label))))");
+        dragAndDropWrapper2.setCaption(
+                "Drop here or sort with dd (wrapper(csslayout(n*wrapper(label))))");
 
         dh = new DropHandler() {
 
@@ -99,7 +96,8 @@ public class DDTest5 extends TestBase {
                  * here)
                  */
 
-                if (dropEvent.getTransferable() instanceof WrapperTransferable) {
+                if (dropEvent
+                        .getTransferable() instanceof WrapperTransferable) {
                     WrapperTransferable transferable = (WrapperTransferable) dropEvent
                             .getTransferable();
                     Component sourceComponent = transferable
@@ -148,8 +146,8 @@ public class DDTest5 extends TestBase {
                 } else {
                     // no component, add label with "Text"
 
-                    String data = (String) dropEvent.getTransferable().getData(
-                            "text/plain");
+                    String data = (String) dropEvent.getTransferable()
+                            .getData("text/plain");
                     if (data == null || "".equals(data)) {
                         data = "-- no Text --";
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
index 2122e8e982..e2705aecba 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
@@ -110,11 +110,13 @@ public class DDTest6 extends TestBase {
                 TreeTargetDetails dropTargetData = (TreeTargetDetails) dropEvent
                         .getTargetDetails();
                 folder = (Folder) dropTargetData.getItemIdInto();
-                if (dropEvent.getTransferable() instanceof DataBoundTransferable) {
+                if (dropEvent
+                        .getTransferable() instanceof DataBoundTransferable) {
                     DataBoundTransferable transferable = (DataBoundTransferable) dropEvent
                             .getTransferable();
                     file = (File) transferable.getItemId();
-                } else if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) {
+                } else if (dropEvent.getTransferable()
+                        .getSourceComponent() instanceof FileIcon) {
                     FileIcon draggedIcon = (FileIcon) dropEvent
                             .getTransferable().getSourceComponent();
                     file = draggedIcon.file;
@@ -131,7 +133,8 @@ public class DDTest6 extends TestBase {
             private Action[] actions = new Action[] { new Action("Remove") };
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 ContainerHierarchicalWrapper containerDataSource = (ContainerHierarchicalWrapper) tree1
                         .getContainerDataSource();
                 containerDataSource.removeItemRecursively(target);
@@ -163,15 +166,12 @@ public class DDTest6 extends TestBase {
 
         getLayout().setSizeFull();
         getLayout().addComponent(sp);
-        TestUtils
-                .injectCSS(
-                        getLayout().getUI(),
-                        ""
-                                + ".v-tree .v-icon {height:16px;} "
-                                + ".v-tree-node-caption-drag-top {/*border-top: none;*/} "
-                                + ".v-tree-node-caption-drag-bottom {border-bottom: none ;} "
-                                + ".v-tree-node-caption-drag-center {background-color: transparent;}"
-                                + ".v-tree-node-caption-dragfolder { background-color: cyan;} ");
+        TestUtils.injectCSS(getLayout().getUI(), ""
+                + ".v-tree .v-icon {height:16px;} "
+                + ".v-tree-node-caption-drag-top {/*border-top: none;*/} "
+                + ".v-tree-node-caption-drag-bottom {border-bottom: none ;} "
+                + ".v-tree-node-caption-drag-center {background-color: transparent;}"
+                + ".v-tree-node-caption-dragfolder { background-color: cyan;} ");
 
     }
 
@@ -256,7 +256,8 @@ public class DDTest6 extends TestBase {
     private void openFile(File file) {
         // ATM supports only images.
         if (file.getType().equals("image/png")) {
-            Embedded embedded = new Embedded(file.getName(), file.getResource());
+            Embedded embedded = new Embedded(file.getName(),
+                    file.getResource());
             VerticalLayout layout = new VerticalLayout();
             layout.setMargin(true);
             Window w = new Window(file.getName(), layout);
@@ -331,8 +332,9 @@ public class DDTest6 extends TestBase {
 
         @SuppressWarnings("static-access")
         void reload() {
-            Collection<?> children = folder == null ? DDTest6.get().tree1
-                    .rootItemIds() : DDTest6.get().tree1.getChildren(folder);
+            Collection<?> children = folder == null
+                    ? DDTest6.get().tree1.rootItemIds()
+                    : DDTest6.get().tree1.getChildren(folder);
             if (children == null) {
                 l.removeAllComponents();
                 return;
@@ -370,7 +372,8 @@ public class DDTest6 extends TestBase {
         @SuppressWarnings("static-access")
         public void drop(DragAndDropEvent dropEvent) {
 
-            if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) {
+            if (dropEvent.getTransferable()
+                    .getSourceComponent() instanceof FileIcon) {
                 // update the position
 
                 DragAndDropWrapper.WrapperTransferable transferable = (WrapperTransferable) dropEvent
@@ -389,12 +392,14 @@ public class DDTest6 extends TestBase {
                 int deltaY = mouseEvent.getClientY()
                         - mouseDownEvent.getClientY();
 
-                ComponentPosition position = l.getPosition(transferable
-                        .getSourceComponent());
+                ComponentPosition position = l
+                        .getPosition(transferable.getSourceComponent());
                 position.setTop(position.getTopValue() + deltaY, UNITS_PIXELS);
-                position.setLeft(position.getLeftValue() + deltaX, UNITS_PIXELS);
+                position.setLeft(position.getLeftValue() + deltaX,
+                        UNITS_PIXELS);
 
-            } else if (dropEvent.getTransferable().getSourceComponent() == tree1) {
+            } else if (dropEvent.getTransferable()
+                    .getSourceComponent() == tree1) {
 
                 // dragged something from tree to the folder shown
 
@@ -425,7 +430,8 @@ public class DDTest6 extends TestBase {
                             }
 
                             @Override
-                            public void onProgress(StreamingProgressEvent event) {
+                            public void onProgress(
+                                    StreamingProgressEvent event) {
                             }
 
                             @Override
@@ -536,7 +542,8 @@ public class DDTest6 extends TestBase {
                     public void drop(DragAndDropEvent dropEvent) {
                         File f = null;
 
-                        if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) {
+                        if (dropEvent.getTransferable()
+                                .getSourceComponent() instanceof FileIcon) {
                             FileIcon new_name = (FileIcon) dropEvent
                                     .getTransferable().getSourceComponent();
                             f = new_name.file;
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
index 3c819ce15c..32082d2fe9 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
@@ -31,22 +31,18 @@ public class DDTest7 extends TestBase {
     protected void setup() {
         UI w = getLayout().getUI();
 
-        TestUtils
-                .injectCSS(
-                        w,
-                        ".v-table-row-drag-middle .v-table-cell-content {"
-                                + "        background-color: inherit ; border-bottom: 1px solid cyan;"
-                                + "}"
-                                + ".v-table-row-drag-middle .v-table-cell-wrapper {"
-                                + "        margin-bottom: -1px;"
-                                + "}"
-                                + ""
-                                // always show the drop hint below
-                                + ".v-table-row-drag-top .v-table-cell-content {"
-                                + "border-top: 0; margin-top:0;border-bottom:1px solid cyan;"
-                                + "        margin-bottom: -1px;" + "}" + ""
-
-                );
+        TestUtils.injectCSS(w,
+                ".v-table-row-drag-middle .v-table-cell-content {"
+                        + "        background-color: inherit ; border-bottom: 1px solid cyan;"
+                        + "}"
+                        + ".v-table-row-drag-middle .v-table-cell-wrapper {"
+                        + "        margin-bottom: -1px;" + "}" + ""
+                        // always show the drop hint below
+                        + ".v-table-row-drag-top .v-table-cell-content {"
+                        + "border-top: 0; margin-top:0;border-bottom:1px solid cyan;"
+                        + "        margin-bottom: -1px;" + "}" + ""
+
+        );
 
         // hl.addComponent(tree1);
         hl.addComponent(table);
@@ -171,8 +167,8 @@ public class DDTest7 extends TestBase {
         for (int i = 0; i < 40; i++) {
             Item addItem = table.addItem("Item" + i);
             Person p = testData.getIdByIndex(i);
-            addItem.getItemProperty("Name").setValue(
-                    p.getFirstName() + " " + p.getLastName());
+            addItem.getItemProperty("Name")
+                    .setValue(p.getFirstName() + " " + p.getLastName());
             addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60));
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
index beaae4175e..af45a26cbf 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
@@ -76,10 +76,8 @@ public class DDTest8 extends AbstractTestUI {
                             Collection<?> itemPropertyIds = item
                                     .getItemPropertyIds();
                             for (Object propId : itemPropertyIds) {
-                                addItem.getItemProperty(propId)
-                                        .setValue(
-                                                item.getItemProperty(propId)
-                                                        .getValue());
+                                addItem.getItemProperty(propId).setValue(item
+                                        .getItemProperty(propId).getValue());
                             }
                         }
                         idx.setParent(childId, itemId);
@@ -116,10 +114,8 @@ public class DDTest8 extends AbstractTestUI {
                         Collection<?> itemPropertyIds = item
                                 .getItemPropertyIds();
                         for (Object propertyId : itemPropertyIds) {
-                            addedItem.getItemProperty(propertyId)
-                                    .setValue(
-                                            item.getItemProperty(propertyId)
-                                                    .getValue());
+                            addedItem.getItemProperty(propertyId).setValue(item
+                                    .getItemProperty(propertyId).getValue());
                         }
                         copyChildren(source, target, childId);
                     }
@@ -166,8 +162,9 @@ public class DDTest8 extends AbstractTestUI {
 
             @Override
             public AcceptCriterion getAcceptCriterion() {
-                return new Or(new AbstractSelect.TargetItemIs(tree, "Foo",
-                        "Bar"), new AbstractSelect.AcceptItem(tree, "Foo"),
+                return new Or(
+                        new AbstractSelect.TargetItemIs(tree, "Foo", "Bar"),
+                        new AbstractSelect.AcceptItem(tree, "Foo"),
                         tree.new TargetInSubtree("Bar5") //
                 );
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java
index 4ecabee617..384a02b87b 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java
@@ -51,11 +51,9 @@ public class DragAndDropFiles extends TestBase {
                         Html5File file = files[i];
                         // Max 1 MB files are uploaded
                         if (file.getFileSize() > 1024 * 1024) {
-                            getMainWindow()
-                                    .showNotification(
-                                            "File "
-                                                    + file.getFileName()
-                                                    + " was too large, not transferred to the server side.");
+                            getMainWindow().showNotification("File "
+                                    + file.getFileName()
+                                    + " was too large, not transferred to the server side.");
                             continue;
                         }
 
@@ -72,32 +70,33 @@ public class DragAndDropFiles extends TestBase {
                             }
 
                             @Override
-                            public void onProgress(StreamingProgressEvent event) {
-                                System.err.println("Progress"
-                                        + event.getBytesReceived());
+                            public void onProgress(
+                                    StreamingProgressEvent event) {
+                                System.err.println(
+                                        "Progress" + event.getBytesReceived());
                             }
 
                             @Override
                             public void streamingStarted(
                                     StreamingStartEvent event) {
-                                getMainWindow().showNotification(
-                                        "Started uploading "
+                                getMainWindow()
+                                        .showNotification("Started uploading "
                                                 + event.getFileName());
                             }
 
                             @Override
                             public void streamingFinished(
                                     StreamingEndEvent event) {
-                                getMainWindow().showNotification(
-                                        "Finished uploading "
+                                getMainWindow()
+                                        .showNotification("Finished uploading "
                                                 + event.getFileName());
                             }
 
                             @Override
                             public void streamingFailed(
                                     StreamingErrorEvent event) {
-                                getMainWindow().showNotification(
-                                        "Failed uploading "
+                                getMainWindow()
+                                        .showNotification("Failed uploading "
                                                 + event.getFileName());
                             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
index 6296051ee2..2c3d53d99f 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
@@ -85,10 +85,10 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler {
                 int clientY = eventDetails.getClientY();
 
                 try {
-                    root.getPosition(component).setTopValue(
-                            Float.valueOf(clientY - top));
-                    root.getPosition(component).setLeftValue(
-                            Float.valueOf(clientX - left));
+                    root.getPosition(component)
+                            .setTopValue(Float.valueOf(clientY - top));
+                    root.getPosition(component)
+                            .setLeftValue(Float.valueOf(clientX - left));
                 } catch (Exception e) {
                 }
             } else {
@@ -150,13 +150,16 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler {
                         }
 
                         @Override
-                        public void streamingStarted(StreamingStartEvent event) {
+                        public void streamingStarted(
+                                StreamingStartEvent event) {
                         }
 
                         @Override
                         public void streamingFinished(StreamingEndEvent event) {
-                            l.setValue((new String(byteArrayOutputStream
-                                    .toByteArray()).substring(0, 80) + "..."));
+                            l.setValue((new String(
+                                    byteArrayOutputStream.toByteArray())
+                                            .substring(0, 80)
+                                    + "..."));
                         }
 
                         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index fe33bce76b..c4f7c2e743 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -51,8 +51,9 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
     }
 
     private DropHandler dh = new DropHandler() {
-        AcceptCriterion crit = new And(new TargetDetailIs("horizontalLocation",
-                "LEFT"), new Not(SourceIsTarget.get()));
+        AcceptCriterion crit = new And(
+                new TargetDetailIs("horizontalLocation", "LEFT"),
+                new Not(SourceIsTarget.get()));
 
         @Override
         public AcceptCriterion getAcceptCriterion() {
@@ -78,8 +79,8 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
                         }
                         next = componentIterator.next();
                     }
-                    if (dropTargetData.getData("horizontalLocation").equals(
-                            "LEFT")) {
+                    if (dropTargetData.getData("horizontalLocation")
+                            .equals("LEFT")) {
                         index--;
                         if (index < 0) {
                             index = 0;
@@ -96,7 +97,8 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
     };
 
     public HorizontalLayoutSortableWithWrappers() {
-        setCaption("Horizontally sortable layout via (ddwrappers): Try sorting blocks by dragging them");
+        setCaption(
+                "Horizontally sortable layout via (ddwrappers): Try sorting blocks by dragging them");
         DragAndDropWrapper pane = new DragAndDropWrapper(layout);
         setContent(pane);
         pane.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index d17c618f59..1d7fb5d273 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
@@ -72,8 +72,8 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window {
                         }
                         next = componentIterator.next();
                     }
-                    if (dropTargetData.getData("horizontalLocation").equals(
-                            "LEFT")) {
+                    if (dropTargetData.getData("horizontalLocation")
+                            .equals("LEFT")) {
                         index--;
                         if (index < 0) {
                             index = 0;
@@ -90,7 +90,8 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window {
     };
 
     public HorizontalSortableCssLayoutWithWrappers() {
-        setCaption("Horizontally sortable csslayout via (ddwrappers):Try sorting blocks by draggin them");
+        setCaption(
+                "Horizontally sortable csslayout via (ddwrappers):Try sorting blocks by draggin them");
         DragAndDropWrapper pane = new DragAndDropWrapper(cssLayout);
         setContent(pane);
         pane.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
index 66179692b4..6f37316a78 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
@@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource;
 
 @Connect(MyDragSource.class)
-public class MyDragSourceConnector extends AbstractComponentConnector implements
-        Paintable {
+public class MyDragSourceConnector extends AbstractComponentConnector
+        implements Paintable {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
index 5bbb397502..3307c0ba7b 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
@@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget;
 
 @Connect(MyDropTarget.class)
-public class MyDropTargetConnector extends AbstractComponentConnector implements
-        Paintable {
+public class MyDropTargetConnector extends AbstractComponentConnector
+        implements Paintable {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
index 020a6b56c5..ba30c32155 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
@@ -35,8 +35,8 @@ public class NotPaintedAcceptSource extends TestBase {
             public void drop(DragAndDropEvent event) {
                 TableTransferable transferable = (TableTransferable) event
                         .getTransferable();
-                Item item = transferable.getSourceComponent().getItem(
-                        transferable.getItemId());
+                Item item = transferable.getSourceComponent()
+                        .getItem(transferable.getItemId());
                 Object value = item.getItemProperty("value").getValue();
                 AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event
                         .getTargetDetails();
@@ -44,8 +44,8 @@ public class NotPaintedAcceptSource extends TestBase {
                 Object addItemAfter = target.addItemAfter(targetItemId);
                 target.getItem(addItemAfter).getItemProperty("value")
                         .setValue(value);
-                transferable.getSourceComponent().removeItem(
-                        transferable.getItemId());
+                transferable.getSourceComponent()
+                        .removeItem(transferable.getItemId());
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
index e19bbaf2c5..974e10eb19 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
@@ -33,8 +33,8 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase {
             public void drop(DragAndDropEvent event) {
                 TableTransferable transferable = (TableTransferable) event
                         .getTransferable();
-                Item item = transferable.getSourceComponent().getItem(
-                        transferable.getItemId());
+                Item item = transferable.getSourceComponent()
+                        .getItem(transferable.getItemId());
                 Object value = item.getItemProperty("value").getValue();
                 AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event
                         .getTargetDetails();
@@ -42,8 +42,8 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase {
                 Object addItemAfter = target.addItemAfter(targetItemId);
                 target.getItem(addItemAfter).getItemProperty("value")
                         .setValue(value);
-                transferable.getSourceComponent().removeItem(
-                        transferable.getItemId());
+                transferable.getSourceComponent()
+                        .removeItem(transferable.getItemId());
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java
index 609b2fe4fc..be940f64d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java
@@ -17,14 +17,14 @@ public class StartHtml5Drag extends TestBase {
 
     @Override
     protected void setup() {
-        DragAndDropWrapper dragStart = new DragAndDropWrapper(new Label(
-                "Drag me"));
+        DragAndDropWrapper dragStart = new DragAndDropWrapper(
+                new Label("Drag me"));
         dragStart.setDragStartMode(DragStartMode.HTML5);
         dragStart.setHTML5DataFlavor("Text", "HTML5!");
         addComponent(dragStart);
 
-        DragAndDropWrapper dropTarget = new DragAndDropWrapper(new Label(
-                "over here"));
+        DragAndDropWrapper dropTarget = new DragAndDropWrapper(
+                new Label("over here"));
         dropTarget.setDropHandler(new DropHandler() {
 
             @Override
@@ -34,12 +34,9 @@ public class StartHtml5Drag extends TestBase {
 
             @Override
             public void drop(DragAndDropEvent event) {
-                getWindows()
-                        .iterator()
-                        .next()
-                        .showNotification(
-                                ((WrapperTransferable) event.getTransferable())
-                                        .getText());
+                getWindows().iterator().next().showNotification(
+                        ((WrapperTransferable) event.getTransferable())
+                                .getText());
             }
         });
         addComponent(dropTarget);
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index b44f8c5a99..9c172dd6ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -35,7 +35,8 @@ public class TreeDragStart extends TestBase {
         CheckBox checkBox = new CheckBox("Enabled");
         checkBox.setImmediate(true);
         checkBox.setValue(true);
-        checkBox.addValueChangeListener(event -> tree.setEnabled(!tree.isEnabled()));
+        checkBox.addValueChangeListener(
+                event -> tree.setEnabled(!tree.isEnabled()));
         addComponent(checkBox);
         checkBox = new CheckBox("Drag start");
         checkBox.setImmediate(true);
@@ -71,8 +72,8 @@ public class TreeDragStart extends TestBase {
             public AcceptCriterion getAcceptCriterion() {
                 // Accept drops in the middle of container items
                 // and below and above all items.
-                return new Or(Tree.TargetItemAllowsChildren.get(), new Not(
-                        VerticalLocationIs.MIDDLE));
+                return new Or(Tree.TargetItemAllowsChildren.get(),
+                        new Not(VerticalLocationIs.MIDDLE));
             }
 
             @Override
@@ -249,20 +250,17 @@ public class TreeDragStart extends TestBase {
                 new InventoryObject("+5 Quarterstaff (blessed)", 3.5, false),
                 new InventoryObject("+3 Elven Dagger (blessed)", 0.2, false),
                 new InventoryObject("+5 Helmet (greased)", 1.5, false),
-                new Object[] {
-                        new InventoryObject("Sack", 0.2, true),
+                new Object[] { new InventoryObject("Sack", 0.2, true),
                         new InventoryObject("Pick-Axe", 2.5, false),
                         new InventoryObject("Lock Pick", 0.1, false),
                         new InventoryObject("Tinning Kit", 0.5, false),
                         new InventoryObject("Potion of Healing (blessed)", 0.7,
                                 false), },
-                new Object[] {
-                        new InventoryObject("Bag of Holding", 0.1, true),
+                new Object[] { new InventoryObject("Bag of Holding", 0.1, true),
                         new InventoryObject("Magic Marker", 0.05, false),
                         new InventoryObject("Can of Grease (blessed)", 0.5,
                                 false), },
-                new Object[] {
-                        new InventoryObject("Chest", 10.0, true),
+                new Object[] { new InventoryObject("Chest", 10.0, true),
                         new InventoryObject("Scroll of Identify", 0.1, false),
                         new InventoryObject("Scroll of Genocide", 0.1, false),
                         new InventoryObject("Towel", 0.3, false),
@@ -298,8 +296,8 @@ public class TreeDragStart extends TestBase {
                         put(sub, item, container);
                     }
 
-                    inventoryStore
-                            .put(item.getBean().getName(), item.getBean());
+                    inventoryStore.put(item.getBean().getName(),
+                            item.getBean());
                 }
             }
         }.put(inventory, null, container);
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java
index 8cca6d6459..41f25bf02b 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java
@@ -17,8 +17,8 @@ import com.vaadin.client.ui.dd.VTransferable;
 /**
  * Example code to implement Component that has something to drag.
  */
-public class VMyDragSource extends Composite implements MouseDownHandler,
-        MouseMoveHandler, MouseOutHandler {
+public class VMyDragSource extends Composite
+        implements MouseDownHandler, MouseMoveHandler, MouseOutHandler {
 
     private boolean mouseDown;
     private MouseDownEvent mDownEvent;
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java
index 58bd326524..ace53d0421 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java
@@ -7,8 +7,8 @@ import com.vaadin.client.ui.dd.VDragEvent;
 import com.vaadin.client.ui.dd.VDropHandler;
 import com.vaadin.client.ui.dd.VHasDropHandler;
 
-public class VMyDropTarget extends Composite implements VHasDropHandler,
-        VDropHandler {
+public class VMyDropTarget extends Composite
+        implements VHasDropHandler, VDropHandler {
 
     ApplicationConnection client;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
index d62f71b513..9d422a8a8f 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
@@ -54,8 +54,8 @@ public class DeclarativeEditor extends UI {
         editor = new TextArea();
         editor.setSizeFull();
         try {
-            editor.setValue(IOUtils.toString(getClass().getResourceAsStream(
-                    "DeclarativeEditorInitial.html")));
+            editor.setValue(IOUtils.toString(getClass()
+                    .getResourceAsStream("DeclarativeEditorInitial.html")));
         } catch (ReadOnlyException e) {
             e.printStackTrace();
         } catch (IOException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java
index a123af0f7d..1d22a98ae2 100644
--- a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java
+++ b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java
@@ -32,8 +32,8 @@ public class ErrorHandlers extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         addComponent(runtimeExceptionOnClick(new Button("Standard button")));
         addComponent(npeOnClick(new Button("Standard button with NPE")));
-        Button customErrorButton = notificationErrorHandler(new Button(
-                "Button with notification error handler"));
+        Button customErrorButton = notificationErrorHandler(
+                new Button("Button with notification error handler"));
         addComponent(runtimeExceptionOnClick(customErrorButton));
 
         final VerticalLayout layoutWithErrorHandler = new VerticalLayout(
@@ -42,15 +42,14 @@ public class ErrorHandlers extends AbstractTestUI {
 
             @Override
             public void error(com.vaadin.server.ErrorEvent event) {
-                layoutWithErrorHandler.addComponent(new Label("Layout error: "
-                        + getErrorMessage(event)));
+                layoutWithErrorHandler.addComponent(
+                        new Label("Layout error: " + getErrorMessage(event)));
             }
 
         };
         layoutWithErrorHandler.setErrorHandler(e);
-        layoutWithErrorHandler
-                .addComponent(notificationErrorHandler(npeOnClick(new Button(
-                        "Error handler on button and parent"))));
+        layoutWithErrorHandler.addComponent(notificationErrorHandler(
+                npeOnClick(new Button("Error handler on button and parent"))));
         addComponent(layoutWithErrorHandler);
     }
 
@@ -59,7 +58,8 @@ public class ErrorHandlers extends AbstractTestUI {
         return button;
     }
 
-    protected static String getErrorMessage(com.vaadin.server.ErrorEvent event) {
+    protected static String getErrorMessage(
+            com.vaadin.server.ErrorEvent event) {
         Component c = DefaultErrorHandler.findAbstractComponent(event);
         String errorMsg = "Error: '" + getMessage(event) + "' in ";
         errorMsg += c.getClass().getSimpleName() + " with caption '"
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
index d1b2e12e42..8825e36dd5 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
@@ -18,8 +18,8 @@ public class IframeIsOpenedInNonIOS extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         final Label errorLabel = new Label("No error");
         Button button = new Button("Download");
-        FileDownloader downloader = new FileDownloader(new StreamResource(
-                new StreamResource.StreamSource() {
+        FileDownloader downloader = new FileDownloader(
+                new StreamResource(new StreamResource.StreamSource() {
                     @Override
                     public InputStream getStream() {
                         return createSomeFile();
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java
index f534215e18..73dba06fe3 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java
@@ -51,7 +51,8 @@ public class ResponsiveUI extends AbstractTestUI {
                         + "span the entire width of the container.</p><p>This label will "
                         + "adapt its font size and line height for different widths.</p>"
                         + "<p><a href=\"http://vaadin.com/download\">Download "
-                        + "Vaadin</a></p>", ContentMode.HTML);
+                        + "Vaadin</a></p>",
+                ContentMode.HTML);
         description.addStyleName("description");
         split.addComponent(description);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
index f3df1a1176..1fc48b42ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
@@ -32,9 +32,8 @@ public class SetThemeAndResponsiveLayout extends AbstractTestUI {
         responsiveLayout.addStyleName("width-and-height");
         responsiveLayout.setSizeFull();
         setContent(responsiveLayout);
-        responsiveLayout
-                .addComponent(new Label(
-                        "First set the theme using the button and then resize the browser window in both dimensions to see the background color change."));
+        responsiveLayout.addComponent(new Label(
+                "First set the theme using the button and then resize the browser window in both dimensions to see the background color change."));
         Button setThemeButton = new Button("Set theme");
         setThemeButton.addClickListener(new Button.ClickListener() {
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index 6f14fb301c..c3e08b2991 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
@@ -32,8 +32,8 @@ import elemental.json.JsonArray;
 
 public class SimpleJavaScriptExtensionTest extends AbstractTestUI {
 
-    public static class SimpleJavaScriptExtensionState extends
-            JavaScriptExtensionState {
+    public static class SimpleJavaScriptExtensionState
+            extends JavaScriptExtensionState {
         private String prefix;
 
         public void setPrefix(String prefix) {
@@ -45,20 +45,20 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI {
         }
     }
 
-    public static interface SimpleJavaScriptExtensionClientRpc extends
-            ClientRpc {
+    public static interface SimpleJavaScriptExtensionClientRpc
+            extends ClientRpc {
         public void greet(String message);
     }
 
-    public static interface SimpleJavaScriptExtensionServerRpc extends
-            ServerRpc {
+    public static interface SimpleJavaScriptExtensionServerRpc
+            extends ServerRpc {
         public void greet(String message);
     }
 
     @JavaScript("/statictestfiles/jsextension.js")
     @StyleSheet("/VAADIN/external1.css")
-    public static class SimpleJavascriptExtension extends
-            AbstractJavaScriptExtension {
+    public static class SimpleJavascriptExtension
+            extends AbstractJavaScriptExtension {
 
         public SimpleJavascriptExtension() {
             registerRpc(new SimpleJavaScriptExtensionServerRpc() {
@@ -70,8 +70,8 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI {
             addFunction("greetToServer", new JavaScriptFunction() {
                 @Override
                 public void call(JsonArray arguments) {
-                    Notification.show(getState().getPrefix()
-                            + arguments.getString(0));
+                    Notification.show(
+                            getState().getPrefix() + arguments.getString(0));
                 }
             });
         }
@@ -100,8 +100,8 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI {
         final SimpleJavascriptExtension simpleJavascriptExtension = new SimpleJavascriptExtension();
         simpleJavascriptExtension.setPrefix("Prefix: ");
         addExtension(simpleJavascriptExtension);
-        addComponent(new Button("Send rpc greeting",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Send rpc greeting", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         simpleJavascriptExtension.greetRpc("Rpc greeting");
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
index cf689bb0d9..4d4c00d8ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -115,11 +115,13 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
         private LegacyTextField address_streetAddress = new LegacyTextField(
                 "Street address");
         @PropertyId("address.postalCode")
-        private LegacyTextField address_postalCode = new LegacyTextField("Postal code");
+        private LegacyTextField address_postalCode = new LegacyTextField(
+                "Postal code");
         @PropertyId("address.city")
         private LegacyTextField address_city = new LegacyTextField("City");
         @PropertyId("address.country")
-        private LegacyTextField address_country = new LegacyTextField("Country");
+        private LegacyTextField address_country = new LegacyTextField(
+                "Country");
 
         public CustomForm() {
             fieldGroup.bindMemberFields(this);
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
index d7f66b0cd9..846a7d121f 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
@@ -39,8 +39,8 @@ public class BasicCrudGrid extends AbstractBasicCrud {
 
             @Override
             public void select(SelectionEvent event) {
-                Item item = grid.getContainerDataSource().getItem(
-                        grid.getSelectedRow());
+                Item item = grid.getContainerDataSource()
+                        .getItem(grid.getSelectedRow());
                 form.edit((BeanItem<ComplexPerson>) item);
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
index ad54cd55ba..dd9c06b20d 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
@@ -38,8 +38,8 @@ public class BasicCrudTable extends AbstractBasicCrud {
         table.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                form.edit((BeanItem<ComplexPerson>) table.getItem(table
-                        .getValue()));
+                form.edit((BeanItem<ComplexPerson>) table
+                        .getItem(table.getValue()));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
index bb4fe89575..3570448964 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
@@ -96,8 +96,8 @@ public class ComplexPerson {
         cp.lastName = TestDataGenerator.getLastName(r);
         cp.setAlive(r.nextBoolean());
         cp.setBirthDate(TestDataGenerator.getBirthDate(r));
-        cp.setAge((int) ((new Date(2014 - 1900, 1, 1).getTime() - cp
-                .getBirthDate().getTime()) / 1000 / 3600 / 24 / 365));
+        cp.setAge((int) ((new Date(2014 - 1900, 1, 1).getTime()
+                - cp.getBirthDate().getTime()) / 1000 / 3600 / 24 / 365));
         cp.setSalary(TestDataGenerator.getSalary(r));
         cp.setAddress(ComplexAddress.create(r));
         cp.setGender(TestDataGenerator.getEnum(Gender.class, r));
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index c8f595f1f2..96d5c120e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
@@ -82,11 +82,10 @@ public class FieldBinderWithBeanValidation extends TestBase {
         sex.setPageLength(0);
 
         PersonWithBeanValidationAnnotations p = new PersonWithBeanValidationAnnotations(
-                "John", "Doe", "john@doe.com", 64, Sex.MALE, new Address(
-                        "John street", 11223, "John's town", Country.USA));
-        fieldGroup
-                .setItemDataSource(new BeanItem<PersonWithBeanValidationAnnotations>(
-                        p));
+                "John", "Doe", "john@doe.com", 64, Sex.MALE,
+                new Address("John street", 11223, "John's town", Country.USA));
+        fieldGroup.setItemDataSource(
+                new BeanItem<PersonWithBeanValidationAnnotations>(p));
     }
 
     public static PersonWithBeanValidationAnnotations getPerson(
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index ddc961eaf7..87bc806a06 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
@@ -28,8 +28,8 @@ public class FormBuilderWithNestedProperties extends TestBase {
         addComponent(streetAddress);
 
         fieldGroup.setItemDataSource(new BeanItem<Person>(new Person("Who",
-                "me?", "email", 1, Sex.MALE, new Address("street name", 202020,
-                        "City", Country.FINLAND))));
+                "me?", "email", 1, Sex.MALE,
+                new Address("street name", 202020, "City", Country.FINLAND))));
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index 710e52316f..097bde900f 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
@@ -21,7 +21,8 @@ public class FormWithNestedProperties extends AbstractBeanFieldGroupTest {
     private LegacyTextField age = new LegacyTextField("Age");
 
     @PropertyId("address.streetAddress")
-    private LegacyTextField streetAddress = new LegacyTextField("Street address");
+    private LegacyTextField streetAddress = new LegacyTextField(
+            "Street address");
     private NativeSelect country;
 
     private CheckBox deceased = new CheckBox("Deceased");
@@ -45,10 +46,9 @@ public class FormWithNestedProperties extends AbstractBeanFieldGroupTest {
         addComponent(getDiscardButton());
         addComponent(getShowBeanButton());
 
-        getFieldBinder().setItemDataSource(
-                new Person("First", "Last", "Email", 52, Sex.FEMALE,
-                        new Address("street address", 01234, "City",
-                                Country.FINLAND)));
+        getFieldBinder().setItemDataSource(new Person("First", "Last", "Email",
+                52, Sex.FEMALE,
+                new Address("street address", 01234, "City", Country.FINLAND)));
 
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java
index 6c2fcdc2d4..dc214448a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java
@@ -6,11 +6,9 @@ public class FlagSeResource extends ClassResource {
 
     public FlagSeResource() {
         super("/"
-                + FlagSeResource.class
-                        .getName()
-                        .replace('.', '/')
-                        .replaceAll(FlagSeResource.class.getSimpleName() + "$",
-                                "") + "se.gif");
+                + FlagSeResource.class.getName().replace('.', '/').replaceAll(
+                        FlagSeResource.class.getSimpleName() + "$", "")
+                + "se.gif");
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
index 40d20433b1..0c7e26861d 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
@@ -84,7 +84,8 @@ public class JSR286Portlet extends UI {
         Upload upload = new Upload("Upload a file", new Receiver() {
 
             @Override
-            public OutputStream receiveUpload(String filename, String mimeType) {
+            public OutputStream receiveUpload(String filename,
+                    String mimeType) {
                 return new ByteArrayOutputStream();
             }
         });
@@ -114,18 +115,20 @@ public class JSR286Portlet extends UI {
 
         String censoredUserAgent = getPage().getWebBrowser()
                 .getBrowserApplication();
-        if (censoredUserAgent != null && censoredUserAgent.contains("Chrome/")) {
+        if (censoredUserAgent != null
+                && censoredUserAgent.contains("Chrome/")) {
             // Censor version info as it tends to change
             censoredUserAgent = censoredUserAgent.replaceAll("Chrome/[^ ]* ",
                     "Chrome/xyz ");
         }
         userAgent.setValue(censoredUserAgent);
         screenWidth.setValue(String.valueOf(getPage().getBrowserWindowWidth()));
-        screenHeight.setValue(String
-                .valueOf(getPage().getBrowserWindowHeight()));
+        screenHeight
+                .setValue(String.valueOf(getPage().getBrowserWindowHeight()));
 
         boolean inViewMode = (request.getPortletMode() == PortletMode.VIEW);
-        boolean inNormalState = (request.getWindowState() == WindowState.NORMAL);
+        boolean inNormalState = (request
+                .getWindowState() == WindowState.NORMAL);
         // Portlet up-and-running, enable stuff
         portletEdit.setEnabled(true);
         portletMax.setEnabled(true);
@@ -134,10 +137,10 @@ public class JSR286Portlet extends UI {
         tf.setEnabled(!inViewMode);
 
         // Show notification about current mode and state
-        getPage().showNotification(
-                new Notification("Portlet status", "Mode: "
-                        + request.getPortletMode() + " State: "
-                        + request.getWindowState(), Type.WARNING_MESSAGE));
+        getPage().showNotification(new Notification(
+                "Portlet status", "Mode: " + request.getPortletMode()
+                        + " State: " + request.getWindowState(),
+                Type.WARNING_MESSAGE));
 
         // Display current user info
         Map<?, ?> uinfo = (Map<?, ?>) request
@@ -195,8 +198,8 @@ public class JSR286Portlet extends UI {
         if (someAction == null) {
             url = getSession().generateActionURL("someAction");
             try {
-                someAction = new Link("An action", new ExternalResource(
-                        url.toString()));
+                someAction = new Link("An action",
+                        new ExternalResource(url.toString()));
                 main.addComponent(someAction);
             } catch (Exception e) {
                 // Oops
@@ -211,9 +214,9 @@ public class JSR286Portlet extends UI {
         @Override
         public void handleActionRequest(ActionRequest request,
                 ActionResponse response, UI window) {
-            main.addComponent(new Label("Action '"
-                    + request.getParameter("javax.portlet.action")
-                    + "' received"));
+            main.addComponent(new Label(
+                    "Action '" + request.getParameter("javax.portlet.action")
+                            + "' received"));
         }
 
         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index c8fa448172..0ffd8977ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -11,8 +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/main/java/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
index 04d493eef5..f9637b5b76 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
@@ -98,14 +98,12 @@ public class ProxyTest extends AbstractTestUI {
         ServletContextHandler contextHandler = new ServletContextHandler();
         server.setHandler(contextHandler);
         contextHandler.setContextPath("/");
-        ServletHolder servletHolder = contextHandler.addServlet(
-                ProxyServlet.Transparent.class, "/*");
+        ServletHolder servletHolder = contextHandler
+                .addServlet(ProxyServlet.Transparent.class, "/*");
 
         // Configure servlet to forward to the root of the original server
-        servletHolder.setInitParameter(
-                "ProxyTo",
-                "http://" + request.getLocalAddr() + ":"
-                        + request.getLocalPort() + "/");
+        servletHolder.setInitParameter("ProxyTo", "http://"
+                + request.getLocalAddr() + ":" + request.getLocalPort() + "/");
         // Configure servlet to strip beginning of paths
         servletHolder.setInitParameter("Prefix", "/proxypath/");
 
@@ -125,8 +123,8 @@ public class ProxyTest extends AbstractTestUI {
                 new ExternalResource(linkBase + "embed1")));
         linkHolder.addComponent(new Link("Open embed1/ in proxy",
                 new ExternalResource(linkBase + "embed1/")));
-        linkHolder.addComponent(new Link("Open Buttons in proxy",
-                new ExternalResource(linkBase
+        linkHolder.addComponent(
+                new Link("Open Buttons in proxy", new ExternalResource(linkBase
                         + "run/com.vaadin.tests.components.button.Buttons")));
 
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 7ab1a84765..e823624fe6 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -228,8 +228,8 @@ public class CaptionsInLayouts extends AbstractTestUI {
             for (String width : new String[] { "400px", "auto" }) {
                 Object id = layoutSelect.addItem();
                 Item i = layoutSelect.getItem(id);
-                i.getItemProperty(CAPTION).setValue(
-                        cls.getSimpleName() + ", " + width);
+                i.getItemProperty(CAPTION)
+                        .setValue(cls.getSimpleName() + ", " + width);
                 i.getItemProperty(CLASS).setValue(cls);
                 i.getItemProperty(WIDTH).setValue(width);
             }
@@ -243,10 +243,11 @@ public class CaptionsInLayouts extends AbstractTestUI {
             public void valueChange(ValueChangeEvent event) {
                 Item i = layoutSelect.getItem(event.getProperty().getValue());
 
-                setLayout(getLayout((String) i.getItemProperty(CAPTION)
-                        .getValue(), (Class<? extends Layout>) i
-                        .getItemProperty(CLASS).getValue(), (String) i
-                        .getItemProperty(WIDTH).getValue()));
+                setLayout(getLayout(
+                        (String) i.getItemProperty(CAPTION).getValue(),
+                        (Class<? extends Layout>) i.getItemProperty(CLASS)
+                                .getValue(),
+                        (String) i.getItemProperty(WIDTH).getValue()));
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 05895ca233..609e2fc7c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -10,8 +10,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class GridLayoutExpandRatioModification extends TestBase implements
-        ClickListener {
+public class GridLayoutExpandRatioModification extends TestBase
+        implements ClickListener {
 
     private boolean isVisible = false;
     private GridLayout mainLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index 524799ab3c..413d225c22 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
@@ -23,8 +23,8 @@ public class GridLayoutInsidePanel extends TestBase {
         {
             GridLayout gl = new GridLayout(1, 1);
             gl.setSizeUndefined();
-            gl.addComponent(new Label(
-                    "A label which defines the size of the GL"));
+            gl.addComponent(
+                    new Label("A label which defines the size of the GL"));
 
             VerticalLayout pl = new VerticalLayout();
             pl.setMargin(true);
@@ -39,8 +39,8 @@ public class GridLayoutInsidePanel extends TestBase {
         {
             GridLayout gl = new GridLayout(1, 1);
             gl.setSizeUndefined();
-            gl.addComponent(new Label(
-                    "A label which defines the size of the GL"));
+            gl.addComponent(
+                    new Label("A label which defines the size of the GL"));
 
             Panel p = new Panel("Panel 2", gl);
             gl.setMargin(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
index 9753526a9e..814a3f128f 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
@@ -14,8 +14,9 @@ public class GridLayoutSpanExpansion extends TestBase {
         heightSpan.setWidth("200px");
         heightSpan.addComponent(new Label("1"), 0, 0);
         heightSpan.addComponent(new Label("2"), 0, 1);
-        heightSpan.addComponent(new Label(
-                "This is a somewhat long text that spans over a few lines."),
+        heightSpan.addComponent(
+                new Label(
+                        "This is a somewhat long text that spans over a few lines."),
                 1, 0, 1, 1);
         heightSpan.setRowExpandRatio(1, 1);
         addComponent(heightSpan);
@@ -23,8 +24,9 @@ public class GridLayoutSpanExpansion extends TestBase {
         GridLayout widthSpan = new GridLayout(2, 2);
         widthSpan.setHeight("100px");
         widthSpan.setWidth("200px");
-        widthSpan.addComponent(new Label(
-                "This is a somewhat long text that spans over both columns."),
+        widthSpan.addComponent(
+                new Label(
+                        "This is a somewhat long text that spans over both columns."),
                 0, 0, 1, 0);
         Label label1 = new Label("1");
         label1.setSizeUndefined();
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index 739779a3e0..ba3716eec8 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
@@ -36,12 +36,13 @@ public class HiddenHorizontalLayout extends TestBase {
         hl.addComponent(new Label("label4"));
         vl.addComponent(hl);
 
-        Label l = new Label("Steps to reproduce with Vaadin 6.0.1:<br/>"
-                + "1. set browser size smaller than fullscreen<br/>"
-                + "2. Refresh page with browser<br/>"
-                + "3. Click \"toggle layout visibility\"<br>"
-                + "4. Resize browser window to full <br/>"
-                + "5. Click \"toggle layout visibility\"<br/>",
+        Label l = new Label(
+                "Steps to reproduce with Vaadin 6.0.1:<br/>"
+                        + "1. set browser size smaller than fullscreen<br/>"
+                        + "2. Refresh page with browser<br/>"
+                        + "3. Click \"toggle layout visibility\"<br>"
+                        + "4. Resize browser window to full <br/>"
+                        + "5. Click \"toggle layout visibility\"<br/>",
                 ContentMode.HTML);
         vl.addComponent(l);
         Button b = new Button("toggle layout visibility",
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index 481033d89b..ac2bab012c 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
@@ -34,8 +34,8 @@ public class LayoutPerformanceTests extends TestBase {
 
                 AbstractOrderedLayout layout = createOrderedLayout(depth,
                         fullHeight);
-                layout.addComponent(buildLayout(depth - 1, leafs, leafType,
-                        fullHeight));
+                layout.addComponent(
+                        buildLayout(depth - 1, leafs, leafType, fullHeight));
                 return layout;
             }
         },
@@ -52,8 +52,8 @@ public class LayoutPerformanceTests extends TestBase {
                 Component content = leafType.createContent();
                 content.setSizeUndefined();
                 layout.addComponent(content);
-                layout.addComponent(buildLayout(depth - 1, leafs, leafType,
-                        fullHeight));
+                layout.addComponent(
+                        buildLayout(depth - 1, leafs, leafType, fullHeight));
                 layout.setExpandRatio(layout.getComponent(1), 1);
                 return layout;
             }
@@ -68,10 +68,10 @@ public class LayoutPerformanceTests extends TestBase {
 
                 AbstractOrderedLayout layout = createOrderedLayout(depth,
                         fullHeight);
-                layout.addComponent(buildLayout(depth - 1, leafs, leafType,
-                        fullHeight));
-                layout.addComponent(buildLayout(depth - 1, leafs, leafType,
-                        fullHeight));
+                layout.addComponent(
+                        buildLayout(depth - 1, leafs, leafType, fullHeight));
+                layout.addComponent(
+                        buildLayout(depth - 1, leafs, leafType, fullHeight));
                 layout.setExpandRatio(layout.getComponent(0), 1);
                 layout.setExpandRatio(layout.getComponent(1), 2);
                 return layout;
@@ -82,8 +82,8 @@ public class LayoutPerformanceTests extends TestBase {
 
         protected AbstractOrderedLayout createOrderedLayout(int depth,
                 boolean fullHeight) {
-            AbstractOrderedLayout layout = (depth % 2) == 0 ? new VerticalLayout()
-                    : new HorizontalLayout();
+            AbstractOrderedLayout layout = (depth % 2) == 0
+                    ? new VerticalLayout() : new HorizontalLayout();
             layout.setWidth("100%");
             if (fullHeight) {
                 layout.setHeight("100%");
@@ -254,8 +254,9 @@ public class LayoutPerformanceTests extends TestBase {
             if (component instanceof NativeSelect) {
                 NativeSelect nativeSelect = (NativeSelect) component;
                 nativeSelect.setNullSelectionAllowed(false);
-                nativeSelect.setValue(new ArrayList<Object>(nativeSelect
-                        .getItemIds()).get(0));
+                nativeSelect.setValue(
+                        new ArrayList<Object>(nativeSelect.getItemIds())
+                                .get(0));
             }
             controls.setComponentAlignment(component, Alignment.BOTTOM_LEFT);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 04d318c62c..22ac9506f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
@@ -58,15 +58,16 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase {
             @SuppressWarnings("unchecked")
             public void valueChange(ValueChangeEvent event) {
                 HasComponents oldCC = cc;
-                cc = createComponentContainer((Class<? extends HasComponents>) event
-                        .getProperty().getValue());
+                cc = createComponentContainer(
+                        (Class<? extends HasComponents>) event.getProperty()
+                                .getValue());
                 addToCC(lab);
                 replaceComponent(oldCC, cc);
             }
         });
 
-        componentContainerSelect.setValue(componentContainerSelect.getItemIds()
-                .iterator().next());
+        componentContainerSelect.setValue(
+                componentContainerSelect.getItemIds().iterator().next());
         Button but1 = new Button("Move in and out of component container",
                 new Button.ClickListener() {
 
@@ -96,8 +97,8 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase {
         } else if (cc instanceof SingleComponentContainer) {
             ((SingleComponentContainer) cc).setContent(lab);
         } else {
-            throw new RuntimeException("Don't know how to add to "
-                    + cc.getClass().getName());
+            throw new RuntimeException(
+                    "Don't know how to add to " + cc.getClass().getName());
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
index 6902bf236a..635bda8194 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
@@ -15,10 +15,10 @@ public class MovingInvisibleField extends TestBase {
         final VerticalLayout layout1 = new VerticalLayout();
         final VerticalLayout layout2 = new VerticalLayout();
 
-        final LegacyTextField tfHidden = new LegacyTextField("Hidden text field caption",
-                "A hidden text field");
-        final LegacyTextField tfVisible = new LegacyTextField("Visible text field caption",
-                "A visible text field");
+        final LegacyTextField tfHidden = new LegacyTextField(
+                "Hidden text field caption", "A hidden text field");
+        final LegacyTextField tfVisible = new LegacyTextField(
+                "Visible text field caption", "A visible text field");
         tfHidden.setVisible(false);
         Button b = new Button("Move hidden textfield to other layout");
         b.addListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 6f869383d7..5329e4191a 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -50,38 +50,68 @@ public class OrderedLayoutBasics extends TestBase {
     }
 
     private void createUI(Layout layout) {
-        layout.addComponent(wrapLayout(layout_field_100pct_button_field(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_field_100pct_button_field(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_overfilled(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_overfilled(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_symmetric_fields(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_symmetric_fields(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_leftAndRight(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_leftAndRight(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_fixed_filled(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_fixed_filled(new VerticalLayout())));
+        layout.addComponent(wrapLayout(
+                layout_field_100pct_button_field(new HorizontalLayout())));
+        layout.addComponent(wrapLayout(
+                layout_field_100pct_button_field(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_overfilled(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_overfilled(new VerticalLayout())));
+        layout.addComponent(wrapLayout(
+                layout_overfilled_dynamic_height(new HorizontalLayout())));
+        layout.addComponent(wrapLayout(
+                layout_overfilled_dynamic_height(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_symmetric_fields(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_symmetric_fields(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_leftAndRight(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_leftAndRight(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_fixed_filled(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_fixed_filled(new VerticalLayout())));
         layout.addComponent(wrapLayout(layout_dynamic(new HorizontalLayout())));
         layout.addComponent(wrapLayout(layout_dynamic(new VerticalLayout())));
         layout.addComponent(wrapLayout(layout_labels(new HorizontalLayout())));
         layout.addComponent(wrapLayout(layout_labels(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_captions(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions(new HorizontalLayout())));
         layout.addComponent(wrapLayout(layout_captions(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_add_remove_components(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_add_remove_components(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_pctFilled(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size_and_relative_size(
+                        new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size_and_relative_size(
+                        new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size_and_fixed_size(
+                        new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_captions_fixed_size_and_fixed_size(
+                        new VerticalLayout())));
+        layout.addComponent(wrapLayout(
+                layout_add_remove_components(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_add_remove_components(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_pctFilled(new HorizontalLayout())));
         layout.addComponent(wrapLayout(layout_pctFilled(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_underFilled(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_underFilled(new VerticalLayout())));
-        layout.addComponent(wrapLayout(layout_basic_test(new HorizontalLayout())));
-        layout.addComponent(wrapLayout(layout_basic_test(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_underFilled(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_underFilled(new VerticalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_basic_test(new HorizontalLayout())));
+        layout.addComponent(
+                wrapLayout(layout_basic_test(new VerticalLayout())));
     }
 
     private Layout wrapLayout(Layout ol) {
@@ -110,7 +140,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setWidth("");
         ol.setCaption("Fixed height (200px) and dynamic width");
 
-        LegacyTextField tf = new LegacyTextField("100px high TextField, valign: bottom");
+        LegacyTextField tf = new LegacyTextField(
+                "100px high TextField, valign: bottom");
         tf.setHeight("100px");
         tf.setWidth("");
         ol.addComponent(tf);
@@ -212,7 +243,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(tf);
         ol.setComponentAlignment(tf, Alignment.TOP_LEFT);
 
-        tf = new LegacyTextField("100% high, 50px wide TextField, valign: bottom");
+        tf = new LegacyTextField(
+                "100% high, 50px wide TextField, valign: bottom");
         tf.setHeight("100%");
         tf.setWidth("50px");
         ol.addComponent(tf);
@@ -267,7 +299,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.addComponent(tf);
         ol.setComponentAlignment(tf, Alignment.TOP_LEFT);
 
-        tf = new LegacyTextField("100% high, 50px wide TextField, valign: bottom");
+        tf = new LegacyTextField(
+                "100% high, 50px wide TextField, valign: bottom");
         tf.setHeight("100%");
         tf.setWidth("50px");
         ol.addComponent(tf);
@@ -364,9 +397,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setSpacing(true);
 
         // ol.setWidth("");
-        ol.setCaption("Fixed width (" + ol.getWidth()
-                + "px) and fixed height (" + ol.getHeight()
-                + "px) / layout_field_100pct_button_field");
+        ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height ("
+                + ol.getHeight() + "px) / layout_field_100pct_button_field");
         TextArea tf;
 
         tf = new TextArea("300px x 300px Field");
@@ -406,9 +438,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setSpacing(true);
 
         // ol.setWidth("");
-        ol.setCaption("Fixed width (" + ol.getWidth()
-                + "px) and fixed height (" + ol.getHeight()
-                + "px) / layout_basic_test");
+        ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height ("
+                + ol.getHeight() + "px) / layout_basic_test");
         TextArea tf;
 
         tf = new TextArea("300px x 300px Field");
@@ -448,9 +479,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setSpacing(false);
 
         // ol.setWidth("");
-        ol.setCaption("Fixed width (" + ol.getWidth()
-                + "px) and fixed height (" + ol.getHeight()
-                + "px) / layout_symmetric_fields");
+        ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height ("
+                + ol.getHeight() + "px) / layout_symmetric_fields");
         TextArea tf;
 
         tf = new TextArea("300px x 300px Field");
@@ -487,9 +517,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setSpacing(true);
 
         // ol.setWidth("");
-        ol.setCaption("Fixed width (" + ol.getWidth()
-                + "px) and fixed height (" + ol.getHeight()
-                + "px) / layout_leftAndRight");
+        ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height ("
+                + ol.getHeight() + "px) / layout_leftAndRight");
         TextArea tf;
 
         // tf = new TextField("100%x100% Field");
@@ -733,9 +762,8 @@ public class OrderedLayoutBasics extends TestBase {
         ol.setSpacing(true);
 
         // ol.setWidth("");
-        ol.setCaption("Fixed width (" + ol.getWidth()
-                + "px) and fixed height (" + ol.getHeight()
-                + "px) / layout_add_remove_components");
+        ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height ("
+                + ol.getHeight() + "px) / layout_add_remove_components");
 
         for (int i = 0; i < 2; i++) {
             AbstractOrderedLayout inner = createAddRemove(ol, "", "");
@@ -1053,7 +1081,8 @@ public class OrderedLayoutBasics extends TestBase {
 
     }
 
-    protected void addBefore(AbstractOrderedLayout ol, Component c, String width) {
+    protected void addBefore(AbstractOrderedLayout ol, Component c,
+            String width) {
         int index = 0;
         Iterator<Component> iter = ol.getComponentIterator();
         while (iter.hasNext()) {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 85f7db3d18..59689f3d82 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -9,8 +9,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class VerticalLayoutExpandRatioModification extends TestBase implements
-        ClickListener {
+public class VerticalLayoutExpandRatioModification extends TestBase
+        implements ClickListener {
 
     private boolean isVisible = false;
     private VerticalLayout mainLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
index f3d4029663..d00acf0983 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
-public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden extends
-        TestBase {
+public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden
+        extends TestBase {
 
     @Override
     protected String getDescription() {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
index d192307eb2..8126a43ca9 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
@@ -29,8 +29,8 @@ public class GridLayoutMoveComponent extends AbstractTestUI {
         grid.addComponent(b, 0, 1);
         grid.addComponent(tf, 0, 2);
 
-        addComponent(new Button("Shift label right",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Shift label right", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         // Moving component from 0,0 -> 1,0
@@ -39,8 +39,8 @@ public class GridLayoutMoveComponent extends AbstractTestUI {
                     }
                 }));
 
-        addComponent(new Button("Shift button right",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Shift button right", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         grid.removeComponent(b);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
index cb38e30663..7e6792af6e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
@@ -56,8 +56,10 @@ public class BaseAddReplaceMove extends BaseLayoutTestUI {
         source.addComponent(new Label("OTHER LABEL 1"));
         source.addComponent(new Label("OTHER LABEL 2"));
 
-        final AbstractComponent c1 = new Label("<b>LABEL</b>", ContentMode.HTML);
-        final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML);
+        final AbstractComponent c1 = 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/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index 320febac04..71a7c0e048 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
@@ -52,8 +52,10 @@ public class GridAddReplaceMove extends GridBaseLayoutTestUI {
         source.addComponent(new Label("OTHER LABEL 1"));
         source.addComponent(new Label("OTHER LABEL 2"));
 
-        final AbstractComponent c1 = new Label("<b>LABEL</b>", ContentMode.HTML);
-        final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML);
+        final AbstractComponent c1 = 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/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
index 9c1ae16c4f..ad49a824f2 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
@@ -31,7 +31,8 @@ import com.vaadin.ui.TabSheet;
 public class GridIcon extends GridBaseLayoutTestUI {
     @Override
     protected void setup(VaadinRequest request) {
-        layout.addComponent(createLabelsFields(LegacyTextField.class, true, ""));
+        layout.addComponent(
+                createLabelsFields(LegacyTextField.class, true, ""));
         layout.addComponent(createLabelsFields(Label.class, true, ""));
         layout.addComponent(createLabelsFields(Button.class, true, ""));
         layout.addComponent(createLabelsFields(ComboBox.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
index 7db8fb5c45..5fe4dbaec4 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
@@ -43,7 +43,8 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI {
         layout.addComponent(createLabelsFields(Label.class, true, ""));
         layout.addComponent(createLabelsFields(Button.class, true, ""));
         layout.addComponent(createLabelsFields(TabSheet.class, true, ""));
-        layout.addComponent(createLabelsFields(LegacyTextField.class, true, ""));
+        layout.addComponent(
+                createLabelsFields(LegacyTextField.class, true, ""));
 
         layout.addComponent(createLabelsFields(ComboBox.class, true, ""));
         layout.addComponent(createLabelsFields(DateField.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
index 37a5b4bb14..d2d6980bbb 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
@@ -55,8 +55,8 @@ public class CookieMonsterUI extends UI {
                 } else {
                     // Create a new cookie
                     nameCookie = new Cookie(NAME_COOKIE, name);
-                    nameCookie
-                            .setComment("Cookie for storing the name of the user");
+                    nameCookie.setComment(
+                            "Cookie for storing the name of the user");
 
                     Notification.show("Stored name " + name + " in cookie");
                 }
@@ -65,8 +65,8 @@ public class CookieMonsterUI extends UI {
                 nameCookie.setMaxAge(120);
 
                 // Set the cookie path.
-                nameCookie.setPath(VaadinService.getCurrentRequest()
-                        .getContextPath());
+                nameCookie.setPath(
+                        VaadinService.getCurrentRequest().getContextPath());
 
                 // Save cookie
                 VaadinService.getCurrentResponse().addCookie(nameCookie);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
index 1f94d43abe..2d1c6bb687 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
@@ -38,7 +38,8 @@ public class SimpleLoginUI extends UI {
 
                 // Check if a user has logged in
                 boolean isLoggedIn = getSession().getAttribute("user") != null;
-                boolean isLoginView = event.getNewView() instanceof SimpleLoginView;
+                boolean isLoginView = event
+                        .getNewView() instanceof SimpleLoginView;
 
                 if (!isLoggedIn && !isLoginView) {
                     // Redirect to login view always if a user has not yet
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
index 63e43b29f1..d8c6e52503 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
@@ -29,26 +29,27 @@ public class CSSInjectWithColorpicker extends UI {
     protected void init(VaadinRequest request) {
 
         // Create a text editor
-        Component editor = createEditor("Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
-                + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
-                + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
-                + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
-                + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
-                + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
-                + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
-                + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
-                + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
-                + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
-                + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
-                + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
-                + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
-                + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
-                + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
-                + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
-                + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
-                + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
-                + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
-                + "quam, ac urna eros est cras id cras, eleifend eu mattis nec.");
+        Component editor = createEditor(
+                "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
+                        + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
+                        + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
+                        + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
+                        + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
+                        + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
+                        + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
+                        + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
+                        + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
+                        + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
+                        + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
+                        + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
+                        + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
+                        + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
+                        + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."
+                        + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a "
+                        + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi "
+                        + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. "
+                        + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis "
+                        + "quam, ac urna eros est cras id cras, eleifend eu mattis nec.");
 
         VerticalLayout content = new VerticalLayout(editor);
         content.setMargin(true);
@@ -203,8 +204,8 @@ public class CSSInjectWithColorpicker extends UI {
      */
     private Component createFontSizeSelect() {
 
-        final ComboBox select = new ComboBox(null, Arrays.asList(8, 9, 10, 12,
-                14, 16, 20, 25, 30, 40, 50));
+        final ComboBox select = new ComboBox(null,
+                Arrays.asList(8, 9, 10, 12, 14, 16, 20, 25, 30, 40, 50));
         select.setWidth("100px");
         select.setValue(12);
         select.setInputPrompt("Font size");
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
index c10a87635e..3c77a8efca 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
@@ -43,7 +43,8 @@ public class FormattingDataInGrid extends UI {
             public String getStyle(CellReference cellReference) {
                 if ("amount".equals(cellReference.getPropertyId())) {
                     Double value = (Double) cellReference.getValue();
-                    if (value.doubleValue() == Math.round(value.doubleValue())) {
+                    if (value.doubleValue() == Math
+                            .round(value.doubleValue())) {
                         return "integer";
                     }
                 }
@@ -57,20 +58,22 @@ public class FormattingDataInGrid extends UI {
         NumberRenderer poundRenderer = new NumberRenderer(poundformat);
         grid.getColumn("amount").setRenderer(poundRenderer);
 
-        grid.getColumn("count").setConverter(new LegacyStringToIntegerConverter() {
-            @Override
-            public String convertToPresentation(Integer value,
-                    Class<? extends String> targetType, Locale locale)
-                    throws LegacyConverter.ConversionException {
-                String stringRepresentation = super.convertToPresentation(
-                        value, targetType, locale);
-                if (value.intValue() % 2 == 0) {
-                    return "<strong>" + stringRepresentation + "</strong>";
-                } else {
-                    return "<em>" + stringRepresentation + "</em>";
-                }
-            }
-        });
+        grid.getColumn("count")
+                .setConverter(new LegacyStringToIntegerConverter() {
+                    @Override
+                    public String convertToPresentation(Integer value,
+                            Class<? extends String> targetType, Locale locale)
+                            throws LegacyConverter.ConversionException {
+                        String stringRepresentation = super.convertToPresentation(
+                                value, targetType, locale);
+                        if (value.intValue() % 2 == 0) {
+                            return "<strong>" + stringRepresentation
+                                    + "</strong>";
+                        } else {
+                            return "<em>" + stringRepresentation + "</em>";
+                        }
+                    }
+                });
 
         grid.getColumn("count").setRenderer(new HtmlRenderer());
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
index eaa099f3eb..cd8295efc9 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
@@ -62,13 +62,14 @@ public class ShowingExtraDataForRows extends UI {
                         new Button.ClickListener() {
                             @Override
                             public void buttonClick(ClickEvent event) {
-                                Notification.show("Button clicked for "
-                                        + bean.getName());
+                                Notification.show(
+                                        "Button clicked for " + bean.getName());
                             }
                         });
 
                 // Wrap up all the parts into a vertical layout
-                VerticalLayout layout = new VerticalLayout(label, image, button);
+                VerticalLayout layout = new VerticalLayout(label, image,
+                        button);
                 layout.setSpacing(true);
                 layout.setMargin(true);
                 return layout;
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
index 0cb4492929..e63da28dac 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
@@ -43,8 +43,8 @@ public class AutoGeneratingForm extends UI {
 
         // We need an item data source before we create the fields to be able to
         // find the properties, otherwise we have to specify them by hand
-        fieldGroup.setItemDataSource(new BeanItem<Person>(new Person("John",
-                "Doe", 34)));
+        fieldGroup.setItemDataSource(
+                new BeanItem<Person>(new Person("John", "Doe", 34)));
 
         // Loop through the properties, build fields for them and add the fields
         // to this root
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index 7cd9804358..27b179ce51 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
@@ -39,7 +39,8 @@ public class CreatingPreserveState extends UI {
 
     @Override
     public void init(VaadinRequest request) {
-        LegacyTextField tf = new LegacyTextField("Instance #" + (++instanceCounter));
+        LegacyTextField tf = new LegacyTextField(
+                "Instance #" + (++instanceCounter));
         tf.setImmediate(true);
 
         content.addComponent(tf);
@@ -48,7 +49,7 @@ public class CreatingPreserveState extends UI {
 
     @Override
     protected void refresh(VaadinRequest request) {
-        content.addComponent(new Label("UI was refreshed @"
-                + System.currentTimeMillis()));
+        content.addComponent(
+                new Label("UI was refreshed @" + System.currentTimeMillis()));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
index 213e23982b..7e8f2aba2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
@@ -69,7 +69,7 @@ class TouchUI extends UI {
         WebBrowser webBrowser = getPage().getWebBrowser();
         String screenSize = "" + webBrowser.getScreenWidth() + "x"
                 + webBrowser.getScreenHeight();
-        setContent(new Label("Using a touch enabled device with screen size"
-                + screenSize));
+        setContent(new Label(
+                "Using a touch enabled device with screen size" + screenSize));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index f4eed8ddd6..fc3cf0b30a 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
@@ -28,8 +28,8 @@ public class DynamicImageUI extends AbstractTestUI {
                 String text = request.getParameter("text");
                 BufferedImage bi = new BufferedImage(100, 30,
                         BufferedImage.TYPE_3BYTE_BGR);
-                bi.getGraphics().drawChars(text.toCharArray(), 0,
-                        text.length(), 10, 20);
+                bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(),
+                        10, 20);
                 response.setContentType("image/png");
                 ImageIO.write(bi, "png", response.getOutputStream());
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index 9486a9abce..b86aacc8a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
@@ -78,8 +78,8 @@ public class FormUsingExistingLayout extends AbstractTestUI {
         MyFormLayout myFormLayout = new MyFormLayout();
 
         // Create a field group and use it to bind the fields in the layout
-        FieldGroup fieldGroup = new FieldGroup(new BeanItem<Notice>(new Notice(
-                "John", "Doe", "")));
+        FieldGroup fieldGroup = new FieldGroup(
+                new BeanItem<Notice>(new Notice("John", "Doe", "")));
         fieldGroup.bindMemberFields(myFormLayout);
 
         addComponent(myFormLayout);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index 9ea5eb2355..d1d49bc9d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
@@ -30,19 +30,21 @@ public class FormatTableValue extends AbstractTestUI {
         table.getItem(itemId).getItemProperty(DEFAULT_PROPERTY)
                 .setValue(3.1415);
 
-        table.setConverter(PERCENT_PROPERTY, new LegacyStringToDoubleConverter() {
-            @Override
-            protected NumberFormat getFormat(Locale locale) {
-                return NumberFormat.getPercentInstance(locale);
-            }
-        });
-
-        table.setConverter(CURRENCY_PROPERTY, new LegacyStringToDoubleConverter() {
-            @Override
-            protected NumberFormat getFormat(Locale locale) {
-                return NumberFormat.getCurrencyInstance(locale);
-            }
-        });
+        table.setConverter(PERCENT_PROPERTY,
+                new LegacyStringToDoubleConverter() {
+                    @Override
+                    protected NumberFormat getFormat(Locale locale) {
+                        return NumberFormat.getPercentInstance(locale);
+                    }
+                });
+
+        table.setConverter(CURRENCY_PROPERTY,
+                new LegacyStringToDoubleConverter() {
+                    @Override
+                    protected NumberFormat getFormat(Locale locale) {
+                        return NumberFormat.getCurrencyInstance(locale);
+                    }
+                });
 
         addComponent(table);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index 24bba5d271..b6f48ab48a 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -32,7 +32,8 @@ public class IntegerTextFieldDataSource extends AbstractTestUI {
 
         final Property<Integer> integerProperty = beanItem
                 .getItemProperty("value");
-        final LegacyTextField textField = new LegacyTextField("Text field", integerProperty);
+        final LegacyTextField textField = new LegacyTextField("Text field",
+                integerProperty);
 
         Button submitButton = new Button("Submit value", new ClickListener() {
             @Override
@@ -48,7 +49,8 @@ public class IntegerTextFieldDataSource extends AbstractTestUI {
         });
 
         addComponent(new Label("Text field type: " + textField.getType()));
-        addComponent(new Label("Text field type: " + integerProperty.getType()));
+        addComponent(
+                new Label("Text field type: " + integerProperty.getType()));
         addComponent(textField);
         addComponent(submitButton);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
index 4ef080afc2..05e5ec851b 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
@@ -34,10 +34,10 @@ public class MultiTabApplication extends UI {
 
     private class MainView extends VerticalLayout {
         public MainView() {
-            addComponent(new Link("Edit person 1", new ExternalResource(
-                    "?editPerson=person1")));
-            addComponent(new Link("Edit person 2", new ExternalResource(
-                    "?editPerson=person2")));
+            addComponent(new Link("Edit person 1",
+                    new ExternalResource("?editPerson=person1")));
+            addComponent(new Link("Edit person 2",
+                    new ExternalResource("?editPerson=person2")));
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
index fb84a4068b..da788cb251 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
@@ -42,8 +42,8 @@ public class UsingUriFragments extends UI {
         layout.setMargin(true);
         setContent(layout);
 
-        Label label = new Label("Hello, your fragment is "
-                + getPage().getUriFragment());
+        Label label = new Label(
+                "Hello, your fragment is " + getPage().getUriFragment());
         layout.addComponent(label);
 
         // React to fragment changes
@@ -57,8 +57,8 @@ public class UsingUriFragments extends UI {
         // Handle the fragment received in the initial request
         handleFragment(getPage().getUriFragment());
 
-        layout.addComponent(new Button("Show and set fragment",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Show and set fragment", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         handleFragment(getPage().getUriFragment());
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
index 4d95d9cc48..bea51e98f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
@@ -56,12 +56,12 @@ public class UsingXyzWhenInitializing extends UI {
         String resolution = "Your browser window on startup was "
                 + browser.getScreenWidth() + "x" + browser.getScreenHeight();
         if (browser.getScreenWidth() > 1024) {
-            layout.addComponent(new Label(
-                    "The is the large version of the application. "
+            layout.addComponent(
+                    new Label("The is the large version of the application. "
                             + resolution));
         } else {
-            layout.addComponent(new Label(
-                    "This is the small version of the application. "
+            layout.addComponent(
+                    new Label("This is the small version of the application. "
                             + resolution));
         }
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
index 6512754683..7befc9dd5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
@@ -32,8 +32,8 @@ public class MyComponent extends AbstractComponent {
 
             // nag every 5:th click
             if (clickCount % 5 == 0) {
-                getRpcProxy(MyComponentClientRpc.class).alert(
-                        "Ok, that's enough!");
+                getRpcProxy(MyComponentClientRpc.class)
+                        .alert("Ok, that's enough!");
             }
 
             setText("You have clicked " + clickCount + " times");
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
index 8a73e90496..69281b61cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
@@ -32,8 +32,8 @@ import com.vaadin.client.ui.layout.ElementResizeListener;
  * @author Vaadin Ltd
  * @since 7.0.0
  */
-public class MyPickerConnector extends AbstractComponentConnector implements
-        SimpleManagedLayout {
+public class MyPickerConnector extends AbstractComponentConnector
+        implements SimpleManagedLayout {
     @Override
     public MyPickerWidget getWidget() {
         return (MyPickerWidget) super.getWidget();
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
index 850fa1044f..8d1f4a1f9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
@@ -24,7 +24,8 @@ public class WidgetContainer extends AbstractComponentContainer {
     }
 
     @Override
-    public void replaceComponent(Component oldComponent, Component newComponent) {
+    public void replaceComponent(Component oldComponent,
+            Component newComponent) {
         int index = children.indexOf(oldComponent);
         if (index != -1) {
             children.remove(index);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java
index 86666b12e8..a10479fa42 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java
@@ -34,8 +34,8 @@ public class Flot extends AbstractJavaScriptComponent {
         registerRpc(new FlotClickRpc() {
             @Override
             public void onPlotClick(int seriesIndex, int dataIndex) {
-                Notification.show("Clicked on [" + seriesIndex + ", "
-                        + dataIndex + "]");
+                Notification.show(
+                        "Clicked on [" + seriesIndex + ", " + dataIndex + "]");
             }
         });
         addFunction("onPlotClick", new JavaScriptFunction() {
@@ -43,8 +43,8 @@ public class Flot extends AbstractJavaScriptComponent {
             public void call(JsonArray arguments) {
                 int seriesIndex = (int) arguments.getNumber(0);
                 int dataIndex = (int) arguments.getNumber(1);
-                Notification.show("Clicked on [" + seriesIndex + ", "
-                        + dataIndex + "]");
+                Notification.show(
+                        "Clicked on [" + seriesIndex + ", " + dataIndex + "]");
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
index f6449b1997..e6f4f9df89 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
@@ -37,8 +37,8 @@ public class FlotJavaScriptUI extends UI {
         flot.addSeries(1, 2, 4, 8, 16);
         layout.addComponent(flot);
 
-        layout.addComponent(new Button("Highlight point",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Highlight point", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         flot.highlight(0, 3);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
index ea9cd52d34..1c32e0c7ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
@@ -40,9 +40,7 @@ public class JSAPIUI extends UI {
                     }
                 });
 
-        setContent(new Link(
-                "Send message",
-                new ExternalResource(
-                        "javascript:(function(){com.example.api.notify(prompt('Message'),2);})();")));
+        setContent(new Link("Send message", new ExternalResource(
+                "javascript:(function(){com.example.api.notify(prompt('Message'),2);})();")));
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
index 422e44e402..e3c6ab427d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
@@ -45,7 +45,8 @@ public class BootstrapListenerCode {
         }
 
         @Override
-        public void modifyBootstrapFragment(BootstrapFragmentResponse response) {
+        public void modifyBootstrapFragment(
+                BootstrapFragmentResponse response) {
             // Wrap the fragment in a custom div element
             Element myDiv = new Element(Tag.valueOf("div"), "");
             List<Node> nodes = response.getFragmentNodes();
@@ -66,8 +67,8 @@ class MyVaadinServlet extends VaadinServlet {
             @Override
             public void sessionInit(SessionInitEvent event)
                     throws ServiceException {
-                event.getSession().addBootstrapListener(
-                        BootstrapListenerCode.listener);
+                event.getSession()
+                        .addBootstrapListener(BootstrapListenerCode.listener);
             }
         });
     }
@@ -83,8 +84,8 @@ class MyVaadinPortlet extends VaadinPortlet {
             @Override
             public void sessionInit(SessionInitEvent event)
                     throws ServiceException {
-                event.getSession().addBootstrapListener(
-                        BootstrapListenerCode.listener);
+                event.getSession()
+                        .addBootstrapListener(BootstrapListenerCode.listener);
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
index 0df2c8ce66..b749fba8e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
@@ -42,17 +42,18 @@ public class SettingReadingSessionAttributesUI extends UI {
 
         layout.addComponent(statusHolder);
         layout.addComponent(textField);
-        layout.addComponent(new Button("Set new values",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Set new values", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         String value = textField.getValue();
 
-                        saveValue(SettingReadingSessionAttributesUI.this, value);
+                        saveValue(SettingReadingSessionAttributesUI.this,
+                                value);
                     }
                 }));
-        layout.addComponent(new Button("Reload page",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Reload page", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         getPage().setLocation(getPage().getLocation());
@@ -79,12 +80,11 @@ public class SettingReadingSessionAttributesUI extends UI {
     private static void showValue(SettingReadingSessionAttributesUI ui) {
         ui.statusHolder.removeAllComponents();
         ui.statusHolder.addComponent(new Label("Value in UI: " + ui.value));
+        ui.statusHolder.addComponent(new Label("Value in VaadinServiceSession: "
+                + ui.getSession().getAttribute("myValue")));
         ui.statusHolder.addComponent(new Label(
-                "Value in VaadinServiceSession: "
-                        + ui.getSession().getAttribute("myValue")));
-        ui.statusHolder.addComponent(new Label("Value in HttpSession: "
-                + VaadinService.getCurrentRequest().getWrappedSession()
-                        .getAttribute("myValue")));
+                "Value in HttpSession: " + VaadinService.getCurrentRequest()
+                        .getWrappedSession().getAttribute("myValue")));
     }
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
index d5c99c931b..8382994518 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
@@ -51,8 +51,8 @@ public class LettingUserDownloadFile extends UI {
                 String text = "My image";
                 BufferedImage bi = new BufferedImage(100, 30,
                         BufferedImage.TYPE_3BYTE_BGR);
-                bi.getGraphics().drawChars(text.toCharArray(), 0,
-                        text.length(), 10, 20);
+                bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(),
+                        10, 20);
 
                 try {
                     ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
index 13e2055523..23d0b832e8 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
@@ -33,8 +33,8 @@ public class LoginView extends Panel implements View {
                 Notification.show("Ok, let's pretend you're " + email);
 
                 // indicate the user is logged in
-                ((NavigationtestUI) UI.getCurrent()).setLoggedInUser(email
-                        .getValue());
+                ((NavigationtestUI) UI.getCurrent())
+                        .setLoggedInUser(email.getValue());
 
                 // navigate back to the intended place
                 navigator.navigateTo(fragmentAndParameters);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java
index 3764b7622e..38a10dd3c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java
@@ -25,20 +25,20 @@ public class MainView extends Panel implements View {
                 new ExternalResource("#!" + CountView.NAME));
         layout.addComponent(lnk);
 
-        lnk = new Link("Message: Hello", new ExternalResource("#!"
-                + MessageView.NAME + "/Hello"));
+        lnk = new Link("Message: Hello",
+                new ExternalResource("#!" + MessageView.NAME + "/Hello"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Message: Bye", new ExternalResource("#!"
-                + MessageView.NAME + "/Bye/Goodbye"));
+        lnk = new Link("Message: Bye",
+                new ExternalResource("#!" + MessageView.NAME + "/Bye/Goodbye"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Private message: Secret", new ExternalResource("#!"
-                + SecretView.NAME + "/Secret"));
+        lnk = new Link("Private message: Secret",
+                new ExternalResource("#!" + SecretView.NAME + "/Secret"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Private message: Topsecret", new ExternalResource("#!"
-                + SecretView.NAME + "/Topsecret"));
+        lnk = new Link("Private message: Topsecret",
+                new ExternalResource("#!" + SecretView.NAME + "/Topsecret"));
         layout.addComponent(lnk);
 
         logOut = new Button("Logout", new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
index e638770346..7750bdafd6 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
@@ -22,20 +22,20 @@ public class MainViewEarlierExample extends Panel implements View {
                 new ExternalResource("#!" + CountView.NAME));
         layout.addComponent(lnk);
 
-        lnk = new Link("Message: Hello", new ExternalResource("#!"
-                + MessageView.NAME + "/Hello"));
+        lnk = new Link("Message: Hello",
+                new ExternalResource("#!" + MessageView.NAME + "/Hello"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Message: Bye", new ExternalResource("#!"
-                + MessageView.NAME + "/Bye/Goodbye"));
+        lnk = new Link("Message: Bye",
+                new ExternalResource("#!" + MessageView.NAME + "/Bye/Goodbye"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Private message: Secret", new ExternalResource("#!"
-                + SecretView.NAME + "/Secret"));
+        lnk = new Link("Private message: Secret",
+                new ExternalResource("#!" + SecretView.NAME + "/Secret"));
         layout.addComponent(lnk);
 
-        lnk = new Link("Private message: Topsecret", new ExternalResource("#!"
-                + SecretView.NAME + "/Topsecret"));
+        lnk = new Link("Private message: Topsecret",
+                new ExternalResource("#!" + SecretView.NAME + "/Topsecret"));
         layout.addComponent(lnk);
 
         // login/logout toggle so we can test this
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
index 5344a06a31..707ac7b05e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
@@ -14,8 +14,8 @@ public class MainView__LastNavigatorExample extends Panel implements View {
 
     public MainView__LastNavigatorExample(final Navigator navigator) {
 
-        Link lnk = new Link("Settings", new ExternalResource("#!"
-                + SettingsView.NAME));
+        Link lnk = new Link("Settings",
+                new ExternalResource("#!" + SettingsView.NAME));
         VerticalLayout vl = new VerticalLayout();
         vl.addComponent(lnk);
         setContent(vl);
diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
index 5c78a3f42a..9f255fb8b3 100644
--- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
@@ -55,8 +55,8 @@ public class NavigatorViewBlocksBackButtonAction extends AbstractTestUI {
 
     }
 
-    class ViewWithPromptedLeave extends VerticalLayout implements View,
-            ViewChangeListener {
+    class ViewWithPromptedLeave extends VerticalLayout
+            implements View, ViewChangeListener {
 
         public static final String NAME = "prompted";
 
@@ -89,17 +89,17 @@ public class NavigatorViewBlocksBackButtonAction extends AbstractTestUI {
                 confirmationWindow.setContent(confirmationWindowLayout);
                 confirmationWindowLayout.setMargin(true);
                 confirmationWindowLayout.setSpacing(true);
-                confirmationWindowLayout.addComponent(new Label(
-                        "Really exit this view?"));
-                confirmationWindowLayout.addComponent(new Button("Yeah, sure!",
-                        new Button.ClickListener() {
+                confirmationWindowLayout
+                        .addComponent(new Label("Really exit this view?"));
+                confirmationWindowLayout.addComponent(
+                        new Button("Yeah, sure!", new Button.ClickListener() {
 
                             @Override
                             public void buttonClick(ClickEvent buttonEvent) {
                                 okToLeave = true;
                                 getUI().removeWindow(confirmationWindow);
-                                event.getNavigator().navigateTo(
-                                        event.getViewName() + "/"
+                                event.getNavigator()
+                                        .navigateTo(event.getViewName() + "/"
                                                 + event.getParameters());
                             }
                         }));
diff --git a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java
index fdcfdf7266..d5f7359bb0 100644
--- a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java
@@ -35,8 +35,8 @@ public class OverlayTouchScrolling extends AbstractTestUI {
             @Override
             public void buttonClick(ClickEvent event) {
 
-                Notification
-                        .show("Now close this and you can scroll in mad places.");
+                Notification.show(
+                        "Now close this and you can scroll in mad places.");
                 green.addComponent(new Label(
                         "Thank you for clicking, now scroll (with touch device) to area without green background, which shouldn't be possible."));
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
index a97f2611d1..4e351628a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
@@ -49,8 +49,8 @@ public class BasicPerformanceTest extends UI {
         this.performanceTopic = performanceTopic;
         this.serverLimit = serverLimit;
         this.clientLimit = clientLimit;
-        reportPerformanceButton.setCaption("Report performance for "
-                + performanceTopic);
+        reportPerformanceButton
+                .setCaption("Report performance for " + performanceTopic);
         reportPerformanceButton.setEnabled(true);
         reportBootstap = false;
     }
@@ -97,8 +97,8 @@ public class BasicPerformanceTest extends UI {
                     }
                 }));
 
-        leftBar.addComponent(new Button("Update all labels",
-                new Button.ClickListener() {
+        leftBar.addComponent(
+                new Button("Update all labels", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Iterator<Component> componentIterator = contentLayout
@@ -129,8 +129,8 @@ public class BasicPerformanceTest extends UI {
                     }
                 }));
 
-        leftBar.addComponent(new Button("Update one label",
-                new Button.ClickListener() {
+        leftBar.addComponent(
+                new Button("Update one label", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Component child = contentLayout.getComponent(0);
@@ -149,8 +149,8 @@ public class BasicPerformanceTest extends UI {
                     }
                 }));
 
-        leftBar.addComponent(new Button("Clear content",
-                new Button.ClickListener() {
+        leftBar.addComponent(
+                new Button("Clear content", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         contentLayout.removeAllComponents();
diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
index 7379b08f5b..a73cf9cb5a 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
@@ -98,7 +98,8 @@ public class BasicPush extends AbstractTestUI {
                                 access(new Runnable() {
                                     @Override
                                     public void run() {
-                                        counter2.setValue(counter2.getValue() + 1);
+                                        counter2.setValue(
+                                                counter2.getValue() + 1);
                                     }
                                 });
                             }
diff --git a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java
index d5646c976b..98b5e3e2e8 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java
@@ -35,8 +35,8 @@ public class EnableDisablePush extends AbstractTestUI {
                             log.log("Counter = " + c++);
                             if (c == 3) {
                                 log.log("Disabling polling, enabling push");
-                                getPushConfiguration().setPushMode(
-                                        PushMode.AUTOMATIC);
+                                getPushConfiguration()
+                                        .setPushMode(PushMode.AUTOMATIC);
                                 setPollInterval(-1);
                                 log.log("Polling disabled, push enabled");
                             }
@@ -94,18 +94,19 @@ public class EnableDisablePush extends AbstractTestUI {
             }
         }));
 
-        addComponent(new Button(
-                "Disable push, re-enable from background thread",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(Button.ClickEvent event) {
-                        log.log("Disabling push, enabling polling");
-                        getPushConfiguration().setPushMode(PushMode.DISABLED);
-                        setPollInterval(1000);
-                        timer.schedule(new CounterTask(), new Date());
-                        log.log("Push disabled, polling enabled");
-                    }
-                }));
+        addComponent(
+                new Button("Disable push, re-enable from background thread",
+                        new Button.ClickListener() {
+                            @Override
+                            public void buttonClick(Button.ClickEvent event) {
+                                log.log("Disabling push, enabling polling");
+                                getPushConfiguration()
+                                        .setPushMode(PushMode.DISABLED);
+                                setPollInterval(1000);
+                                timer.schedule(new CounterTask(), new Date());
+                                log.log("Push disabled, polling enabled");
+                            }
+                        }));
 
         addComponent(log);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
index 873a5c0ff7..19791acefd 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
@@ -113,8 +113,8 @@ public class PushConfigurator extends VerticalLayout {
         pushMode.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                ui.getPushConfiguration().setPushMode(
-                        (PushMode) pushMode.getValue());
+                ui.getPushConfiguration()
+                        .setPushMode((PushMode) pushMode.getValue());
                 refreshStatus();
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
index a1182c0daf..e73f776b3b 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
@@ -28,10 +28,10 @@ public class PushErrorHandling extends AbstractTestUI {
 
             @Override
             public void error(com.vaadin.server.ErrorEvent event) {
-                addComponent(new Label("An error! "
-                        + event.getThrowable().getMessage()));
-                System.err.println("An error! "
-                        + event.getThrowable().getMessage());
+                addComponent(new Label(
+                        "An error! " + event.getThrowable().getMessage()));
+                System.err.println(
+                        "An error! " + event.getThrowable().getMessage());
             }
         });
 
@@ -60,8 +60,8 @@ public class PushErrorHandling extends AbstractTestUI {
                         AbstractInMemoryContainer.class) {
                     @Override
                     public Collection<String> getContainerPropertyIds() {
-                        List<String> cpropIds = new ArrayList<String>(super
-                                .getContainerPropertyIds());
+                        List<String> cpropIds = new ArrayList<String>(
+                                super.getContainerPropertyIds());
                         cpropIds.add("testid");
                         return cpropIds;
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
index aa0a7c7c58..e0daafab7b 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
@@ -88,7 +88,8 @@ public abstract class PushLargeData extends AbstractTestUIWithLog {
                         pushDuration);
                 executor.execute(r);
                 log.log("Starting push, size: " + pushSize + ", interval: "
-                        + pushInterval + "ms, duration: " + pushDuration + "ms");
+                        + pushInterval + "ms, duration: " + pushDuration
+                        + "ms");
             }
         });
         addComponent(b);
diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
index 9765ccc937..a3a8cd3cb1 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
@@ -31,14 +31,16 @@ public class RoundTripTest extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         final RoundTripTester roundTripTester = new RoundTripTester();
-        final LegacyTextField payloadSize = new LegacyTextField("Payload size (bytes)");
+        final LegacyTextField payloadSize = new LegacyTextField(
+                "Payload size (bytes)");
         payloadSize.setConverter(Integer.class);
         payloadSize.setConvertedValue(10000);
         if (request.getParameter("payload") != null) {
             payloadSize.setValue(request.getParameter("payload"));
         }
         addComponent(payloadSize);
-        final LegacyTextField testDuration = new LegacyTextField("Test duration (ms)");
+        final LegacyTextField testDuration = new LegacyTextField(
+                "Test duration (ms)");
         testDuration.setConverter(Integer.class);
         testDuration.setConvertedValue(10000);
         addComponent(testDuration);
diff --git a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
index 553fa8f24c..39d8d03c5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
@@ -36,13 +36,12 @@ public class TogglePush extends AbstractTestUI {
         addComponent(counterLabel);
 
         getPushConfiguration()
-                .setPushMode(
-                        "disabled".equals(request.getParameter("push")) ? PushMode.DISABLED
-                                : PushMode.AUTOMATIC);
+                .setPushMode("disabled".equals(request.getParameter("push"))
+                        ? PushMode.DISABLED : PushMode.AUTOMATIC);
 
         CheckBox pushSetting = new CheckBox("Push enabled");
-        pushSetting.setValue(Boolean.valueOf(getPushConfiguration()
-                .getPushMode().isEnabled()));
+        pushSetting.setValue(Boolean
+                .valueOf(getPushConfiguration().getPushMode().isEnabled()));
         pushSetting.setImmediate(true);
         pushSetting.addValueChangeListener(event -> {
             if (event.getValue()) {
@@ -53,8 +52,8 @@ public class TogglePush extends AbstractTestUI {
         });
         addComponent(pushSetting);
 
-        addComponent(new Button("Update counter now",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Update counter now", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         updateCounter();
@@ -81,8 +80,8 @@ public class TogglePush extends AbstractTestUI {
     }
 
     public void updateCounter() {
-        counterLabel.setValue("Counter has been updated " + counter++
-                + " times");
+        counterLabel
+                .setValue("Counter has been updated " + counter++ + " times");
     }
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
index 182a2e67e4..4261aeaf5a 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -64,8 +64,8 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
                     }
                 });
 
-        getPage().getJavaScript().execute(
-                methodImplementation + testMethod + buildTestCase());
+        getPage().getJavaScript()
+                .execute(methodImplementation + testMethod + buildTestCase());
     }
 
     private String buildTestCase() {
diff --git a/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java
index a6a5a5a084..d3b9962d96 100644
--- a/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java
+++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java
@@ -21,8 +21,8 @@ public class AppResource404 extends TestBase {
         String baseUrl = request.getContextPath() + request.getServletPath();
 
         addComponent(new Link("Existing resource", resource));
-        addComponent(new Link("Non-existing resource", new ExternalResource(
-                baseUrl + "/APP/connector/0/4/asdfasdf")));
+        addComponent(new Link("Non-existing resource",
+                new ExternalResource(baseUrl + "/APP/connector/0/4/asdfasdf")));
         addComponent(new Link("/APP/ url that should give 404",
                 new ExternalResource(baseUrl + "/APP/")));
         addComponent(new Link("/APPLE url that should go to UI providers",
diff --git a/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java
index d799e1a8d4..5cc0856a5a 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java
@@ -17,10 +17,9 @@ public class DownloadLargeFileResource extends TestBase {
 
     @Override
     protected void setup() {
-        Button b = new Button(
-                "Download a "
-                        + String.format("%.1f", fileSize / 1024.0 / 1024.0)
-                        + "MB file", new Button.ClickListener() {
+        Button b = new Button("Download a "
+                + String.format("%.1f", fileSize / 1024.0 / 1024.0) + "MB file",
+                new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java
index f55c1f1f1d..88ca1cf5b6 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java
@@ -25,8 +25,9 @@ public class NonExistingFileResource extends TestBase {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                FileResource res = new FileResource(new File(VaadinService
-                        .getCurrent().getBaseDirectory() + "/" + filename));
+                FileResource res = new FileResource(
+                        new File(VaadinService.getCurrent().getBaseDirectory()
+                                + "/" + filename));
                 getMainWindow().open(res);
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java
index e323f5285b..40e5192c87 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java
@@ -51,8 +51,8 @@ public class ResourceDownload extends TestBase {
         b = new Button("Test", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                ResourceDownload.this.getMainWindow().showNotification(
-                        "Still working");
+                ResourceDownload.this.getMainWindow()
+                        .showNotification("Still working");
             }
 
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
index bac82f232d..0e9c3bce45 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
@@ -151,18 +151,11 @@ public class RPCLoggerUI extends AbstractTestUIWithLog implements ErrorHandler {
         for (int i = 0; i < lastActions.size(); i++) {
             Action action = lastActions.get(i);
             if (action.invocation instanceof ServerRpcMethodInvocation) {
-                msg += "\n"
-                        + (i + 1)
-                        + " "
-                        + formatAction(action.target,
-                                (ServerRpcMethodInvocation) action.invocation);
+                msg += "\n" + (i + 1) + " " + formatAction(action.target,
+                        (ServerRpcMethodInvocation) action.invocation);
             } else {
-                msg += "\n"
-                        + (i + 1)
-                        + " "
-                        + formatAction(
-                                action.target,
-                                (LegacyChangeVariablesInvocation) action.invocation);
+                msg += "\n" + (i + 1) + " " + formatAction(action.target,
+                        (LegacyChangeVariablesInvocation) action.invocation);
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
index 01d1b14243..1ee8c64bdf 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
@@ -26,7 +26,8 @@ import com.vaadin.tests.widgetset.client.EncoderResultDisplayConnector.ReportRpc
 @Widgetset(TestingWidgetSet.NAME)
 public class EncodeResultDisplay extends AbstractTestUIWithLog {
 
-    public static class EncoderResultDisplayExtension extends AbstractExtension {
+    public static class EncoderResultDisplayExtension
+            extends AbstractExtension {
         public EncoderResultDisplayExtension(
                 EncoderResultDisplayConnector.ReportRpc rpc) {
             registerRpc(rpc);
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
index 618462b203..d0a542f99f 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
@@ -29,11 +29,12 @@ import com.vaadin.ui.LegacyComponent;
 @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
 public class LegacySerializerUI extends AbstractTestUIWithLog {
 
-    public class LegacySerializerComponent extends AbstractComponent implements
-            LegacyComponent {
+    public class LegacySerializerComponent extends AbstractComponent
+            implements LegacyComponent {
 
         @Override
-        public void changeVariables(Object source, Map<String, Object> variables) {
+        public void changeVariables(Object source,
+                Map<String, Object> variables) {
             log("doubleInfinity: " + variables.get("doubleInfinity"));
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
index 380d83fe28..8fe575a691 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
@@ -43,8 +43,8 @@ public class NoLayout extends AbstractTestUI {
         });
         addComponent(uiPolling);
 
-        addComponent(new Button("Change regular state",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Change regular state", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         event.getButton().setCaption(
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
index d1af180d4e..7f05c91e5f 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
@@ -80,14 +80,15 @@ public class SerializerTest extends AbstractTestUI {
             }
         };
 
-        rpc.sendBoolean(true, Boolean.FALSE, new boolean[] { true, true, false,
-                true, false, false });
+        rpc.sendBoolean(true, Boolean.FALSE,
+                new boolean[] { true, true, false, true, false, false });
         state.booleanValue = true;
         state.booleanObjectValue = Boolean.FALSE;
         state.booleanArray = new boolean[] { true, true, false, true, false,
                 false };
 
-        rpc.sendByte((byte) 5, Byte.valueOf((byte) -12), new byte[] { 3, 1, 2 });
+        rpc.sendByte((byte) 5, Byte.valueOf((byte) -12),
+                new byte[] { 3, 1, 2 });
         state.byteValue = (byte) 5;
         state.byteObjectValue = Byte.valueOf((byte) -12);
         state.byteArray = new byte[] { 3, 1, 2 };
@@ -102,20 +103,20 @@ public class SerializerTest extends AbstractTestUI {
         state.intObjectValue = Integer.valueOf(42);
         state.intArray = new int[] { 5, 7 };
 
-        rpc.sendLong(577431841358l, Long.valueOf(0), new long[] {
-                -57841235865l, 57 });
+        rpc.sendLong(577431841358l, Long.valueOf(0),
+                new long[] { -57841235865l, 57 });
         state.longValue = 577431841359l;
         state.longObjectValue = Long.valueOf(577431841360l);
         state.longArray = new long[] { -57841235865l, 57 };
 
-        rpc.sendFloat(3.14159f, Float.valueOf(Math.nextUp(1)), new float[] {
-                57, 0, -12 });
+        rpc.sendFloat(3.14159f, Float.valueOf(Math.nextUp(1)),
+                new float[] { 57, 0, -12 });
         state.floatValue = 3.14159f;
         state.floatObjectValue = Float.valueOf(Math.nextUp(1));
         state.floatArray = new float[] { 57, 0, -12 };
 
-        rpc.sendDouble(Math.PI, Double.valueOf(-Math.E), new double[] {
-                Double.MAX_VALUE, Double.MIN_VALUE });
+        rpc.sendDouble(Math.PI, Double.valueOf(-Math.E),
+                new double[] { Double.MAX_VALUE, Double.MIN_VALUE });
         state.doubleValue = Math.PI;
         state.doubleObjectValue = Double.valueOf(-Math.E);
         state.doubleArray = new double[] { Double.MAX_VALUE, Double.MIN_VALUE };
@@ -129,42 +130,43 @@ public class SerializerTest extends AbstractTestUI {
 
         rpc.sendBean(
                 new ComplexTestBean(new SimpleTestBean(0),
-                        new SimpleTestBean(1), Arrays.asList(
-                                new SimpleTestBean(3), new SimpleTestBean(4)),
-                        5), new SimpleTestBean(6),
+                        new SimpleTestBean(1),
+                        Arrays.asList(new SimpleTestBean(3),
+                                new SimpleTestBean(4)),
+                        5),
+                new SimpleTestBean(6),
                 new SimpleTestBean[] { new SimpleTestBean(7) });
         state.complexTestBean = new ComplexTestBean(new SimpleTestBean(0),
-                new SimpleTestBean(1), Arrays.asList(new SimpleTestBean(3),
-                        new SimpleTestBean(4)), 5);
+                new SimpleTestBean(1),
+                Arrays.asList(new SimpleTestBean(3), new SimpleTestBean(4)), 5);
         state.simpleTestBean = new SimpleTestBean(6);
-        state.simpleTestBeanArray = new SimpleTestBean[] { new SimpleTestBean(7) };
+        state.simpleTestBeanArray = new SimpleTestBean[] {
+                new SimpleTestBean(7) };
 
         rpc.sendNull("Not null", null);
         state.nullString = null;
 
         rpc.sendNestedArray(new int[][] { { 5 }, { 7 } },
-                new SimpleTestBean[][] { { new SimpleTestBean(4),
-                        new SimpleTestBean(2) } });
+                new SimpleTestBean[][] {
+                        { new SimpleTestBean(4), new SimpleTestBean(2) } });
         state.nestedIntArray = new int[][] { { 5 }, { 7 } };
-        state.nestedBeanArray = new SimpleTestBean[][] { {
-                new SimpleTestBean(4), new SimpleTestBean(2) } };
+        state.nestedBeanArray = new SimpleTestBean[][] {
+                { new SimpleTestBean(4), new SimpleTestBean(2) } };
 
-        rpc.sendList(Arrays.asList(5, 8, -234), Arrays.<Connector> asList(this,
-                testExtension), Arrays.asList(new SimpleTestBean(234),
-                new SimpleTestBean(-568)));
+        rpc.sendList(Arrays.asList(5, 8, -234),
+                Arrays.<Connector> asList(this, testExtension), Arrays.asList(
+                        new SimpleTestBean(234), new SimpleTestBean(-568)));
         state.intList = Arrays.asList(5, 8, -234);
         state.connectorList = Arrays.<Connector> asList(this, testExtension);
         state.simpleTestBeanList = Arrays.asList(new SimpleTestBean(234),
                 new SimpleTestBean(-568));
 
-        rpc.sendArrayList(
-                Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }),
+        rpc.sendArrayList(Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }),
                 Arrays.asList(new Integer[] { 5, 6 }, new Integer[] { 7, 8 }),
-                Collections
-                        .singletonList(new SimpleTestBean[] { new SimpleTestBean(
-                                7) }));
-        state.primitiveArrayList = Arrays.asList(new int[] { 1, 2 }, new int[] {
-                3, 4 });
+                Collections.singletonList(
+                        new SimpleTestBean[] { new SimpleTestBean(7) }));
+        state.primitiveArrayList = Arrays.asList(new int[] { 1, 2 },
+                new int[] { 3, 4 });
         state.objectArrayList = Arrays.asList(new Integer[] { 5, 6 },
                 new Integer[] { 7, 8 });
         state.beanArrayList = Collections
@@ -174,14 +176,15 @@ public class SerializerTest extends AbstractTestUI {
         // rpc.sendListArray(
         // new List[] { Arrays.asList(1, 2), Arrays.asList(3, 4) },
         // new List[] { Collections.singletonList(new SimpleTestBean(-1)) });
-        rpc.sendSet(new HashSet<Integer>(Arrays.asList(4, 7, 12)), Collections
-                .singleton((Connector) this), new HashSet<SimpleTestBean>(
-                Arrays.asList(new SimpleTestBean(1), new SimpleTestBean(2))));
+        rpc.sendSet(new HashSet<Integer>(Arrays.asList(4, 7, 12)),
+                Collections.singleton((Connector) this),
+                new HashSet<SimpleTestBean>(Arrays.asList(new SimpleTestBean(1),
+                        new SimpleTestBean(2))));
         state.intSet = new HashSet<Integer>(Arrays.asList(4, 7, 12));
         state.connectorSet = Collections.singleton((Connector) this);
 
-        state.beanSet = new HashSet<SimpleTestBean>(Arrays.asList(
-                new SimpleTestBean(1), new SimpleTestBean(2)));
+        state.beanSet = new HashSet<SimpleTestBean>(
+                Arrays.asList(new SimpleTestBean(1), new SimpleTestBean(2)));
 
         rpc.sendMap(new HashMap<String, SimpleTestBean>() {
             {
@@ -229,17 +232,19 @@ public class SerializerTest extends AbstractTestUI {
             }
         };
 
-        rpc.sendWrappedGenerics(new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() {
-            {
-                put(Collections.singleton(new SimpleTestBean(42)),
-                        new HashMap<Integer, List<SimpleTestBean>>() {
-                            {
-                                put(1, Arrays.asList(new SimpleTestBean(1),
-                                        new SimpleTestBean(3)));
-                            }
-                        });
-            }
-        });
+        rpc.sendWrappedGenerics(
+                new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() {
+                    {
+                        put(Collections.singleton(new SimpleTestBean(42)),
+                                new HashMap<Integer, List<SimpleTestBean>>() {
+                                    {
+                                        put(1, Arrays.asList(
+                                                new SimpleTestBean(1),
+                                                new SimpleTestBean(3)));
+                                    }
+                                });
+                    }
+                });
         state.generics = new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() {
             {
                 put(Collections.singleton(new SimpleTestBean(42)),
@@ -252,8 +257,8 @@ public class SerializerTest extends AbstractTestUI {
             }
         };
 
-        rpc.sendEnum(ContentMode.TEXT, new ContentMode[] {
-                ContentMode.PREFORMATTED, ContentMode.XML },
+        rpc.sendEnum(ContentMode.TEXT,
+                new ContentMode[] { ContentMode.PREFORMATTED, ContentMode.XML },
                 Arrays.asList(ContentMode.HTML, ContentMode.RAW));
 
         state.contentMode = ContentMode.TEXT;
@@ -290,7 +295,8 @@ public class SerializerTest extends AbstractTestUI {
             }
 
             @Override
-            public void sendChar(char value, Character boxedValue, char[] array) {
+            public void sendChar(char value, Character boxedValue,
+                    char[] array) {
                 log.log("sendChar: " + value + ", " + boxedValue + ", "
                         + Arrays.toString(array));
             }
@@ -308,7 +314,8 @@ public class SerializerTest extends AbstractTestUI {
             }
 
             @Override
-            public void sendFloat(float value, Float boxedValue, float[] array) {
+            public void sendFloat(float value, Float boxedValue,
+                    float[] array) {
                 log.log("sendFloat: " + value + ", " + boxedValue + ", "
                         + Arrays.toString(array));
             }
@@ -352,7 +359,8 @@ public class SerializerTest extends AbstractTestUI {
 
             @Override
             public void sendList(List<Integer> intList,
-                    List<Connector> connectorList, List<SimpleTestBean> beanList) {
+                    List<Connector> connectorList,
+                    List<SimpleTestBean> beanList) {
                 log.log("sendList: " + intList + ", "
                         + connectorCollectionToString(connectorList) + ", "
                         + beanList);
@@ -519,8 +527,8 @@ public class SerializerTest extends AbstractTestUI {
         }
     }
 
-    private static class SimpleBeanComparator implements
-            Comparator<SimpleTestBean> {
+    private static class SimpleBeanComparator
+            implements Comparator<SimpleTestBean> {
         @Override
         public int compare(SimpleTestBean o1, SimpleTestBean o2) {
             return Integer.valueOf(o1.getValue()).compareTo(o2.getValue());
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
index 738d8fc681..0612d5f855 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
@@ -65,8 +65,8 @@ public class CSSInjectTest extends TestBase {
 
                                     @Override
                                     public InputStream getStream() {
-                                        return new ByteArrayInputStream(css
-                                                .getBytes());
+                                        return new ByteArrayInputStream(
+                                                css.getBytes());
                                     }
                                 }, UUID.randomUUID().toString() + ".css"));
 
@@ -75,8 +75,8 @@ public class CSSInjectTest extends TestBase {
                 });
         addComponent(injectRandom);
 
-        addComponent(new Button("Inject initial again!",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Inject initial again!", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         stylesheet.add(initialResource);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
index 0a57b77aa3..9579888e6d 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
@@ -85,7 +85,8 @@ public class LegacyComponentThemeChange extends AbstractTestUIWithLog {
         Table t = new Table();
         t.addActionHandler(new Handler() {
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
             }
 
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
index 0ea5c18bc9..ad1e0745d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
@@ -40,8 +40,8 @@ public class ThemeChangeOnTheFly extends AbstractTestUIWithLog {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                getPage().getStyles().add(
-                        ".v-app { background: blue !important;}");
+                getPage().getStyles()
+                        .add(".v-app { background: blue !important;}");
 
             }
         });
@@ -78,11 +78,11 @@ public class ThemeChangeOnTheFly extends AbstractTestUIWithLog {
         Label l = new Label("Chameleon theme image in caption");
         l.setIcon(new ThemeResource("img/magnifier.png"));
         images.addComponent(l);
-        Image image = new Image("Runo theme image", new ThemeResource(
-                "icons/64/ok.png"));
+        Image image = new Image("Runo theme image",
+                new ThemeResource("icons/64/ok.png"));
         images.addComponent(image);
-        image = new Image("Reindeer theme image", new ThemeResource(
-                "button/img/left-focus.png"));
+        image = new Image("Reindeer theme image",
+                new ThemeResource("button/img/left-focus.png"));
         images.addComponent(image);
         addComponent(images);
         addComponent(gl);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
index ee88595ba7..20b3612e78 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
@@ -34,8 +34,8 @@ import com.vaadin.ui.themes.ValoTheme;
  */
 public class ButtonsAndLinks extends VerticalLayout implements View {
     /**
- * 
- */
+    * 
+    */
     public ButtonsAndLinks() {
         setMargin(true);
 
@@ -157,12 +157,12 @@ public class ButtonsAndLinks extends VerticalLayout implements View {
         row.setSpacing(true);
         addComponent(row);
 
-        Link link = new Link("vaadin.com", new ExternalResource(
-                "https://vaadin.com"));
+        Link link = new Link("vaadin.com",
+                new ExternalResource("https://vaadin.com"));
         row.addComponent(link);
 
-        link = new Link("Link with icon", new ExternalResource(
-                "https://vaadin.com"));
+        link = new Link("Link with icon",
+                new ExternalResource("https://vaadin.com"));
         link.addStyleName("color3");
         link.setIcon(testIcon.get());
         row.addComponent(link);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
index f77cf9a315..f9260d31d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
@@ -102,8 +102,8 @@ public class CheckBoxes extends VerticalLayout implements View {
         OptionGroup options = new OptionGroup("Choose one, explicit width");
         options.setWidth("200px");
         options.addItem("Option One");
-        Item two = options
-                .addItem("Option Two, with a longer caption that should wrap when the components width is explicitly set.");
+        Item two = options.addItem(
+                "Option Two, with a longer caption that should wrap when the components width is explicitly set.");
         options.addItem("Option Three");
         options.select("Option One");
         options.setItemIcon("Option One", testIcon.get());
@@ -115,8 +115,8 @@ public class CheckBoxes extends VerticalLayout implements View {
         options.setMultiSelect(true);
         options.setWidth("200px");
         options.addItem("Option One");
-        two = options
-                .addItem("Option Two, with a longer caption that should wrap when the components width is explicitly set.");
+        two = options.addItem(
+                "Option Two, with a longer caption that should wrap when the components width is explicitly set.");
         options.addItem("Option Three");
         options.select("Option One");
         options.setItemIcon("Option One", testIcon.get());
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
index 8c4d9c2e3c..4198e28910 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
@@ -185,8 +185,8 @@ public class CommonParts extends VerticalLayout implements View {
                         }
                     }
                 });
-                description
-                        .setValue("A more informative message about what has happened. Nihil hic munitissimus habendi senatus locus, nihil horum? Inmensae subtilitatis, obscuris et malesuada fames. Hi omnes lingua, institutis, legibus inter se differunt.");
+                description.setValue(
+                        "A more informative message about what has happened. Nihil hic munitissimus habendi senatus locus, nihil horum? Inmensae subtilitatis, obscuris et malesuada fames. Hi omnes lingua, institutis, legibus inter se differunt.");
                 description.setWidth("100%");
                 addComponent(description);
 
@@ -198,9 +198,9 @@ public class CommonParts extends VerticalLayout implements View {
                             notification.setStyleName(styleString.trim());
                         } else {
                             typeString = selectedItem.getText().toLowerCase();
-                            notification
-                                    .setStyleName((typeString + " " + styleString
-                                            .trim()).trim());
+                            notification.setStyleName(
+                                    (typeString + " " + styleString.trim())
+                                            .trim());
                         }
                         for (MenuItem item : type.getItems()) {
                             item.setChecked(false);
@@ -231,9 +231,9 @@ public class CommonParts extends VerticalLayout implements View {
                             }
                         }
                         if (styleString.trim().length() > 0) {
-                            notification
-                                    .setStyleName((typeString + " " + styleString
-                                            .trim()).trim());
+                            notification.setStyleName(
+                                    (typeString + " " + styleString.trim())
+                                            .trim());
                         } else if (typeString.length() > 0) {
                             notification.setStyleName(typeString.trim());
                         } else {
@@ -265,8 +265,8 @@ public class CommonParts extends VerticalLayout implements View {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
                         try {
-                            notification.setDelayMsec(Integer.parseInt(delay
-                                    .getValue()));
+                            notification.setDelayMsec(
+                                    Integer.parseInt(delay.getValue()));
                         } catch (Exception e) {
                             notification.setDelayMsec(-1);
                             delay.setValue("");
@@ -410,19 +410,21 @@ public class CommonParts extends VerticalLayout implements View {
 
                 label = new Label("Long");
                 label.addStyleName(ValoTheme.LABEL_BOLD);
-                label.setDescription("Long tooltip message. Inmensae subtilitatis, obscuris et malesuada fames. Salutantibus vitae elit libero, a pharetra augue.");
+                label.setDescription(
+                        "Long tooltip message. Inmensae subtilitatis, obscuris et malesuada fames. Salutantibus vitae elit libero, a pharetra augue.");
                 addComponent(label);
 
                 label = new Label("HTML tooltip");
                 label.addStyleName(ValoTheme.LABEL_BOLD);
-                label.setDescription("<div><h1>Ut enim ad minim veniam, quis nostrud exercitation</h1><p><span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>Donec sed odio operae, eu vulputate felis rhoncus.</span> <span>At nos hinc posthac, sitientis piros Afros.</span> <span>Tu quoque, Brute, fili mi, nihil timor populi, nihil!</span></p><p><span>Gallia est omnis divisa in partes tres, quarum.</span> <span>Praeterea iter est quasdam res quas ex communi.</span> <span>Cum ceteris in veneratione tui montes, nascetur mus.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span> <span>Idque Caesaris facere voluntate liceret: sese habere.</span></p></div>");
+                label.setDescription(
+                        "<div><h1>Ut enim ad minim veniam, quis nostrud exercitation</h1><p><span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>Donec sed odio operae, eu vulputate felis rhoncus.</span> <span>At nos hinc posthac, sitientis piros Afros.</span> <span>Tu quoque, Brute, fili mi, nihil timor populi, nihil!</span></p><p><span>Gallia est omnis divisa in partes tres, quarum.</span> <span>Praeterea iter est quasdam res quas ex communi.</span> <span>Cum ceteris in veneratione tui montes, nascetur mus.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span> <span>Idque Caesaris facere voluntate liceret: sese habere.</span></p></div>");
                 addComponent(label);
 
                 label = new Label("With an error message");
                 label.addStyleName(ValoTheme.LABEL_BOLD);
                 label.setDescription("Simple tooltip message");
-                label.setComponentError(new UserError(
-                        "Something terrible has happened"));
+                label.setComponentError(
+                        new UserError("Something terrible has happened"));
                 addComponent(label);
 
                 label = new Label("With a long error message");
@@ -436,8 +438,8 @@ public class CommonParts extends VerticalLayout implements View {
 
                 label = new Label("Error message only");
                 label.addStyleName(ValoTheme.LABEL_BOLD);
-                label.setComponentError(new UserError(
-                        "Something terrible has happened"));
+                label.setComponentError(
+                        new UserError("Something terrible has happened"));
                 addComponent(label);
             }
         };
@@ -500,17 +502,18 @@ public class CommonParts extends VerticalLayout implements View {
                     tabs.addTab(new Label("&nbsp;", ContentMode.HTML),
                             "One more");
                     tabs.addStyleName(ValoTheme.TABSHEET_PADDED_TABBAR);
-                    tabs.addSelectedTabChangeListener(new SelectedTabChangeListener() {
-                        @Override
-                        public void selectedTabChange(
-                                SelectedTabChangeEvent event) {
-                            try {
-                                Thread.sleep(600);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
+                    tabs.addSelectedTabChangeListener(
+                            new SelectedTabChangeListener() {
+                                @Override
+                                public void selectedTabChange(
+                                        SelectedTabChangeEvent event) {
+                                    try {
+                                        Thread.sleep(600);
+                                    } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            });
                     content = tabs;
                 } else if (!autoHeight) {
                     Panel p = new Panel();
@@ -609,14 +612,15 @@ public class CommonParts extends VerticalLayout implements View {
                             footerToolbar = selectedItem.isChecked();
                         }
 
-                        if (selectedItem.getText().equals("Top Toolbar layout")) {
+                        if (selectedItem.getText()
+                                .equals("Top Toolbar layout")) {
                             toolbarLayout = selectedItem.isChecked();
                         }
 
                         if (selectedItem.getText()
                                 .equals("Borderless Toolbars")) {
-                            toolbarStyle = selectedItem.isChecked() ? ValoTheme.MENUBAR_BORDERLESS
-                                    : null;
+                            toolbarStyle = selectedItem.isChecked()
+                                    ? ValoTheme.MENUBAR_BORDERLESS : null;
                         }
 
                         win.setContent(windowContent());
@@ -625,8 +629,8 @@ public class CommonParts extends VerticalLayout implements View {
 
                 MenuBar options = new MenuBar();
                 options.setCaption("Content");
-                options.addItem("Auto Height", optionsCommand).setCheckable(
-                        true);
+                options.addItem("Auto Height", optionsCommand)
+                        .setCheckable(true);
                 options.addItem("Tabs", optionsCommand).setCheckable(true);
                 MenuItem option = options.addItem("Footer", optionsCommand);
                 option.setCheckable(true);
@@ -636,10 +640,10 @@ public class CommonParts extends VerticalLayout implements View {
 
                 options = new MenuBar();
                 options.setCaption("Toolbars");
-                options.addItem("Footer Toolbar", optionsCommand).setCheckable(
-                        true);
-                options.addItem("Top Toolbar", optionsCommand).setCheckable(
-                        true);
+                options.addItem("Footer Toolbar", optionsCommand)
+                        .setCheckable(true);
+                options.addItem("Top Toolbar", optionsCommand)
+                        .setCheckable(true);
                 options.addItem("Top Toolbar layout", optionsCommand)
                         .setCheckable(true);
                 options.addItem("Borderless Toolbars", optionsCommand)
@@ -651,8 +655,8 @@ public class CommonParts extends VerticalLayout implements View {
                     @Override
                     public void menuSelected(MenuItem selectedItem) {
                         if (selectedItem.getText().equals("Caption")) {
-                            win.setCaption(selectedItem.isChecked() ? "Window Caption"
-                                    : null);
+                            win.setCaption(selectedItem.isChecked()
+                                    ? "Window Caption" : null);
                         } else if (selectedItem.getText().equals("Closable")) {
                             win.setClosable(selectedItem.isChecked());
                         } else if (selectedItem.getText().equals("Resizable")) {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
index 8de518be23..d5aec713df 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
@@ -75,9 +75,11 @@ public class Dragging extends VerticalLayout implements View {
             @Override
             public void menuSelected(MenuItem selectedItem) {
                 if (selectedItem.isChecked()) {
-                    sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS);
+                    sample.removeStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS);
                 } else {
-                    sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS);
+                    sample.addStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS);
                 }
             }
         });
@@ -88,9 +90,11 @@ public class Dragging extends VerticalLayout implements View {
             @Override
             public void menuSelected(MenuItem selectedItem) {
                 if (selectedItem.isChecked()) {
-                    sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS);
+                    sample.removeStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS);
                 } else {
-                    sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS);
+                    sample.addStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS);
                 }
             }
         });
@@ -101,9 +105,11 @@ public class Dragging extends VerticalLayout implements View {
             @Override
             public void menuSelected(MenuItem selectedItem) {
                 if (selectedItem.isChecked()) {
-                    sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS);
+                    sample.removeStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS);
                 } else {
-                    sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS);
+                    sample.addStyleName(
+                            ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS);
                 }
             }
         });
@@ -130,15 +136,15 @@ public class Dragging extends VerticalLayout implements View {
         label.setWidth("120px");
         components.add(label);
 
-        final Embedded image = new Embedded("", new ThemeResource(
-                "../runo/icons/64/document.png"));
+        final Embedded image = new Embedded("",
+                new ThemeResource("../runo/icons/64/document.png"));
         components.add(image);
 
         final CssLayout documentLayout = new CssLayout();
         documentLayout.setWidth("19px");
         for (int i = 0; i < 5; ++i) {
-            final Embedded e = new Embedded(null, new ThemeResource(
-                    "../runo/icons/16/document.png"));
+            final Embedded e = new Embedded(null,
+                    new ThemeResource("../runo/icons/16/document.png"));
             e.setHeight("16px");
             e.setWidth("16px");
             documentLayout.addComponent(e);
@@ -202,16 +208,16 @@ public class Dragging extends VerticalLayout implements View {
                 }
 
                 // drop on top of target?
-                if (dropTargetData.getData("horizontalLocation").equals(
-                        HorizontalDropLocation.CENTER.toString())) {
+                if (dropTargetData.getData("horizontalLocation")
+                        .equals(HorizontalDropLocation.CENTER.toString())) {
                     if (sourceWasAfterTarget) {
                         index--;
                     }
                 }
 
                 // drop before the target?
-                else if (dropTargetData.getData("horizontalLocation").equals(
-                        HorizontalDropLocation.LEFT.toString())) {
+                else if (dropTargetData.getData("horizontalLocation")
+                        .equals(HorizontalDropLocation.LEFT.toString())) {
                     index--;
                     if (index < 0) {
                         index = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
index 1d7ba7eefb..b7a231763a 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
@@ -18,7 +18,8 @@ public class FormLayoutInsideTable extends AbstractTestUI {
             private static final long serialVersionUID = 1L;
 
             @Override
-            public Object generateCell(Table source, Object itemId, Object columnId) {
+            public Object generateCell(Table source, Object itemId,
+                    Object columnId) {
                 FormLayout layout = new FormLayout();
                 layout.addComponent(new Label("Line 1 " + itemId));
                 layout.addComponent(new Label("Line 2 " + itemId));
@@ -30,4 +31,5 @@ public class FormLayoutInsideTable extends AbstractTestUI {
         table.setSizeFull();
         table.addItem("abc0");
         addComponent(table);
-    }}
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
index fc74166b29..0eec1a71f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
@@ -161,8 +161,8 @@ public class MenuBars extends VerticalLayout implements View {
         Command check = new Command() {
             @Override
             public void menuSelected(MenuItem selectedItem) {
-                Notification.show(selectedItem.isChecked() ? "Checked"
-                        : "Unchecked");
+                Notification.show(
+                        selectedItem.isChecked() ? "Checked" : "Unchecked");
             }
         };
 
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
index 58988c06d6..896801dba0 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
@@ -74,11 +74,13 @@ public class PopupViews extends VerticalLayout implements View {
                 return new VerticalLayout() {
                     {
                         setMargin(true);
-                        addComponent(new Label(
-                                "<h3>Thanks for waiting!</h3><p>You've opened this popup <b>"
-                                        + ++count + " time"
-                                        + (count > 1 ? "s" : " only")
-                                        + "</b>.</p>", ContentMode.HTML));
+                        addComponent(
+                                new Label(
+                                        "<h3>Thanks for waiting!</h3><p>You've opened this popup <b>"
+                                                + ++count + " time"
+                                                + (count > 1 ? "s" : " only")
+                                                + "</b>.</p>",
+                                        ContentMode.HTML));
                     }
                 };
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
index e20d3c49c5..194c4cf31c 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
@@ -178,7 +178,8 @@ public class Tables extends VerticalLayout implements View {
         table.removeGeneratedColumn("progress");
 
         if (componentsInRows) {
-            table.addContainerProperty("textfield", LegacyTextField.class, null);
+            table.addContainerProperty("textfield", LegacyTextField.class,
+                    null);
             table.addGeneratedColumn("textfield", new ColumnGenerator() {
                 @Override
                 public Object generateCell(Table source, Object itemId,
@@ -193,7 +194,8 @@ public class Tables extends VerticalLayout implements View {
                 }
             });
 
-            table.addContainerProperty("datefield", LegacyTextField.class, null);
+            table.addContainerProperty("datefield", LegacyTextField.class,
+                    null);
             table.addGeneratedColumn("datefield", new ColumnGenerator() {
                 @Override
                 public Object generateCell(Table source, Object itemId,
@@ -255,7 +257,8 @@ public class Tables extends VerticalLayout implements View {
                 }
             });
 
-            table.addContainerProperty("optiongroup", LegacyTextField.class, null);
+            table.addContainerProperty("optiongroup", LegacyTextField.class,
+                    null);
             table.addGeneratedColumn("optiongroup", new ColumnGenerator() {
                 @Override
                 public Object generateCell(Table source, Object itemId,
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
index f808cc1525..f06549317d 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
@@ -115,15 +115,14 @@ public class Tabsheets extends VerticalLayout implements View {
             style += padded.getValue() ? " padded-tabbar" : "";
             style += compact.getValue() ? " compact-tabbar" : "";
             style += iconsOnTop.getValue() ? " icons-on-top" : "";
-            style += selectedOnly.getValue() ? " only-selected-closable"
-                    : "";
+            style += selectedOnly.getValue() ? " only-selected-closable" : "";
 
             if (tabs != null) {
                 removeComponent(tabs);
             }
             tabs = getTabSheet(caption.getValue(), style.trim(),
-                    closable.getValue(), overflow.getValue(),
-                    icon.getValue(), disable.getValue());
+                    closable.getValue(), overflow.getValue(), icon.getValue(),
+                    disable.getValue());
             addComponent(tabs);
         };
         closable.addValueChangeListener(update);
@@ -144,8 +143,8 @@ public class Tabsheets extends VerticalLayout implements View {
         icon.setValue(true);
     }
 
-    static TabSheet getTabSheet(boolean caption, String style,
-            boolean closable, boolean scrolling, boolean icon, boolean disable) {
+    static TabSheet getTabSheet(boolean caption, String style, boolean closable,
+            boolean scrolling, boolean icon, boolean disable) {
         TestIcon testIcon = new TestIcon(60);
 
         TabSheet ts = new TabSheet();
@@ -153,8 +152,8 @@ public class Tabsheets extends VerticalLayout implements View {
         StringGenerator sg = new StringGenerator();
 
         for (int i = 1; i <= (scrolling ? 10 : 3); i++) {
-            String tabcaption = caption ? sg.nextString(true) + " "
-                    + sg.nextString(false) : null;
+            String tabcaption = caption
+                    ? sg.nextString(true) + " " + sg.nextString(false) : null;
 
             VerticalLayout content = new VerticalLayout();
             content.setMargin(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java
index 0d34bf2b63..db58dd1feb 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java
@@ -50,7 +50,8 @@ public class TestIcon {
             }
             return ICONS.get(iconCount);
         }
-        return new ThemeResource("../runo/icons/" + imageSize + "/document.png");
+        return new ThemeResource(
+                "../runo/icons/" + imageSize + "/document.png");
     }
 
     static List<FontAwesome> ICONS = new ArrayList<FontAwesome>();
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 3bf6fd7ca3..091bff5698 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -92,8 +92,8 @@ public class ValoThemeUI extends UI {
             testMode = true;
 
             if (browserCantRenderFontsConsistently()) {
-                getPage().getStyles().add(
-                        ".v-app.v-app.v-app {font-family: Sans-Serif;}");
+                getPage().getStyles()
+                        .add(".v-app.v-app.v-app {font-family: Sans-Serif;}");
             }
         }
 
@@ -159,9 +159,8 @@ public class ValoThemeUI extends UI {
                         for (Iterator<Component> it = menuItemsLayout
                                 .iterator(); it.hasNext();) {
                             Component c = it.next();
-                            if (c.getCaption() != null
-                                    && c.getCaption().startsWith(
-                                            item.getValue())) {
+                            if (c.getCaption() != null && c.getCaption()
+                                    .startsWith(item.getValue())) {
                                 c.addStyleName("selected");
                                 break;
                             }
@@ -281,8 +280,9 @@ public class ValoThemeUI extends UI {
         StringGenerator sg = new StringGenerator();
         MenuItem settingsItem = settings.addItem(
                 sg.nextString(true) + " " + sg.nextString(true)
-                        + sg.nextString(false), new ThemeResource(
-                        "../tests-valo/img/profile-pic-300px.jpg"), null);
+                        + sg.nextString(false),
+                new ThemeResource("../tests-valo/img/profile-pic-300px.jpg"),
+                null);
         settingsItem.addItem("Edit Profile", null);
         settingsItem.addItem("Preferences", null);
         settingsItem.addSeparator();
@@ -303,9 +303,9 @@ public class ValoThemeUI extends UI {
                 menuItemsLayout.addComponent(label);
             }
             if (item.getKey().equals("panels")) {
-                label.setValue(label.getValue()
-                        + " <span class=\"valo-menu-badge\">" + count
-                        + "</span>");
+                label.setValue(
+                        label.getValue() + " <span class=\"valo-menu-badge\">"
+                                + count + "</span>");
                 count = 0;
                 label = new Label("Containers", ContentMode.HTML);
                 label.setPrimaryStyleName(ValoTheme.MENU_SUBTITLE);
@@ -314,9 +314,9 @@ public class ValoThemeUI extends UI {
                 menuItemsLayout.addComponent(label);
             }
             if (item.getKey().equals("calendar")) {
-                label.setValue(label.getValue()
-                        + " <span class=\"valo-menu-badge\">" + count
-                        + "</span>");
+                label.setValue(
+                        label.getValue() + " <span class=\"valo-menu-badge\">"
+                                + count + "</span>");
                 count = 0;
                 label = new Label("Other", ContentMode.HTML);
                 label.setPrimaryStyleName(ValoTheme.MENU_SUBTITLE);
@@ -404,16 +404,16 @@ public class ValoThemeUI extends UI {
         container.addContainerProperty(CAPTION_PROPERTY, String.class, null);
         container.addContainerProperty(ICON_PROPERTY, Resource.class, null);
         container.addContainerProperty(INDEX_PROPERTY, Integer.class, null);
-        container
-                .addContainerProperty(DESCRIPTION_PROPERTY, String.class, null);
+        container.addContainerProperty(DESCRIPTION_PROPERTY, String.class,
+                null);
         for (int i = 1; i < size + 1; i++) {
             Item item = container.addItem(i);
-            item.getItemProperty(CAPTION_PROPERTY).setValue(
-                    sg.nextString(true) + " " + sg.nextString(false));
+            item.getItemProperty(CAPTION_PROPERTY)
+                    .setValue(sg.nextString(true) + " " + sg.nextString(false));
             item.getItemProperty(INDEX_PROPERTY).setValue(i);
-            item.getItemProperty(DESCRIPTION_PROPERTY).setValue(
-                    sg.nextString(true) + " " + sg.nextString(false) + " "
-                            + sg.nextString(false));
+            item.getItemProperty(DESCRIPTION_PROPERTY)
+                    .setValue(sg.nextString(true) + " " + sg.nextString(false)
+                            + " " + sg.nextString(false));
             item.getItemProperty(ICON_PROPERTY).setValue(testIcon.get());
         }
         container.getItem(container.getIdByIndex(0))
@@ -426,28 +426,28 @@ public class ValoThemeUI extends UI {
                     Item child = container.addItem(id);
                     child.getItemProperty(CAPTION_PROPERTY).setValue(
                             sg.nextString(true) + " " + sg.nextString(false));
-                    child.getItemProperty(ICON_PROPERTY).setValue(
-                            testIcon.get());
+                    child.getItemProperty(ICON_PROPERTY)
+                            .setValue(testIcon.get());
                     ((Hierarchical) container).setParent(id, i);
 
                     for (int k = 1; k < 6; k++) {
                         String id2 = id + " -> " + k;
                         child = container.addItem(id2);
-                        child.getItemProperty(CAPTION_PROPERTY).setValue(
-                                sg.nextString(true) + " "
+                        child.getItemProperty(CAPTION_PROPERTY)
+                                .setValue(sg.nextString(true) + " "
                                         + sg.nextString(false));
-                        child.getItemProperty(ICON_PROPERTY).setValue(
-                                testIcon.get());
+                        child.getItemProperty(ICON_PROPERTY)
+                                .setValue(testIcon.get());
                         ((Hierarchical) container).setParent(id2, id);
 
                         for (int l = 1; l < 5; l++) {
                             String id3 = id2 + " -> " + l;
                             child = container.addItem(id3);
-                            child.getItemProperty(CAPTION_PROPERTY).setValue(
-                                    sg.nextString(true) + " "
+                            child.getItemProperty(CAPTION_PROPERTY)
+                                    .setValue(sg.nextString(true) + " "
                                             + sg.nextString(false));
-                            child.getItemProperty(ICON_PROPERTY).setValue(
-                                    testIcon.get());
+                            child.getItemProperty(ICON_PROPERTY)
+                                    .setValue(testIcon.get());
                             ((Hierarchical) container).setParent(id3, id2);
                         }
                     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java
index 3a707934b6..e2038b19b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java
@@ -124,8 +124,8 @@ public class Ticket1230 extends LegacyApplication {
 
         }
 
-        w.addComponent(new Button("print select values",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("print select values", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         printState();
@@ -152,8 +152,8 @@ public class Ticket1230 extends LegacyApplication {
     void printState() {
         System.out.println(" Select without null item "
                 + selectWithoutNullItem.getValue());
-        System.out.println(" Select with null item "
-                + selectWithNullItem.getValue());
+        System.out.println(
+                " Select with null item " + selectWithNullItem.getValue());
 
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
index e176d4637f..6ba6236e4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
@@ -95,7 +95,8 @@ public class Ticket1397 extends LegacyApplication {
         panel3Layout.setMargin(true);
         final Panel panel3 = new Panel("Editor popup for a property",
                 panel3Layout);
-        LegacyTextField tf2 = new LegacyTextField("TextField for editing a property");
+        LegacyTextField tf2 = new LegacyTextField(
+                "TextField for editing a property");
         final ObjectProperty<String> op = new ObjectProperty<String>(
                 "This is property text.");
         tf2.setPropertyDataSource(op);
@@ -141,7 +142,8 @@ public class Ticket1397 extends LegacyApplication {
             final int lineNum = i;
             PopupView pp2 = new PopupView(new PopupView.Content() {
 
-                LegacyTextField tf = new LegacyTextField("Editor for line " + lineNum,
+                LegacyTextField tf = new LegacyTextField(
+                        "Editor for line " + lineNum,
 
                         "Try to edit the contents for this textfield on line "
                                 + lineNum
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
index 9c8f400e1d..930a3bd0ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
@@ -139,8 +139,8 @@ public class Ticket1435 extends LegacyApplication {
                         } else {
                             root.setHeight(lastHeight, lastHeightUnit);
                         }
-                        event.getButton().setCaption(
-                                visible ? "Expand" : "Collapse");
+                        event.getButton()
+                                .setCaption(visible ? "Expand" : "Collapse");
                     }
                 }
             });
@@ -225,8 +225,9 @@ public class Ticket1435 extends LegacyApplication {
 
         for (int i = 0; i < 10; i++) {
             String name = "Name " + i;
-            table.addItem(new Object[] { new CheckBox(), name,
-                    "02-22-2007 13:37" }, new Integer(i));
+            table.addItem(
+                    new Object[] { new CheckBox(), name, "02-22-2007 13:37" },
+                    new Integer(i));
         }
 
         panel.setPanelComponent(table);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java
index b59b7f8e5e..31db37c279 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java
@@ -25,8 +25,9 @@ public class Ticket1506_Panel extends Panel {
         layout.addComponent(initSelect(new Ticket1506_TestContainer(),
                 "Test select", property1));
         layout.addComponent(initButton(property1));
-        layout.addComponent(initSelect(new Ticket1506_TestContainer2(),
-                "Test select 2", new ObjectProperty<String>(null, String.class)));
+        layout.addComponent(
+                initSelect(new Ticket1506_TestContainer2(), "Test select 2",
+                        new ObjectProperty<String>(null, String.class)));
     }
 
     private Component initButton(final ObjectProperty<?> property) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index d6b53db7c7..d8d074404a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
@@ -24,17 +24,17 @@ public class Ticket1506_TestContainer implements Container {
 
     private void loadItems() {
         final PropertysetItem item1 = new PropertysetItem();
-        item1.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>(
-                "value 1", String.class));
-        item1.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>(
-                "name 1", String.class));
+        item1.addItemProperty(PROPERTY_1_ID,
+                new ObjectProperty<String>("value 1", String.class));
+        item1.addItemProperty(PROPERTY_2_ID,
+                new ObjectProperty<String>("name 1", String.class));
         items.put(ITEM_1_ID, item1);
 
         final PropertysetItem item2 = new PropertysetItem();
-        item2.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>(
-                "value 2", String.class));
-        item2.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>(
-                "name 2", String.class));
+        item2.addItemProperty(PROPERTY_1_ID,
+                new ObjectProperty<String>("value 2", String.class));
+        item2.addItemProperty(PROPERTY_2_ID,
+                new ObjectProperty<String>("name 2", String.class));
         items.put(ITEM_2_ID, item2);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 288a9ef7d2..2854125fe4 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
@@ -25,10 +25,10 @@ public class Ticket1506_TestContainer2 implements Container {
     private void loadItems() {
         for (int i = 1; i < 15; i++) {
             final PropertysetItem item = new PropertysetItem();
-            item.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>(
-                    "value " + i, String.class));
-            item.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>(
-                    "name " + i, String.class));
+            item.addItemProperty(PROPERTY_1_ID,
+                    new ObjectProperty<String>("value " + i, String.class));
+            item.addItemProperty(PROPERTY_2_ID,
+                    new ObjectProperty<String>("name " + i, String.class));
             items.put(String.valueOf(i), item);
         }
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java
index a890c08ddb..926551ad3b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java
@@ -47,8 +47,8 @@ public class Ticket1598 extends LegacyApplication {
 
                         @Override
                         public void menuSelected(MenuItem selected) {
-                            main.showNotification("Action "
-                                    + selected.getText());
+                            main.showNotification(
+                                    "Action " + selected.getText());
                         }
                     });
         }
@@ -60,8 +60,8 @@ public class Ticket1598 extends LegacyApplication {
 
                         @Override
                         public void menuSelected(MenuItem selected) {
-                            main.showNotification("Action "
-                                    + selected.getText());
+                            main.showNotification(
+                                    "Action " + selected.getText());
                         }
                     });
         }
@@ -74,8 +74,8 @@ public class Ticket1598 extends LegacyApplication {
 
                         @Override
                         public void menuSelected(MenuItem selected) {
-                            main.showNotification("Action "
-                                    + selected.getText());
+                            main.showNotification(
+                                    "Action " + selected.getText());
                         }
                     });
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java
index c227bcc3d8..c2c38d029c 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java
@@ -49,7 +49,8 @@ public class Ticket1632 extends LegacyApplication {
             public void buttonClick(ClickEvent event) {
                 visible = !visible;
                 if (visible) {
-                    t.setVisibleColumns(new Object[] { "col1", "col2", "col3" });
+                    t.setVisibleColumns(
+                            new Object[] { "col1", "col2", "col3" });
 
                 } else {
                     t.setVisibleColumns(new Object[] { "col1", "col2" });
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java
index 826a5539d8..5f017e95ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java
@@ -12,14 +12,13 @@ public class Ticket1659 extends LegacyApplication {
     public void init() {
         final LegacyWindow mainWin = new LegacyWindow();
         setMainWindow(mainWin);
-        mainWin.addComponent(new Button(
-                "Change URI using Application.getURL()",
+        mainWin.addComponent(new Button("Change URI using Application.getURL()",
                 new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        mainWin.open(new ExternalResource(getURL() + "#"
-                                + System.currentTimeMillis()));
+                        mainWin.open(new ExternalResource(
+                                getURL() + "#" + System.currentTimeMillis()));
                     }
                 }));
         mainWin.addComponent(new Button("Change URI uring Window.getURL()",
@@ -27,8 +26,8 @@ public class Ticket1659 extends LegacyApplication {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        mainWin.open(new ExternalResource(mainWin.getURL()
-                                + "#" + System.currentTimeMillis()));
+                        mainWin.open(new ExternalResource(mainWin.getURL() + "#"
+                                + System.currentTimeMillis()));
                     }
                 }));
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
index 9978cb24d1..69ec6f0b70 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
@@ -13,9 +13,10 @@ public class Ticket1663 extends com.vaadin.server.LegacyApplication {
         setMainWindow(main);
 
         LegacyTextField tf = new LegacyTextField("First name");
-        tf.setDescription("The first name is used for the administration user interfaces only.");
-        tf.setComponentError(new SystemError(
-                "You must enter only one first name."));
+        tf.setDescription(
+                "The first name is used for the administration user interfaces only.");
+        tf.setComponentError(
+                new SystemError("You must enter only one first name."));
 
         main.addComponent(tf);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java
index 33515bad87..9db5665cf7 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java
@@ -12,7 +12,8 @@ import com.vaadin.ui.VerticalLayout;
 
 public class Ticket1737 extends LegacyApplication {
 
-    Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") {
+    Resource slowRes = new ClassResource(Ticket1737.class,
+            "m-bullet-blue.gif") {
         @Override
         public DownloadStream getStream() {
             try {
@@ -39,8 +40,8 @@ public class Ticket1737 extends LegacyApplication {
         Panel p = new Panel("Test panel", pl);
         p.setSizeFull();
 
-        pl.addComponent(new Label(
-                "Second component is embedded with a slow resource "
+        pl.addComponent(
+                new Label("Second component is embedded with a slow resource "
                         + "and thus should break layout if Embedded cannot"
                         + " request re-layout after load."));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
index 50b01134ce..267afc5fa2 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
@@ -27,8 +27,8 @@ public class Ticket1772 extends com.vaadin.server.LegacyApplication {
             @Override
             public void buttonClick(ClickEvent event) {
 
-                gridLayout
-                        .addComponent(new LegacyTextField("Content " + (++counter)));
+                gridLayout.addComponent(
+                        new LegacyTextField("Content " + (++counter)));
 
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
index fed4f6b151..bd451b9b80 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
@@ -39,37 +39,42 @@ public class Ticket1804 extends com.vaadin.server.LegacyApplication {
 
         s = new Select("Testcase from the ticket #1804");
         s.setNullSelectionAllowed(false);
-        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));
-        s.addValidator(new EmptyStringValidator(
-                "Selection required for test-field"));
+        s.setPropertyDataSource(
+                new MethodProperty<String>(new TestPojo(), "id"));
+        s.addValidator(
+                new EmptyStringValidator("Selection required for test-field"));
         s.setRequired(true);
         listOfAllFields.add(s);
 
         s = new Select("Testcase from the ticket #1804, but without validator");
         s.setNullSelectionAllowed(false);
-        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));
+        s.setPropertyDataSource(
+                new MethodProperty<String>(new TestPojo(), "id"));
         s.setRequired(true);
         listOfAllFields.add(s);
 
         s = new Select(
                 "Testcase from the ticket #1804, but with required=false");
         s.setNullSelectionAllowed(false);
-        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));
-        s.addValidator(new EmptyStringValidator(
-                "Selection required for test-field"));
+        s.setPropertyDataSource(
+                new MethodProperty<String>(new TestPojo(), "id"));
+        s.addValidator(
+                new EmptyStringValidator("Selection required for test-field"));
         listOfAllFields.add(s);
 
         s = new Select(
                 "Testcase from the ticket #1804, but without validator and with required=false");
         s.setNullSelectionAllowed(false);
-        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));
+        s.setPropertyDataSource(
+                new MethodProperty<String>(new TestPojo(), "id"));
         listOfAllFields.add(s);
 
         s = new Select(
                 "Required=true, custom error message, null selection not allowed");
         s.setRequired(true);
         s.setNullSelectionAllowed(false);
-        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));
+        s.setPropertyDataSource(
+                new MethodProperty<String>(new TestPojo(), "id"));
         s.setValue(null);
         s.setComponentError(new SystemError("Test error message"));
         listOfAllFields.add(s);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
index 81434d3316..2e387ea9bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
@@ -28,7 +28,8 @@ public class Ticket1805 extends com.vaadin.server.LegacyApplication {
 
         final GridLayout grid = new GridLayout(4, 1);
 
-        final LegacyTextField size = new LegacyTextField("Grid width in css unit");
+        final LegacyTextField size = new LegacyTextField(
+                "Grid width in css unit");
         size.addListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
index 8705112f75..e55fa72d10 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
@@ -29,15 +29,15 @@ public class Ticket1806 extends com.vaadin.server.LegacyApplication {
                         tf1.commit();
                     }
                 }));
-        main.addComponent(new Button("Show property value",
-                new Button.ClickListener() {
+        main.addComponent(
+                new Button("Show property value", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         main.showNotification("'" + prop.getValue() + "'");
                     }
                 }));
-        main.addComponent(new Button("Show field value",
-                new Button.ClickListener() {
+        main.addComponent(
+                new Button("Show field value", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         main.showNotification("'" + tf1.getValue() + "'");
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index 60078daacd..1fd72efd78 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
@@ -9,8 +9,8 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1834PanelScrolling extends
-        com.vaadin.server.LegacyApplication {
+public class Ticket1834PanelScrolling
+        extends com.vaadin.server.LegacyApplication {
 
     private static final int ROWS = 50;
 
@@ -79,10 +79,8 @@ public class Ticket1834PanelScrolling extends
         p = new Panel("TestPanel", pl);
 
         for (int i = 0; i < ROWS; i++) {
-            pl.addComponent(new Label(
-                    "Label"
-                            + i
-                            + "................................................................................................................."));
+            pl.addComponent(new Label("Label" + i
+                    + "................................................................................................................."));
         }
 
         p.setHeight("300px");
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
index 3d64f9d426..f956a172d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
@@ -54,14 +54,13 @@ public class Ticket1857 extends LegacyApplication implements Handler {
                     @Override
                     public String getStyle(Table source, Object itemId,
                             Object propertyId) {
-                        Object cell = t.getContainerProperty(itemId,
-                                propertyId).getValue();
+                        Object cell = t.getContainerProperty(itemId, propertyId)
+                                .getValue();
                         if (!(cell instanceof Integer)) {
                             return null;
                         }
                         int age = ((Integer) cell).intValue();
-                        return age > 65 ? "old" : (age < 18 ? "young"
-                                : null);
+                        return age > 65 ? "old" : (age < 18 ? "young" : null);
                     }
                 });
             } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java
index ab43b45576..07c9090485 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java
@@ -109,8 +109,8 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler {
             int rr = Integer.parseInt(v[0]);
             int rs = Integer.parseInt(v[1]);
             if (rr < round || (rr == round && rs < state)) {
-                getMainWindow().showNotification(
-                        "Already past requested " + s[0]);
+                getMainWindow()
+                        .showNotification("Already past requested " + s[0]);
                 return false;
             }
             while (round < rr || state < rs) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java
index 939fe05e58..69efc3d9a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java
@@ -23,10 +23,8 @@ public class Ticket1923 extends com.vaadin.server.LegacyApplication {
         // p.getLayout().setWidth("100%");
         // p.setContent(new GridLayout(1, 100));
         for (int i = 0; i < ROWS; i++) {
-            pl.addComponent(new Label(
-                    "Label"
-                            + i
-                            + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));
+            pl.addComponent(new Label("Label" + i
+                    + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));
         }
         // main.getLayout().setSizeFull();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
index 29786fa646..0ab447488f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
@@ -24,8 +24,8 @@ public class Ticket1939 extends LegacyApplication {
         l.addComponent(t);
         w.addComponent(l);
 
-        w.addComponent(new Button("show me the bug",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("show me the bug", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         l.setWidth(null);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java
index 2023094458..dff2bd1769 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java
@@ -103,9 +103,9 @@ public class Ticket1966 extends LegacyApplication {
     }
 
     private Button getButton(Layout l, Alignment align) {
-        Button b = new Button("Narrow Button - "
-                + align.getHorizontalAlignment() + " - "
-                + align.getVerticalAlignment());
+        Button b = new Button(
+                "Narrow Button - " + align.getHorizontalAlignment() + " - "
+                        + align.getVerticalAlignment());
         b.setWidth("100px");
         ((AlignmentHandler) l).setComponentAlignment(b, align);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
index 60088582a5..686027e9c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -29,7 +29,8 @@ public class Ticket1966_3 extends LegacyApplication {
         p.setHeight("300px");
         ol.setSizeFull();
 
-        LegacyTextField tf = new LegacyTextField("Long caption, longer than 100 pixels");
+        LegacyTextField tf = new LegacyTextField(
+                "Long caption, longer than 100 pixels");
         tf.setWidth("100px");
 
         ol.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java
index 73746fb07d..a33aea1565 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java
@@ -43,8 +43,7 @@ public class Ticket1969 extends com.vaadin.server.LegacyApplication {
 
         Button b;
 
-        b = new Button(
-                "change introduction caption (should add * to tab name)",
+        b = new Button("change introduction caption (should add * to tab name)",
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java
index eb98153be0..98cd131197 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java
@@ -35,14 +35,14 @@ public class Ticket1970 extends LegacyApplication {
         addWindow(w);
         w.addComponent(new Label(
                 "This window has been created on fly for name: " + name));
-        w.addComponent(new Button("Show open windows",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("Show open windows", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
                         String openWindows = "";
-                        for (Iterator<LegacyWindow> i = getWindows().iterator(); i
-                                .hasNext();) {
+                        for (Iterator<LegacyWindow> i = getWindows()
+                                .iterator(); i.hasNext();) {
                             LegacyWindow t = i.next();
                             openWindows += (openWindows.length() > 0 ? "," : "")
                                     + t.getName();
@@ -60,12 +60,14 @@ public class Ticket1970 extends LegacyApplication {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        w.showNotification("Name of this window = "
-                                + w.getName());
+                        w.showNotification(
+                                "Name of this window = " + w.getName());
                     }
                 }));
-        w.addComponent(new Label("<a href='" + getURL().toExternalForm() + "'>"
-                + getURL().toExternalForm() + "</a>", ContentMode.HTML));
+        w.addComponent(new Label(
+                "<a href='" + getURL().toExternalForm() + "'>"
+                        + getURL().toExternalForm() + "</a>",
+                ContentMode.HTML));
         w.addComponent(new Label(
                 "<h2>How to reproduce</h2>Open the above link in another browser"
                         + " window and then press the Show-button on this window.",
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java
index 18caac808b..921b4573eb 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java
@@ -34,8 +34,8 @@ public class Ticket1975 extends LegacyApplication {
             cl1 = new CustomLayout(new ByteArrayInputStream(s.getBytes()));
             layout.addComponent(cl1);
 
-            layout.addComponent(new Button("Disable/Enable",
-                    new ClickListener() {
+            layout.addComponent(
+                    new Button("Disable/Enable", new ClickListener() {
 
                         @Override
                         public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java
index d8ec0f63fb..de162c50c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java
@@ -67,8 +67,8 @@ public class Ticket1982 extends LegacyApplication {
                     min.setVisible(true);
                     max.setVisible(false);
                     TitleBar.this.layout.removeAllComponents();
-                    TitleBar.this.layout
-                            .addComponent(TitleBar.this, 0, 0, 1, 1);
+                    TitleBar.this.layout.addComponent(TitleBar.this, 0, 0, 1,
+                            1);
                 }
             });
             min.addListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
index 7ebd9c421a..993663b6e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
@@ -50,25 +50,17 @@ public class Ticket1983 extends LegacyApplication {
             dataSource.addContainerProperty(propId, String.class, null);
             dataSource.addContainerProperty(propId2, String.class, null);
             final Object itemId = dataSource.addItem();
-            dataSource
-                    .getItem(itemId)
-                    .getItemProperty(propId)
-                    .setValue(
-                            "Very long value that makes a scrollbar appear for sure");
-            dataSource
-                    .getItem(itemId)
-                    .getItemProperty(propId2)
-                    .setValue(
-                            "Very long value that makes a scrollbar appear for sure");
+            dataSource.getItem(itemId).getItemProperty(propId).setValue(
+                    "Very long value that makes a scrollbar appear for sure");
+            dataSource.getItem(itemId).getItemProperty(propId2).setValue(
+                    "Very long value that makes a scrollbar appear for sure");
 
             for (int i = 0; i < 150; i++) {
                 Object id = dataSource.addItem();
-                dataSource
-                        .getItem(id)
-                        .getItemProperty(propId)
-                        .setValue(
-                                (i == 100 ? "Very long value that makes a scrollbar appear for sure"
-                                        : "Short"));
+                dataSource.getItem(id).getItemProperty(propId)
+                        .setValue((i == 100
+                                ? "Very long value that makes a scrollbar appear for sure"
+                                : "Short"));
                 dataSource.getItem(id).getItemProperty(propId2)
                         .setValue("Short");
             }
@@ -92,14 +84,10 @@ public class Ticket1983 extends LegacyApplication {
                                 .setValue("Short value");
                         isLong = false;
                     } else {
-                        dataSource
-                                .getItem(itemId)
-                                .getItemProperty(propId)
+                        dataSource.getItem(itemId).getItemProperty(propId)
                                 .setValue(
                                         "Very long value that makes a scrollbar appear for sure");
-                        dataSource
-                                .getItem(itemId)
-                                .getItemProperty(propId2)
+                        dataSource.getItem(itemId).getItemProperty(propId2)
                                 .setValue(
                                         "Very long value that makes a scrollbar appear for sure");
                         isLong = true;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java
index 402baa1d34..977d5413da 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java
@@ -31,8 +31,8 @@ public class Ticket1995 extends LegacyApplication {
 
         Filterable filterable = (Container.Filterable) table
                 .getContainerDataSource();
-        filterable.addContainerFilter(new SimpleStringFilter(PROPERTY_1, "Row",
-                true, false));
+        filterable.addContainerFilter(
+                new SimpleStringFilter(PROPERTY_1, "Row", true, false));
 
         table.setColumnHeader(PROPERTY_1, "Test (filter: Row)");
 
@@ -61,8 +61,8 @@ public class Ticket1995 extends LegacyApplication {
 
         getMainWindow().showNotification("Tried to add item 'abc', " + res);
 
-        filterable.addContainerFilter(new SimpleStringFilter(PROPERTY_1, "Row",
-                true, false));
+        filterable.addContainerFilter(
+                new SimpleStringFilter(PROPERTY_1, "Row", true, false));
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
index 3252ee550c..c894a73e5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
@@ -34,7 +34,8 @@ public class Ticket2002 extends LegacyApplication {
         GridLayout layout = new GridLayout(2, 2);
         layout.setSpacing(true);
 
-        LegacyTextField f1 = new LegacyTextField("Non-immediate/Long text field",
+        LegacyTextField f1 = new LegacyTextField(
+                "Non-immediate/Long text field",
                 new MethodProperty<Long>(this, "long1"));
         f1.setImmediate(false);
         f1.setNullSettingAllowed(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
index 5cb7edf39a..4cb9382d1b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
@@ -47,8 +47,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication {
                 events.addComponent(new Label(new Label("Click:"
                         + (event.isDoubleClick() ? "double" : "single")
                         + " button:" + event.getButtonName() + " propertyId:"
-                        + event.getPropertyId() + " itemID:"
-                        + event.getItemId() + " item:" + event.getItem())));
+                        + event.getPropertyId() + " itemID:" + event.getItemId()
+                        + " item:" + event.getItem())));
 
             }
         });
@@ -72,8 +72,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication {
                 events2.addComponent(new Label("Click:"
                         + (event.isDoubleClick() ? "double" : "single")
                         + " button:" + event.getButtonName() + " propertyId:"
-                        + event.getPropertyId() + " itemID:"
-                        + event.getItemId() + " item:" + event.getItem()));
+                        + event.getPropertyId() + " itemID:" + event.getItemId()
+                        + " item:" + event.getItem()));
                 if (event.isDoubleClick()) {
                     new PropertyEditor(event);
                 }
@@ -110,8 +110,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication {
 
             setCaption("Editing " + itemid + " : " + propertyid);
 
-            editor.setPropertyDataSource(c.getContainerProperty(itemid,
-                    propertyid));
+            editor.setPropertyDataSource(
+                    c.getContainerProperty(itemid, propertyid));
             layout.addComponent(editor);
             layout.addComponent(done);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java
index 7fdd56df67..a8d50ab18f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java
@@ -31,8 +31,8 @@ public class Ticket2014 extends LegacyApplication {
     private void createUI(GridLayout layout) {
         createPanel(layout);
 
-        layout.addComponent(new Button("Change class name",
-                new ClickListener() {
+        layout.addComponent(
+                new Button("Change class name", new ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java
index 7c79f86fb2..76237b94ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java
@@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket2023 extends com.vaadin.server.LegacyApplication implements
-        Button.ClickListener {
+public class Ticket2023 extends com.vaadin.server.LegacyApplication
+        implements Button.ClickListener {
 
     AbstractComponent c = new Button();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
index eed338ccd0..2eee70e352 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
@@ -21,9 +21,10 @@ public class Ticket2024 extends LegacyApplication {
         w.getContent().setHeight("2000");
         w.addComponent(layout);
 
-        layout.addComponent(new Label(
-                "This should NOT get stuck when scrolling down"));
-        layout.addComponent(new LegacyTextField("This should not get stuck either..."));
+        layout.addComponent(
+                new Label("This should NOT get stuck when scrolling down"));
+        layout.addComponent(
+                new LegacyTextField("This should not get stuck either..."));
 
         VerticalLayout ol = new VerticalLayout();
         ol.setHeight("1000");
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
index f4c767b258..ba6aa0841e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
@@ -23,8 +23,9 @@ public class Ticket2038 extends LegacyApplication {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                w.showNotification("TextField is " + (tf.isValid() ? "" : "in")
-                        + "valid, with error: " + tf.getErrorMessage(),
+                w.showNotification(
+                        "TextField is " + (tf.isValid() ? "" : "in")
+                                + "valid, with error: " + tf.getErrorMessage(),
                         Notification.TYPE_WARNING_MESSAGE);
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java
index 8fa7c296d0..eca1fd84df 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java
@@ -64,8 +64,8 @@ public class Ticket2048 extends LegacyApplication {
         l.setHeight("400px");
         ol.addComponent(l);
 
-        embedded = new Embedded(null, new ThemeResource(
-                "icons/64/folder-add.png"));
+        embedded = new Embedded(null,
+                new ThemeResource("icons/64/folder-add.png"));
         layout.addComponent(embedded);
         Button b = new Button(
                 "Replace image with new embedded component (flashes)",
@@ -92,7 +92,8 @@ public class Ticket2048 extends LegacyApplication {
                         .contains("folder-add")) {
                     img = "folder-delete";
                 }
-                embedded.setSource(new ThemeResource("icons/64/" + img + ".png"));
+                embedded.setSource(
+                        new ThemeResource("icons/64/" + img + ".png"));
 
             }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
index 9dd684f587..3331386247 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
@@ -21,9 +21,10 @@ public class Ticket2053 extends LegacyApplication {
         setMainWindow(main);
         Button nothing = new Button("Do nothing");
         main.addComponent(nothing);
-        nothing.setDescription("Even though no action is taked, this window is refreshed to "
-                + "draw changes not originating from this window. Such changes include changes "
-                + "made by other browser-windows.");
+        nothing.setDescription(
+                "Even though no action is taked, this window is refreshed to "
+                        + "draw changes not originating from this window. Such changes include changes "
+                        + "made by other browser-windows.");
         Button add = new Button("Add a window", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
@@ -33,19 +34,20 @@ public class Ticket2053 extends LegacyApplication {
                 addWindow(c);
                 main.open(new ExternalResource(c.getURL()), "_new");
                 main.addComponent(new Label(name + " opened"));
-                final LegacyTextField tf = new LegacyTextField("Non immediate textfield");
+                final LegacyTextField tf = new LegacyTextField(
+                        "Non immediate textfield");
                 c.addComponent(tf);
                 tf.addListener(new Property.ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        main.addComponent(new Label(name + " send text:"
-                                + tf.getValue()));
+                        main.addComponent(new Label(
+                                name + " send text:" + tf.getValue()));
                     }
                 });
                 for (int i = 0; i < 3; i++) {
                     final String caption = "Slow button " + i;
-                    c.addComponent(new Button(caption,
-                            new Button.ClickListener() {
+                    c.addComponent(
+                            new Button(caption, new Button.ClickListener() {
                                 @Override
                                 public synchronized void buttonClick(
                                         ClickEvent event) {
@@ -53,8 +55,8 @@ public class Ticket2053 extends LegacyApplication {
                                         this.wait(2000);
                                     } catch (InterruptedException e) {
                                     }
-                                    main.addComponent(new Label(caption
-                                            + " pressed"));
+                                    main.addComponent(
+                                            new Label(caption + " pressed"));
                                 }
                             }));
                 }
@@ -62,10 +64,11 @@ public class Ticket2053 extends LegacyApplication {
             }
         });
         main.addComponent(add);
-        add.setDescription("This button opens a new browser window. Closing the browser "
-                + "window should do two things: 1) submit all unsubmitted state to server "
-                + "(print any changes to textfield to main window) and 2) call window.close()"
-                + " on the child window (print closed on the main window)");
+        add.setDescription(
+                "This button opens a new browser window. Closing the browser "
+                        + "window should do two things: 1) submit all unsubmitted state to server "
+                        + "(print any changes to textfield to main window) and 2) call window.close()"
+                        + " on the child window (print closed on the main window)");
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java
index 3838986bfa..05ce244f6a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java
@@ -33,8 +33,8 @@ public class Ticket2061 extends LegacyApplication {
         MyTable table3 = new MyTable(24, "table3");
         table3.loadTable(1000);
 
-        MyAccordion accordion = new MyAccordion(new Component[] { table1,
-                table2 }, "Test");
+        MyAccordion accordion = new MyAccordion(
+                new Component[] { table1, table2 }, "Test");
 
         Tabs tab = new Tabs(new Component[] { accordion, table3 });
 
@@ -42,7 +42,8 @@ public class Ticket2061 extends LegacyApplication {
 
     }
 
-    public class MyTable extends CustomComponent implements ValueChangeListener {
+    public class MyTable extends CustomComponent
+            implements ValueChangeListener {
 
         private Table table = new Table();
         private String[] columns;
@@ -72,8 +73,8 @@ public class Ticket2061 extends LegacyApplication {
                 Item rowItem = table.addItem(j);
                 if (rowItem != null) {
                     for (int i = 0; i < columns.length; i++) {
-                        rowItem.getItemProperty(columns[i]).setValue(
-                                "Value" + j);
+                        rowItem.getItemProperty(columns[i])
+                                .setValue("Value" + j);
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
index dbcd190503..008d2381f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
@@ -21,8 +21,8 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class Ticket2061b extends LegacyApplication implements
-        SelectedTabChangeListener {
+public class Ticket2061b extends LegacyApplication
+        implements SelectedTabChangeListener {
 
     private LegacyWindow mainWindow;
     private Panel p;
@@ -101,7 +101,8 @@ public class Ticket2061b extends LegacyApplication implements
         tab.addTab(p, "Panel with panel", null);
     }
 
-    public class MyTable extends CustomComponent implements ValueChangeListener {
+    public class MyTable extends CustomComponent
+            implements ValueChangeListener {
 
         private Table table = new Table();
         private String[] columns;
@@ -131,8 +132,8 @@ public class Ticket2061b extends LegacyApplication implements
                 Item rowItem = table.addItem(j);
                 if (rowItem != null) {
                     for (int i = 0; i < columns.length; i++) {
-                        rowItem.getItemProperty(columns[i]).setValue(
-                                "Value" + j);
+                        rowItem.getItemProperty(columns[i])
+                                .setValue("Value" + j);
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java
index e6255d71c7..9a3b129775 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java
@@ -17,8 +17,8 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket2061c extends LegacyApplication implements
-        SelectedTabChangeListener {
+public class Ticket2061c extends LegacyApplication
+        implements SelectedTabChangeListener {
 
     private LegacyWindow mainWindow;
     private Panel p;
@@ -60,7 +60,8 @@ public class Ticket2061c extends LegacyApplication implements
 
     }
 
-    public class MyTable extends CustomComponent implements ValueChangeListener {
+    public class MyTable extends CustomComponent
+            implements ValueChangeListener {
 
         private Table table = new Table();
         private String[] columns;
@@ -90,8 +91,8 @@ public class Ticket2061c extends LegacyApplication implements
                 Item rowItem = table.addItem(j);
                 if (rowItem != null) {
                     for (int i = 0; i < columns.length; i++) {
-                        rowItem.getItemProperty(columns[i]).setValue(
-                                "Value" + j);
+                        rowItem.getItemProperty(columns[i])
+                                .setValue("Value" + j);
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java
index a94dafafcb..9294911188 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java
@@ -23,7 +23,8 @@ public class Ticket2083 extends LegacyApplication {
         VerticalLayout pl = new VerticalLayout();
         pl.setMargin(true);
         Panel p = new Panel(
-                "This is a panel with a longer caption than it should have", pl);
+                "This is a panel with a longer caption than it should have",
+                pl);
         p.setWidth("100px");
         pl.addComponent(new Label("Contents"));
         layout.addComponent(p);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java
index 270da9dc3f..43d839732b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java
@@ -18,7 +18,8 @@ public class Ticket2095 extends LegacyApplication {
 
         Embedded em = new Embedded();
         em.setType(Embedded.TYPE_BROWSER);
-        em.setSource(new ExternalResource("../statictestfiles/ticket2095.html"));
+        em.setSource(
+                new ExternalResource("../statictestfiles/ticket2095.html"));
         em.setId("MYIFRAME");
 
         em.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java
index a21864a67d..40a2e48fb4 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java
@@ -72,8 +72,8 @@ public class Ticket2103 extends LegacyApplication {
                 Item rowItem = table.addItem(j);
                 if (rowItem != null) {
                     for (int i = 0; i < columns.length; i++) {
-                        rowItem.getItemProperty(columns[i]).setValue(
-                                "Value" + j);
+                        rowItem.getItemProperty(columns[i])
+                                .setValue("Value" + j);
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
index e52ab33ffd..a69663eb72 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
@@ -84,9 +84,8 @@ public class Ticket2104 extends LegacyApplication {
         tree.addListener(new ItemClickListener() {
             @Override
             public void itemClick(ItemClickEvent event) {
-                getMainWindow().addComponent(
-                        new Label(event.toString() + " // " + event.getItemId()
-                                + "//" + event.getSource()));
+                getMainWindow().addComponent(new Label(event.toString() + " // "
+                        + event.getItemId() + "//" + event.getSource()));
 
             }
         });
@@ -95,7 +94,8 @@ public class Ticket2104 extends LegacyApplication {
         main.addComponent(ol);
         cb = new CheckBox("immediate");
         cb.setValue(table.isImmediate());
-        cb.addValueChangeListener(event -> table.setImmediate(event.getValue()));
+        cb.addValueChangeListener(
+                event -> table.setImmediate(event.getValue()));
         cb.setImmediate(true);
         ol.addComponent(cb);
         cb = new CheckBox("selectable");
@@ -127,9 +127,8 @@ public class Ticket2104 extends LegacyApplication {
         table.addListener(new ItemClickListener() {
             @Override
             public void itemClick(ItemClickEvent event) {
-                getMainWindow().addComponent(
-                        new Label(event.toString() + " // " + event.getItemId()
-                                + "//" + event.getSource()));
+                getMainWindow().addComponent(new Label(event.toString() + " // "
+                        + event.getItemId() + "//" + event.getSource()));
 
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java
index 08b7a738a7..5c478a678e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java
@@ -31,9 +31,8 @@ public class Ticket2106 extends LegacyApplication {
                 new Button("Do nothing", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        getMainWindow().addComponent(
-                                new Label("Last time did nothing: "
-                                        + new Date()));
+                        getMainWindow().addComponent(new Label(
+                                "Last time did nothing: " + new Date()));
                     }
                 }));
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java
index 9cfa63b29e..59004ac88c 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java
@@ -50,12 +50,9 @@ public class Ticket2117 extends LegacyApplication {
 
     private LegacyWindow createWindow() {
         final LegacyWindow w = new LegacyWindow();
-        w.addComponent(new Label(
-                "Click this link: <a target=\"_blank\" href='"
-                        + getURL().toExternalForm()
-                        + "'>"
-                        + getURL().toExternalForm()
-                        + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.",
+        w.addComponent(new Label("Click this link: <a target=\"_blank\" href='"
+                + getURL().toExternalForm() + "'>" + getURL().toExternalForm()
+                + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.",
                 ContentMode.HTML));
         return w;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java
index c8002ff2cb..65d78c269f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java
@@ -50,13 +50,12 @@ public class Ticket2119 extends LegacyApplication {
 
     private Layout testLayout() {
         final Layout layout = new VerticalLayout();
-        final Label label = new Label(
-                "Instructions to reproduce:\n"
-                        + "  - Open this application in two browser windows\n"
-                        + "  - Click the Button in first Window\n"
-                        + "  - Go to the second Window\n"
-                        + "     - Click the arrow in the Select\n"
-                        + "  --> The opened list correctly shows the new value but the old one is shown in the \"input\" part");
+        final Label label = new Label("Instructions to reproduce:\n"
+                + "  - Open this application in two browser windows\n"
+                + "  - Click the Button in first Window\n"
+                + "  - Go to the second Window\n"
+                + "     - Click the arrow in the Select\n"
+                + "  --> The opened list correctly shows the new value but the old one is shown in the \"input\" part");
         label.setContentMode(ContentMode.PREFORMATTED);
         layout.addComponent(label);
 
@@ -77,8 +76,8 @@ public class Ticket2119 extends LegacyApplication {
             @Override
             public void valueChange(Property.ValueChangeEvent event) {
                 Object value = event.getProperty().getValue();
-                valueProperty.setValue((null != value) ? value.toString()
-                        : null);
+                valueProperty
+                        .setValue((null != value) ? value.toString() : null);
             }
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
index 77a08248f4..5dc92c71c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
@@ -56,7 +56,8 @@ public class Ticket2125 extends LegacyApplication {
             });
             CheckBox b = new CheckBox("editmode");
             b.setValue(table.isEditable());
-            b.addValueChangeListener(event -> table.setEditable(event.getValue()));
+            b.addValueChangeListener(
+                    event -> table.setEditable(event.getValue()));
             b.setImmediate(true);
             addComponent(b);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
index a25543d75e..bec49d77a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
@@ -16,16 +16,18 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.OptionGroup;
 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();
 
     private static final String caption = "This is a caption which is very long and nice and perhaps sometimes should be clipped";
     LegacyWindow main = new LegacyWindow("#2181 test");
-    LegacyTextField tf1 = new LegacyTextField(caption, "Test field - undefined width");
-    LegacyTextField tf2 = new LegacyTextField(caption, "Test field - 150px wide");
+    LegacyTextField tf1 = new LegacyTextField(caption,
+            "Test field - undefined width");
+    LegacyTextField tf2 = new LegacyTextField(caption,
+            "Test field - 150px wide");
     Button setButton = new Button("Set", this);
     private Random random = new Random(123);
     private OptionGroup options;
@@ -93,8 +95,9 @@ public class Ticket2181 extends LegacyApplication implements
                     tf.setCaption(caption);
                 } else if (value.equals("Icon")) {
                     String timestamp = String.valueOf(new Date().getTime());
-                    tf.setIcon(new ThemeResource(icons.get(random.nextInt(icons
-                            .size())) + "?" + timestamp));
+                    tf.setIcon(new ThemeResource(
+                            icons.get(random.nextInt(icons.size())) + "?"
+                                    + timestamp));
                 } else if (value.equals("Required")) {
                     tf.setRequired(true);
                 } else if (value.equals("Error")) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java
index 8a467d385e..fe508434bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java
@@ -36,7 +36,7 @@ public class Ticket2186 extends LegacyApplication {
 
             table.addItem(new Object[] { i + " Joku Ihminen", "Testiviesti" },
 
-            new Object());
+                    new Object());
 
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java
index 16fec93c44..9dcc773891 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java
@@ -16,10 +16,8 @@ public class Ticket2232 extends LegacyApplication {
         setMainWindow(new LegacyWindow());
         setTheme("tests-tickets");
 
-        getMainWindow()
-                .addComponent(
-                        new Label(
-                                "Defining spacing must be possible also with pure CSS"));
+        getMainWindow().addComponent(new Label(
+                "Defining spacing must be possible also with pure CSS"));
 
         Layout gl;
         gl = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java
index d100f61e30..3a219ffd82 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java
@@ -13,8 +13,8 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
-public class Ticket2242 extends LegacyApplication implements
-        ValueChangeListener {
+public class Ticket2242 extends LegacyApplication
+        implements ValueChangeListener {
 
     private Object tableValue = null;
     private Table t;
@@ -62,8 +62,8 @@ public class Ticket2242 extends LegacyApplication implements
         IndexedContainer ic = new IndexedContainer();
         ic.addContainerProperty("a", String.class, null);
 
-        for (String s : new String[] { "Lorem", "ipsum", "dolor", "sit",
-                "amet", "consectetuer" }) {
+        for (String s : new String[] { "Lorem", "ipsum", "dolor", "sit", "amet",
+                "consectetuer" }) {
             Item item = ic.addItem(s);
             item.getItemProperty("a").setValue(s);
 
@@ -74,8 +74,8 @@ public class Ticket2242 extends LegacyApplication implements
 
     @Override
     public void valueChange(ValueChangeEvent event) {
-        System.out.println("Value change from " + tableValue + " to "
-                + t.getValue());
+        System.out.println(
+                "Value change from " + tableValue + " to " + t.getValue());
         tableValue = t.getValue();
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java
index b50a1d073e..2f658e3fa4 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java
@@ -21,8 +21,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 
-public class Ticket2292 extends com.vaadin.server.LegacyApplication implements
-        RequestHandler {
+public class Ticket2292 extends com.vaadin.server.LegacyApplication
+        implements RequestHandler {
 
     @Override
     public void init() {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java
index b4a3d02efa..f1773a5561 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java
@@ -20,18 +20,14 @@ public class Ticket2297 extends Ticket2292 {
                 "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
 
         try {
-            CustomLayout cl = new CustomLayout(
-                    new ByteArrayInputStream(
-                            ("This is an empty CustomLayout with as slow image. <img src=\""
-                                    + url.toString() + "/icon.png\" />")
-                                    .getBytes()));
+            CustomLayout cl = new CustomLayout(new ByteArrayInputStream(
+                    ("This is an empty CustomLayout with as slow image. <img src=\""
+                            + url.toString() + "/icon.png\" />").getBytes()));
             main.addComponent(cl);
 
-            cl = new CustomLayout(
-                    new ByteArrayInputStream(
-                            ("This is an empty CustomLayout with as slow image. <img src=\""
-                                    + url.toString() + "/icon.png\" />")
-                                    .getBytes()));
+            cl = new CustomLayout(new ByteArrayInputStream(
+                    ("This is an empty CustomLayout with as slow image. <img src=\""
+                            + url.toString() + "/icon.png\" />").getBytes()));
             main.addComponent(cl);
         } catch (IOException e) {
             // TODO Auto-generated catch block
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java
index be85f2d481..8a6aaabc6e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java
@@ -18,8 +18,8 @@ public class Ticket2303 extends LegacyApplication {
         String customlayout = "<div location=\"test\"></div>";
         CustomLayout cl = null;
         try {
-            cl = new CustomLayout(new ByteArrayInputStream(
-                    customlayout.getBytes()));
+            cl = new CustomLayout(
+                    new ByteArrayInputStream(customlayout.getBytes()));
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java
index 8683711bdc..358ae402b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java
@@ -13,15 +13,14 @@ public class Ticket2339 extends LegacyApplication {
     @Override
     public void init() {
 
-        final LegacyWindow mainWin = new LegacyWindow(getClass()
-                .getSimpleName());
+        final LegacyWindow mainWin = new LegacyWindow(
+                getClass().getSimpleName());
         setMainWindow(mainWin);
 
         try {
-            CustomLayout cl = new CustomLayout(
-                    new ByteArrayInputStream(
-                            "<div style=\"width:400px;overflow:hidden;background-color:red;\"><div style=\"border:1em solid blue; height:4em; padding:1em 1.5em;\" location=\"b\"></div></div>"
-                                    .getBytes()));
+            CustomLayout cl = new CustomLayout(new ByteArrayInputStream(
+                    "<div style=\"width:400px;overflow:hidden;background-color:red;\"><div style=\"border:1em solid blue; height:4em; padding:1em 1.5em;\" location=\"b\"></div></div>"
+                            .getBytes()));
             Button button = new Button("b");
             button.setSizeFull();
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java
index a24351c3aa..7380428025 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java
@@ -43,7 +43,8 @@ public class Ticket2344 extends LegacyApplication {
             vl.addComponent(b);
             t.addItem(new Object[] { vl, "String 2", "String 3", "String 4",
 
-            new Button("String 5") }, new Integer(new Random().nextInt()));
+                    new Button("String 5") },
+                    new Integer(new Random().nextInt()));
 
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java
index b9e96c2f37..a69419da21 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java
@@ -12,8 +12,8 @@ public class Ticket2365 extends LegacyApplication {
     @Override
     public void init() {
 
-        final LegacyWindow mainWin = new LegacyWindow(getClass()
-                .getSimpleName());
+        final LegacyWindow mainWin = new LegacyWindow(
+                getClass().getSimpleName());
         setMainWindow(mainWin);
 
         VerticalLayout lo = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java
index 6437a1f514..99341b8f7e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java
@@ -19,8 +19,8 @@ public class Ticket2411 extends LegacyApplication {
         l.setHeight("504px");
 
         for (int i = 1; i <= 5; i++) {
-            Button b = new Button("Button " + i
-                    + " should be 100px or 101px high");
+            Button b = new Button(
+                    "Button " + i + " should be 100px or 101px high");
             b.setHeight("100%");
             l.addComponent(b);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java
index a80a8464b6..33ce9fe509 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java
@@ -14,14 +14,15 @@ public class Ticket2426 extends LegacyApplication {
 
         final String content = "<select/>";
 
-        w.addComponent(new Label("CONTENT_DEFAULT: " + content,
-                ContentMode.TEXT));
+        w.addComponent(
+                new Label("CONTENT_DEFAULT: " + content, ContentMode.TEXT));
         w.addComponent(new Label("CONTENT_PREFORMATTED: " + content,
                 ContentMode.PREFORMATTED));
         w.addComponent(new Label("CONTENT_RAW: " + content, ContentMode.RAW));
         w.addComponent(new Label("CONTENT_TEXT: " + content, ContentMode.TEXT));
         w.addComponent(new Label("CONTENT_XML: " + content, ContentMode.XML));
-        w.addComponent(new Label("CONTENT_XHTML: " + content, ContentMode.HTML));
+        w.addComponent(
+                new Label("CONTENT_XHTML: " + content, ContentMode.HTML));
 
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java
index 3228dc87ed..66a0f31d13 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java
@@ -36,7 +36,8 @@ public class Ticket2431 extends LegacyApplication {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 if (action == a1) {
                     getMainWindow().addComponent(new Label("CTRL X hit"));
                 } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
index e733845aad..c7b44f3802 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
@@ -50,8 +50,8 @@ public class Ticket34 extends LegacyApplication {
     private void setView(String string) {
         Component component = views.get(string);
         if (component == null) {
-            getMainWindow().showNotification(
-                    "View called " + string + " not found!");
+            getMainWindow()
+                    .showNotification("View called " + string + " not found!");
         } else if (component != currentView) {
             if (currentView != null) {
                 mainLayout.replaceComponent(currentView, component);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java
index f09fb955a1..f85d1b465e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java
@@ -14,15 +14,9 @@ public class Ticket5952 extends LegacyApplication {
         setMainWindow(mainWindow);
 
         String mathml = "<math mode='display' xmlns='http://www.w3.org/1998/Math/MathML'>"
-                + "<mrow>"
-                + "    <msup>"
-                + "      <mi>x</mi>"
-                + "      <mn>2</mn>"
-                + "    </msup>"
-                + "    <msup>"
-                + "      <mi>c</mi>"
-                + "      <mn>2</mn>"
-                + "    </msup>"
+                + "<mrow>" + "    <msup>" + "      <mi>x</mi>"
+                + "      <mn>2</mn>" + "    </msup>" + "    <msup>"
+                + "      <mi>c</mi>" + "      <mn>2</mn>" + "    </msup>"
                 + "  </mrow>" + "</math>";
         Label mathLabel = new Label(mathml, ContentMode.XML);
         mainWindow.addComponent(mathLabel);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
index a15603a5ba..857e855569 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
@@ -18,8 +18,8 @@ public class Ticket6002 extends TestBase {
         final VerticalLayout mainLayout = new VerticalLayout();
         main.setContent(mainLayout);
 
-        mainLayout.addComponent(new Label(
-                "Replace the floating-point values with an integer"));
+        mainLayout.addComponent(
+                new Label("Replace the floating-point values with an integer"));
 
         // ///////////////////////////////////////////////////
         // Better working case
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java
index d5ae9bb09f..5d3fb05b3d 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java
@@ -32,7 +32,8 @@ public class Ticket695 extends LegacyApplication {
                             + (System.currentTimeMillis() - t) + "ms");
                 } catch (IOException e) {
                     e.printStackTrace();
-                    w.showNotification("ApplicationContext serialization failed - see console for stacktrace");
+                    w.showNotification(
+                            "ApplicationContext serialization failed - see console for stacktrace");
                 }
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
index 606a773141..956d05518b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
@@ -36,8 +36,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI {
         l.setWidth("400px");
         l.setHeight("100px");
         dragAndDropWrapper = new DragAndDropWrapper(cssLayout);
-        dragAndDropWrapper
-                .setDescription("Tooltip for the wrapper wrapping all the draggable layouts");
+        dragAndDropWrapper.setDescription(
+                "Tooltip for the wrapper wrapping all the draggable layouts");
         dragAndDropWrapper.setSizeFull();
         l.addComponent(dragAndDropWrapper);
 
@@ -104,8 +104,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI {
                         }
                         next = componentIterator.next();
                     }
-                    if (dropTargetData.getData("horizontalLocation").equals(
-                            "LEFT")) {
+                    if (dropTargetData.getData("horizontalLocation")
+                            .equals("LEFT")) {
                         index--;
                         if (index < 0) {
                             index = 0;
@@ -115,8 +115,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI {
                     cssLayout.removeComponent(sourceComponent);
                     cssLayout.addComponent(sourceComponent, index);
 
-                    dragAndDropWrapper
-                            .setDescription("Drag was performed and tooltip was changed");
+                    dragAndDropWrapper.setDescription(
+                            "Drag was performed and tooltip was changed");
                 }
             }
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java
index ff470336f5..356d431efe 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java
@@ -13,10 +13,12 @@ public class MenuBarTooltip extends AbstractTestUI {
         MenuBar.MenuItem menuitem = menubar.addItem("Menu item", null, null);
         menuitem.setDescription("Menu item description");
 
-        MenuBar.MenuItem submenuitem1 = menuitem.addItem("Submenu item 1", null, null);
+        MenuBar.MenuItem submenuitem1 = menuitem.addItem("Submenu item 1", null,
+                null);
         submenuitem1.setDescription("Submenu item 1 description");
 
-        MenuBar.MenuItem submenuitem2 = menuitem.addItem("Submenu item 2", null, null);
+        MenuBar.MenuItem submenuitem2 = menuitem.addItem("Submenu item 2", null,
+                null);
         submenuitem2.setDescription("Submenu item 2 description");
 
         addComponent(menubar);
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
index 0a63744caf..7655a5192c 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
@@ -23,7 +23,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog {
         componentWithShortTooltip.setDescription("This is a short tooltip");
         componentWithShortTooltip.setId("shortTooltip");
 
-        NativeButton componentWithLongTooltip = new NativeButton("Long tooltip");
+        NativeButton componentWithLongTooltip = new NativeButton(
+                "Long tooltip");
         componentWithLongTooltip.setId("longTooltip");
         componentWithLongTooltip.setDescription(LoremIpsum.get(5000));
 
@@ -68,8 +69,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
                         if (quickOpenDelay.getConvertedValue() != null) {
-                            getTooltipConfiguration().setQuickOpenDelay(
-                                    (Integer) quickOpenDelay
+                            getTooltipConfiguration()
+                                    .setQuickOpenDelay((Integer) quickOpenDelay
                                             .getConvertedValue());
                         }
                     }
@@ -97,7 +98,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog {
 
     }
 
-    private LegacyTextField createIntegerTextField(String caption, int initialValue) {
+    private LegacyTextField createIntegerTextField(String caption,
+            int initialValue) {
         LegacyTextField tf = new LegacyTextField(caption);
         tf.setId(caption);
         tf.setConverter(Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
index c1f9c3a450..24c6487d0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
@@ -30,7 +30,8 @@ public class TooltipWidthUpdating extends AbstractTestUI {
         getTooltipConfiguration().setMaxWidth(MAX_WIDTH);
         getTooltipConfiguration().setCloseTimeout(200);
 
-        NativeButton componentWithLongTooltip = new NativeButton("Long tooltip");
+        NativeButton componentWithLongTooltip = new NativeButton(
+                "Long tooltip");
         componentWithLongTooltip.setId("longTooltip");
         componentWithLongTooltip.setDescription(LONG_TOOLTIP_TEXT);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
index 9cd2929ca6..b808a3d973 100644
--- a/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
@@ -52,7 +52,8 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog {
         return new UriFragmentChangedListener() {
 
             @Override
-            public void uriFragmentChanged(final UriFragmentChangedEvent event) {
+            public void uriFragmentChanged(
+                    final UriFragmentChangedEvent event) {
 
                 log(String.format("uriFragmentChanged %s",
                         event.getUriFragment()));
@@ -81,8 +82,8 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog {
 
                 createThread(frag, fragLabel).start();
 
-                fragLabel.setCaption(String.format("Thread running for %s!",
-                        frag));
+                fragLabel.setCaption(
+                        String.format("Thread running for %s!", frag));
                 UI.getCurrent().setPollInterval(1000);
             }
         };
@@ -113,9 +114,9 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog {
                                 "setCaption in synch mode for fragment %s",
                                 frag));
                         java.util.Random rand = new java.util.Random();
-                        fragLabel.setCaption(String.format(
-                                "Thread finished on %s (%s)", frag,
-                                rand.nextInt()));
+                        fragLabel.setCaption(
+                                String.format("Thread finished on %s (%s)",
+                                        frag, rand.nextInt()));
                     }
                 });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
index ca3c2a6a86..5327eb7d27 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
@@ -27,7 +27,8 @@ public class CheckBoxWithPropertyDataSource extends CheckBox {
 
     public void validate() {
         if (isRequired() && !getValue()) {
-            throw new InvalidValueException("Required CheckBox should be checked");
+            throw new InvalidValueException(
+                    "Required CheckBox should be checked");
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
index a6430ec0c2..8a925e9842 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
@@ -12,8 +12,8 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractContainer;
 import com.vaadin.data.util.ObjectProperty;
 
-public class LargeContainer extends AbstractContainer implements
-        Container.Indexed {
+public class LargeContainer extends AbstractContainer
+        implements Container.Indexed {
 
     public class TestItem implements Item {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
index 709086be29..2f0e4f0d6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
@@ -6,15 +6,15 @@ import java.util.Random;
 import com.vaadin.data.util.BeanItemContainer;
 
 @SuppressWarnings("serial")
-public class PersonContainer extends BeanItemContainer<Person> implements
-        Serializable {
+public class PersonContainer extends BeanItemContainer<Person>
+        implements Serializable {
 
     /**
      * Natural property order for Person bean. Used in tables and forms.
      */
-    public static final Object[] NATURAL_COL_ORDER = new Object[] {
-            "firstName", "lastName", "email", "phoneNumber",
-            "address.streetAddress", "address.postalCode", "address.city" };
+    public static final Object[] NATURAL_COL_ORDER = new Object[] { "firstName",
+            "lastName", "email", "phoneNumber", "address.streetAddress",
+            "address.postalCode", "address.city" };
 
     /**
      * "Human readable" captions for properties in same order as in
@@ -49,8 +49,8 @@ public class PersonContainer extends BeanItemContainer<Person> implements
             p.setPhoneNumber(TestDataGenerator.getPhoneNumber(r));
 
             p.getAddress().setPostalCode(TestDataGenerator.getPostalCode(r));
-            p.getAddress().setStreetAddress(
-                    TestDataGenerator.getStreetAddress(r));
+            p.getAddress()
+                    .setStreetAddress(TestDataGenerator.getStreetAddress(r));
             c.addItem(p);
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
index 679baa0d26..a18eb6f6ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.VerticalLayout;
 public class ResizeTerrorizer extends VerticalLayout {
     private final ResizeTerrorizerControl control;
 
-    public class ResizeTerrorizerControl extends AbstractComponent implements
-            Component {
+    public class ResizeTerrorizerControl extends AbstractComponent
+            implements Component {
 
         public ResizeTerrorizerControl(Component target) {
             getState().target = target;
diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
index a4829334a5..1a83fbe1c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
@@ -43,7 +43,8 @@ public class SampleDirectory {
      * @param application
      * @return file pointing to sample directory
      */
-    public static File getDirectory(VaadinSession application, LegacyWindow uI) {
+    public static File getDirectory(VaadinSession application,
+            LegacyWindow uI) {
         String errorMessage = "Access to application "
                 + "context base directory failed, "
                 + "possible security constraint with Application "
@@ -82,8 +83,8 @@ public class SampleDirectory {
         final Panel errorPanel = new Panel("Demo application error",
                 errorLayout);
         errorPanel.setStyleName("strong");
-        errorPanel.setComponentError(new SystemError(
-                "Cannot provide sample directory"));
+        errorPanel.setComponentError(
+                new SystemError("Cannot provide sample directory"));
         errorLayout.addComponent(new Label(errorMessage, ContentMode.HTML));
         // Remove all components from applications main window
         uI.removeAllComponents();
diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
index 8becb709f0..d356670a0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
@@ -29,8 +29,8 @@ public class TestDataGenerator {
             "Olivia", "Nina", "Alex", "Rita", "Dan", "Umberto", "Henrik",
             "Rene", "Lisa", "Marge" };
     final static String[] lnames = { "Smith", "Gordon", "Simpson", "Brown",
-            "Clavel", "Simons", "Verne", "Scott", "Allison", "Gates",
-            "Rowling", "Barks", "Ross", "Schneider", "Tate" };
+            "Clavel", "Simons", "Verne", "Scott", "Allison", "Gates", "Rowling",
+            "Barks", "Ross", "Schneider", "Tate" };
     final static String cities[] = { "Amsterdam", "Berlin", "Helsinki",
             "Hong Kong", "London", "Luxemburg", "New York", "Oslo", "Paris",
             "Rome", "Stockholm", "Tokyo", "Turku" };
diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
index 5c6315a23a..93139a8d98 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
@@ -13,21 +13,21 @@ public class TestUtils {
 
     private static final String[] iso3166 = new String[] { "AFGHANISTAN", "AF",
             "ÅLAND ISLANDS", "AX", "ALBANIA", "AL", "ALGERIA", "DZ",
-            "AMERICAN SAMOA", "AS", "ANDORRA", "AD", "ANGOLA", "AO",
-            "ANGUILLA", "AI", "ANTARCTICA", "AQ", "ANTIGUA AND BARBUDA", "AG",
-            "ARGENTINA", "AR", "ARMENIA", "AM", "ARUBA", "AW", "AUSTRALIA",
-            "AU", "AUSTRIA", "AT", "AZERBAIJAN", "AZ", "BAHAMAS", "BS",
-            "BAHRAIN", "BH", "BANGLADESH", "BD", "BARBADOS", "BB", "BELARUS",
-            "BY", "BELGIUM", "BE", "BELIZE", "BZ", "BENIN", "BJ", "BERMUDA",
-            "BM", "BHUTAN", "BT", "BOLIVIA", "BO", "BOSNIA AND HERZEGOVINA",
-            "BA", "BOTSWANA", "BW", "BOUVET ISLAND", "BV", "BRAZIL", "BR",
+            "AMERICAN SAMOA", "AS", "ANDORRA", "AD", "ANGOLA", "AO", "ANGUILLA",
+            "AI", "ANTARCTICA", "AQ", "ANTIGUA AND BARBUDA", "AG", "ARGENTINA",
+            "AR", "ARMENIA", "AM", "ARUBA", "AW", "AUSTRALIA", "AU", "AUSTRIA",
+            "AT", "AZERBAIJAN", "AZ", "BAHAMAS", "BS", "BAHRAIN", "BH",
+            "BANGLADESH", "BD", "BARBADOS", "BB", "BELARUS", "BY", "BELGIUM",
+            "BE", "BELIZE", "BZ", "BENIN", "BJ", "BERMUDA", "BM", "BHUTAN",
+            "BT", "BOLIVIA", "BO", "BOSNIA AND HERZEGOVINA", "BA", "BOTSWANA",
+            "BW", "BOUVET ISLAND", "BV", "BRAZIL", "BR",
             "BRITISH INDIAN OCEAN TERRITORY", "IO", "BRUNEI DARUSSALAM", "BN",
-            "BULGARIA", "BG", "BURKINA FASO", "BF", "BURUNDI", "BI",
-            "CAMBODIA", "KH", "CAMEROON", "CM", "CANADA", "CA", "CAPE VERDE",
-            "CV", "CAYMAN ISLANDS", "KY", "CENTRAL AFRICAN REPUBLIC", "CF",
-            "CHAD", "TD", "CHILE", "CL", "CHINA", "CN", "CHRISTMAS ISLAND",
-            "CX", "COCOS (KEELING) ISLANDS", "CC", "COLOMBIA", "CO", "COMOROS",
-            "KM", "CONGO", "CG", "CONGO, THE DEMOCRATIC REPUBLIC OF THE", "CD",
+            "BULGARIA", "BG", "BURKINA FASO", "BF", "BURUNDI", "BI", "CAMBODIA",
+            "KH", "CAMEROON", "CM", "CANADA", "CA", "CAPE VERDE", "CV",
+            "CAYMAN ISLANDS", "KY", "CENTRAL AFRICAN REPUBLIC", "CF", "CHAD",
+            "TD", "CHILE", "CL", "CHINA", "CN", "CHRISTMAS ISLAND", "CX",
+            "COCOS (KEELING) ISLANDS", "CC", "COLOMBIA", "CO", "COMOROS", "KM",
+            "CONGO", "CG", "CONGO, THE DEMOCRATIC REPUBLIC OF THE", "CD",
             "COOK ISLANDS", "CK", "COSTA RICA", "CR", "CÔTE D'IVOIRE", "CI",
             "CROATIA", "HR", "CUBA", "CU", "CYPRUS", "CY", "CZECH REPUBLIC",
             "CZ", "DENMARK", "DK", "DJIBOUTI", "DJ", "DOMINICA", "DM",
@@ -45,28 +45,27 @@ public class TestUtils {
             "HOLY SEE (VATICAN CITY STATE)", "VA", "HONDURAS", "HN",
             "HONG KONG", "HK", "HUNGARY", "HU", "ICELAND", "IS", "INDIA", "IN",
             "INDONESIA", "ID", "IRAN, ISLAMIC REPUBLIC OF", "IR", "IRAQ", "IQ",
-            "IRELAND", "IE", "ISLE OF MAN", "IM", "ISRAEL", "IL", "ITALY",
-            "IT", "JAMAICA", "JM", "JAPAN", "JP", "JERSEY", "JE", "JORDAN",
-            "JO", "KAZAKHSTAN", "KZ", "KENYA", "KE", "KIRIBATI", "KI",
+            "IRELAND", "IE", "ISLE OF MAN", "IM", "ISRAEL", "IL", "ITALY", "IT",
+            "JAMAICA", "JM", "JAPAN", "JP", "JERSEY", "JE", "JORDAN", "JO",
+            "KAZAKHSTAN", "KZ", "KENYA", "KE", "KIRIBATI", "KI",
             "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", "KP",
             "KOREA, REPUBLIC OF", "KR", "KUWAIT", "KW", "KYRGYZSTAN", "KG",
-            "LAO PEOPLE'S DEMOCRATIC REPUBLIC", "LA", "LATVIA", "LV",
-            "LEBANON", "LB", "LESOTHO", "LS", "LIBERIA", "LR",
-            "LIBYAN ARAB JAMAHIRIYA", "LY", "LIECHTENSTEIN", "LI", "LITHUANIA",
-            "LT", "LUXEMBOURG", "LU", "MACAO", "MO",
-            "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "MK", "MADAGASCAR",
-            "MG", "MALAWI", "MW", "MALAYSIA", "MY", "MALDIVES", "MV", "MALI",
-            "ML", "MALTA", "MT", "MARSHALL ISLANDS", "MH", "MARTINIQUE", "MQ",
-            "MAURITANIA", "MR", "MAURITIUS", "MU", "MAYOTTE", "YT", "MEXICO",
-            "MX", "MICRONESIA, FEDERATED STATES OF", "FM",
-            "MOLDOVA, REPUBLIC OF", "MD", "MONACO", "MC", "MONGOLIA", "MN",
-            "MONTENEGRO", "ME", "MONTSERRAT", "MS", "MOROCCO", "MA",
-            "MOZAMBIQUE", "MZ", "MYANMAR", "MM", "NAMIBIA", "NA", "NAURU",
-            "NR", "NEPAL", "NP", "NETHERLANDS", "NL", "NETHERLANDS ANTILLES",
-            "AN", "NEW CALEDONIA", "NC", "NEW ZEALAND", "NZ", "NICARAGUA",
-            "NI", "NIGER", "NE", "NIGERIA", "NG", "NIUE", "NU",
-            "NORFOLK ISLAND", "NF", "NORTHERN MARIANA ISLANDS", "MP", "NORWAY",
-            "NO", "OMAN", "OM", "PAKISTAN", "PK", "PALAU", "PW",
+            "LAO PEOPLE'S DEMOCRATIC REPUBLIC", "LA", "LATVIA", "LV", "LEBANON",
+            "LB", "LESOTHO", "LS", "LIBERIA", "LR", "LIBYAN ARAB JAMAHIRIYA",
+            "LY", "LIECHTENSTEIN", "LI", "LITHUANIA", "LT", "LUXEMBOURG", "LU",
+            "MACAO", "MO", "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "MK",
+            "MADAGASCAR", "MG", "MALAWI", "MW", "MALAYSIA", "MY", "MALDIVES",
+            "MV", "MALI", "ML", "MALTA", "MT", "MARSHALL ISLANDS", "MH",
+            "MARTINIQUE", "MQ", "MAURITANIA", "MR", "MAURITIUS", "MU",
+            "MAYOTTE", "YT", "MEXICO", "MX", "MICRONESIA, FEDERATED STATES OF",
+            "FM", "MOLDOVA, REPUBLIC OF", "MD", "MONACO", "MC", "MONGOLIA",
+            "MN", "MONTENEGRO", "ME", "MONTSERRAT", "MS", "MOROCCO", "MA",
+            "MOZAMBIQUE", "MZ", "MYANMAR", "MM", "NAMIBIA", "NA", "NAURU", "NR",
+            "NEPAL", "NP", "NETHERLANDS", "NL", "NETHERLANDS ANTILLES", "AN",
+            "NEW CALEDONIA", "NC", "NEW ZEALAND", "NZ", "NICARAGUA", "NI",
+            "NIGER", "NE", "NIGERIA", "NG", "NIUE", "NU", "NORFOLK ISLAND",
+            "NF", "NORTHERN MARIANA ISLANDS", "MP", "NORWAY", "NO", "OMAN",
+            "OM", "PAKISTAN", "PK", "PALAU", "PW",
             "PALESTINIAN TERRITORY, OCCUPIED", "PS", "PANAMA", "PA",
             "PAPUA NEW GUINEA", "PG", "PARAGUAY", "PY", "PERU", "PE",
             "PHILIPPINES", "PH", "PITCAIRN", "PN", "POLAND", "PL", "PORTUGAL",
@@ -81,8 +80,8 @@ public class TestUtils {
             "SIERRA LEONE", "SL", "SINGAPORE", "SG", "SLOVAKIA", "SK",
             "SLOVENIA", "SI", "SOLOMON ISLANDS", "SB", "SOMALIA", "SO",
             "SOUTH AFRICA", "ZA",
-            "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", "GS", "SPAIN",
-            "ES", "SRI LANKA", "LK", "SUDAN", "SD", "SURINAME", "SR",
+            "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", "GS", "SPAIN", "ES",
+            "SRI LANKA", "LK", "SUDAN", "SD", "SURINAME", "SR",
             "SVALBARD AND JAN MAYEN", "SJ", "SWAZILAND", "SZ", "SWEDEN", "SE",
             "SWITZERLAND", "CH", "SYRIAN ARAB REPUBLIC", "SY",
             "TAIWAN, PROVINCE OF CHINA", "TW", "TAJIKISTAN", "TJ",
@@ -90,13 +89,13 @@ public class TestUtils {
             "TIMOR-LESTE", "TL", "TOGO", "TG", "TOKELAU", "TK", "TONGA", "TO",
             "TRINIDAD AND TOBAGO", "TT", "TUNISIA", "TN", "TURKEY", "TR",
             "TURKMENISTAN", "TM", "TURKS AND CAICOS ISLANDS", "TC", "TUVALU",
-            "TV", "UGANDA", "UG", "UKRAINE", "UA", "UNITED ARAB EMIRATES",
-            "AE", "UNITED KINGDOM", "GB", "UNITED STATES", "US",
+            "TV", "UGANDA", "UG", "UKRAINE", "UA", "UNITED ARAB EMIRATES", "AE",
+            "UNITED KINGDOM", "GB", "UNITED STATES", "US",
             "UNITED STATES MINOR OUTLYING ISLANDS", "UM", "URUGUAY", "UY",
             "UZBEKISTAN", "UZ", "VANUATU", "VU", "VENEZUELA", "VE", "VIET NAM",
-            "VN", "VIRGIN ISLANDS, BRITISH", "VG", "VIRGIN ISLANDS, U.S.",
-            "VI", "WALLIS AND FUTUNA", "WF", "WESTERN SAHARA", "EH", "YEMEN",
-            "YE", "ZAMBIA", "ZM", "ZIMBABWE", "ZW" };
+            "VN", "VIRGIN ISLANDS, BRITISH", "VG", "VIRGIN ISLANDS, U.S.", "VI",
+            "WALLIS AND FUTUNA", "WF", "WESTERN SAHARA", "EH", "YEMEN", "YE",
+            "ZAMBIA", "ZM", "ZIMBABWE", "ZW" };
 
     /**
      * Crossbrowser hack to dynamically add css current window. Can be used to
@@ -106,8 +105,7 @@ public class TestUtils {
      */
     public static void injectCSS(UI w, String cssString) {
         String script = "if ('\\v'=='v') /* ie only */ {\n"
-                + "        document.createStyleSheet().cssText = '"
-                + cssString
+                + "        document.createStyleSheet().cssText = '" + cssString
                 + "';\n"
                 + "    } else {var tag = document.createElement('style'); tag.type = 'text/css';"
                 + " document.getElementsByTagName('head')[0].appendChild(tag);tag[ (typeof "
@@ -133,10 +131,9 @@ public class TestUtils {
 
     public static void reportPerformance(String topic, int serverLimit,
             int clientLimit, boolean bootstrapTime) {
-        JavaScript
-                .eval("window.reportVaadinPerformance(\"" + topic + "\", "
-                        + serverLimit + ", " + clientLimit + ","
-                        + bootstrapTime + ");");
+        JavaScript.eval("window.reportVaadinPerformance(\"" + topic + "\", "
+                + serverLimit + ", " + clientLimit + "," + bootstrapTime
+                + ");");
     }
 
     public static IndexedContainer getISO3166Container() {
diff --git a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
index 3849268bf7..74da947f40 100644
--- a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
@@ -47,7 +47,8 @@ public class BootstrapModifyUI extends AbstractTestUI {
                     }
                 });
         addComponent(c);
-        c.setEnabled(getSession().getAttribute(INSTALLED_ATRIBUTE_NAME) == null);
+        c.setEnabled(
+                getSession().getAttribute(INSTALLED_ATRIBUTE_NAME) == null);
     }
 
     private static BootstrapListener createBootstrapListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java
index 0d6a1292e2..42d6c5581d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java
@@ -31,8 +31,7 @@ public class ComplexTestBean extends SharedState {
         // Default
     }
 
-    public ComplexTestBean(SimpleTestBean innerBean1,
-            SimpleTestBean innerBean2,
+    public ComplexTestBean(SimpleTestBean innerBean1, SimpleTestBean innerBean2,
             List<SimpleTestBean> innerBeanCollection, int privimite) {
         this.innerBean1 = innerBean1;
         this.innerBean2 = innerBean2;
@@ -60,7 +59,8 @@ public class ComplexTestBean extends SharedState {
         return innerBeanCollection;
     }
 
-    public void setInnerBeanCollection(List<SimpleTestBean> innerBeanCollection) {
+    public void setInnerBeanCollection(
+            List<SimpleTestBean> innerBeanCollection) {
         this.innerBeanCollection = innerBeanCollection;
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
index f2e9710404..32c0e1a618 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
@@ -51,11 +51,9 @@ public class EncoderResultDisplayConnector extends AbstractExtensionConnector {
         reportEncode(Double.valueOf("2.2"));
 
         reportEncode(new String[] { "One", "Two" });
-        reportEncode(
-                "List",
-                Arrays.asList("Three", "Four"),
-                new Type(List.class.getName(), new Type[] { TypeData
-                        .getType(String.class) }));
+        reportEncode("List", Arrays.asList("Three", "Four"),
+                new Type(List.class.getName(),
+                        new Type[] { TypeData.getType(String.class) }));
         reportEncode(new SimpleTestBean(5));
 
         reportEncode(Void.class.getSimpleName(), null,
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
index 7f2b5a9a93..97f7c0df79 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
@@ -24,8 +24,7 @@ public class IntermediateReplaceConnector extends ReplacedConnector {
     @Override
     protected void init() {
         super.init();
-        getWidget().setHTML(
-                IntermediateReplaceConnector.class.getName()
-                        + ", should not be used");
+        getWidget().setHTML(IntermediateReplaceConnector.class.getName()
+                + ", should not be used");
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
index e999c83b75..099b169f96 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
@@ -53,9 +53,8 @@ public class LayoutDetectorConnector extends AbstractComponentConnector
     }
 
     private void updateText() {
-        getWidget().setHTML(
-                "Layout count: <span id='layoutCount'>" + layoutCount
-                        + "</span><br />RPC count: <span id='rpcCount'>"
-                        + rpcCount + "</span>");
+        getWidget().setHTML("Layout count: <span id='layoutCount'>"
+                + layoutCount + "</span><br />RPC count: <span id='rpcCount'>"
+                + rpcCount + "</span>");
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
index 799fe9ebee..13204c8cd6 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
@@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.LayoutDuringStateUpdateComponent;
 
 @Connect(LayoutDuringStateUpdateComponent.class)
-public class LayoutDuringStateUpdateConnector extends
-        AbstractComponentConnector implements PostLayoutListener {
+public class LayoutDuringStateUpdateConnector extends AbstractComponentConnector
+        implements PostLayoutListener {
     private int layoutCount = 0;
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
index 718706da97..bd3dbf7d69 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
@@ -24,8 +24,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.extensions.LayoutMemoryUsageIE8Extension;
 
 @Connect(LayoutMemoryUsageIE8Extension.class)
-public class LayoutMemoryUsageIE8ExtensionConnector extends
-        AbstractExtensionConnector {
+public class LayoutMemoryUsageIE8ExtensionConnector
+        extends AbstractExtensionConnector {
 
     @Override
     protected void extend(ServerConnector target) {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
index 5fdec05970..63585a6bb3 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
@@ -21,8 +21,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
 @Connect(MissingFromDefaultWidgetsetComponent.class)
-public class MissingFromDefaultWidgetsetConnector extends
-        AbstractComponentConnector {
+public class MissingFromDefaultWidgetsetConnector
+        extends AbstractComponentConnector {
     @Override
     public VLabel getWidget() {
         return (VLabel) super.getWidget();
@@ -30,9 +30,8 @@ public class MissingFromDefaultWidgetsetConnector extends
 
     @Override
     protected void init() {
-        getWidget()
-                .setText(
-                        "This component is available in TestingWidgetset, but not in DefaultWidgetset");
+        getWidget().setText(
+                "This component is available in TestingWidgetset, but not in DefaultWidgetset");
         super.init();
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
index 8237d75c6c..b4ba3625c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
@@ -41,8 +41,7 @@ public class MockApplicationConnection extends ApplicationConnection {
 
     @Override
     public MockServerCommunicationHandler getMessageSender() {
-        return (MockServerCommunicationHandler) super
-                .getMessageSender();
+        return (MockServerCommunicationHandler) super.getMessageSender();
     }
 
     /**
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
index d3a0c78948..1e2ade8313 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
@@ -42,8 +42,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.util.ResizeTerrorizer;
 
 @Connect(ResizeTerrorizer.ResizeTerrorizerControl.class)
-public class ResizeTerrorizerControlConnector extends
-        AbstractComponentConnector implements PostLayoutListener {
+public class ResizeTerrorizerControlConnector extends AbstractComponentConnector
+        implements PostLayoutListener {
 
     public static class ResizeTerorrizerState extends AbstractComponentState {
         public Connector target;
@@ -131,8 +131,8 @@ public class ResizeTerrorizerControlConnector extends
                 updateFromHistoryToken(History.getToken());
 
                 // Then add history change listener
-                historyHandlerRegistration = History
-                        .addValueChangeHandler(new ValueChangeHandler<String>() {
+                historyHandlerRegistration = History.addValueChangeHandler(
+                        new ValueChangeHandler<String>() {
                             @Override
                             public void onValueChange(
                                     ValueChangeEvent<String> event) {
@@ -202,11 +202,11 @@ public class ResizeTerrorizerControlConnector extends
 
                 double progress = time / duration;
 
-                double widthToSet = startWidth + (endWidth - startWidth)
-                        * progress;
+                double widthToSet = startWidth
+                        + (endWidth - startWidth) * progress;
 
-                double heightToSet = startHeight + (endHeight - startHeight)
-                        * progress;
+                double heightToSet = startHeight
+                        + (endHeight - startHeight) * progress;
 
                 if (widthToSet != startWidth) {
                     target.getWidget().setWidth(widthToSet + "px");
@@ -264,8 +264,8 @@ public class ResizeTerrorizerControlConnector extends
         if (getWidget().startHeight.getValue() == null) {
             int height = getTarget().getWidget().getElement().getOffsetHeight();
             getWidget().startHeight.setValue(height);
-            getWidget().endHeight.setValue(height
-                    + getState().defaultHeightOffset);
+            getWidget().endHeight
+                    .setValue(height + getState().defaultHeightOffset);
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
index a6789ebaf6..4255e2fb6d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
@@ -21,8 +21,8 @@ import com.vaadin.tests.components.customlayout.OverflowAutoFix;
 
 @SuppressWarnings("deprecation")
 @Connect(OverflowAutoFix.RunOverflowFix.class)
-public class RunOverflowFixConnector extends
-        AbstractComponentContainerConnector {
+public class RunOverflowFixConnector
+        extends AbstractComponentContainerConnector {
 
     private static final String CONTENT1 = "Overflow:<br>Fix1 (scroll): Both scrollbars should be shown<br>Fix2 (visible): no scrollbars should be shown";
     private static final String CONTENT2 = "OverflowX:<br>Fix1 (hidden): Horizontal scrollbar should be hidden, vertical shown<br>Fix2 (scroll): Both scrollbars should be shown";
@@ -46,18 +46,18 @@ public class RunOverflowFixConnector extends
                     public void onClick(ClickEvent event) {
                         overflow.getElement().getStyle()
                                 .setOverflow(Style.Overflow.SCROLL);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflow
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflow.getElement());
 
                         overflowX.getElement().getStyle()
                                 .setOverflowX(Style.Overflow.HIDDEN);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflowX
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflowX.getElement());
 
                         overflowY.getElement().getStyle()
                                 .setOverflowY(Style.Overflow.HIDDEN);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflowY
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflowY.getElement());
                     }
                 });
         runFix.addStyleName("run-button-one");
@@ -69,18 +69,18 @@ public class RunOverflowFixConnector extends
                     public void onClick(ClickEvent event) {
                         overflow.getElement().getStyle()
                                 .setOverflow(Style.Overflow.VISIBLE);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflow
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflow.getElement());
 
                         overflowX.getElement().getStyle()
                                 .setOverflowX(Style.Overflow.SCROLL);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflowX
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflowX.getElement());
 
                         overflowY.getElement().getStyle()
                                 .setOverflowY(Style.Overflow.AUTO);
-                        WidgetUtil.runWebkitOverflowAutoFix(overflowY
-                                .getElement());
+                        WidgetUtil.runWebkitOverflowAutoFix(
+                                overflowY.getElement());
                     }
                 });
         runFix2.addStyleName("run-button-two");
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
index d6431ac9f9..60a5723c3b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
@@ -26,7 +26,8 @@ import com.vaadin.tests.widgetset.server.ScrollableGridLayout;
 public class ScrollableGridLayoutConnector extends GridLayoutConnector
         implements MayScrollChildren {
     @Override
-    public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent event) {
         super.onConnectorHierarchyChange(event);
 
         for (VGridLayout.Cell cell : getWidget().widgetToCell.values()) {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
index 124b1b5600..08fba91643 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
@@ -56,14 +56,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
 
                 SimpleTestBean firstValue = generics.values().iterator().next()
                         .get(Integer.valueOf(1)).get(0);
-                Set<SimpleTestBean> key = new HashSet<SimpleTestBean>(Arrays
-                        .asList(firstValue));
+                Set<SimpleTestBean> key = new HashSet<SimpleTestBean>(
+                        Arrays.asList(firstValue));
 
                 Map<Integer, List<SimpleTestBean>> value = new HashMap<Integer, List<SimpleTestBean>>();
-                Set<SimpleTestBean> firstKeyValue = generics.keySet()
-                        .iterator().next();
-                value.put(Integer.valueOf(1), new ArrayList<SimpleTestBean>(
-                        firstKeyValue));
+                Set<SimpleTestBean> firstKeyValue = generics.keySet().iterator()
+                        .next();
+                value.put(Integer.valueOf(1),
+                        new ArrayList<SimpleTestBean>(firstKeyValue));
 
                 updated.put(key, value);
 
@@ -74,8 +74,8 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             public void sendString(String value, String[] array) {
                 char[] chars = value.toCharArray();
                 Arrays.sort(chars);
-                rpc.sendString(new String(chars), new String[] { array[1],
-                        array[0] });
+                rpc.sendString(new String(chars),
+                        new String[] { array[1], array[0] });
             }
 
             @Override
@@ -95,9 +95,11 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             @Override
             public void sendNestedArray(int[][] nestedIntArray,
                     SimpleTestBean[][] nestedBeanArray) {
-                rpc.sendNestedArray(new int[][] { { nestedIntArray[1][0],
-                        nestedIntArray[0][0] } }, new SimpleTestBean[][] {
-                        { nestedBeanArray[0][1] }, { nestedBeanArray[0][0] } });
+                rpc.sendNestedArray(
+                        new int[][] { { nestedIntArray[1][0],
+                                nestedIntArray[0][0] } },
+                        new SimpleTestBean[][] { { nestedBeanArray[0][1] },
+                                { nestedBeanArray[0][0] } });
             }
 
             @Override
@@ -116,18 +118,20 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
                                 connectorMap.get(getUIConnector())),
                         Collections.singletonMap(
                                 Integer.valueOf(stringMap.size()),
-                                getThisConnector()), updatedBeanMap);
+                                getThisConnector()),
+                        updatedBeanMap);
             }
 
             @Override
             public void sendLong(long value, Long boxedValue, long[] array) {
-                rpc.sendLong(array[0], Long.valueOf(value), new long[] {
-                        array[1], boxedValue.longValue() });
+                rpc.sendLong(array[0], Long.valueOf(value),
+                        new long[] { array[1], boxedValue.longValue() });
             }
 
             @Override
             public void sendList(List<Integer> intList,
-                    List<Connector> connectorList, List<SimpleTestBean> beanList) {
+                    List<Connector> connectorList,
+                    List<SimpleTestBean> beanList) {
                 Collections.sort(intList);
                 Collections.reverse(beanList);
                 rpc.sendList(intList,
@@ -137,12 +141,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
 
             @Override
             public void sendInt(int value, Integer boxedValue, int[] array) {
-                rpc.sendInt(array.length, Integer.valueOf(array[0]), new int[] {
-                        value, boxedValue.intValue() });
+                rpc.sendInt(array.length, Integer.valueOf(array[0]),
+                        new int[] { value, boxedValue.intValue() });
             }
 
             @Override
-            public void sendFloat(float value, Float boxedValue, float[] array) {
+            public void sendFloat(float value, Float boxedValue,
+                    float[] array) {
                 Arrays.sort(array);
                 rpc.sendFloat(boxedValue.floatValue(), Float.valueOf(value),
                         array);
@@ -162,10 +167,11 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             }
 
             @Override
-            public void sendChar(char value, Character boxedValue, char[] array) {
+            public void sendChar(char value, Character boxedValue,
+                    char[] array) {
                 rpc.sendChar(Character.toUpperCase(boxedValue.charValue()),
-                        Character.valueOf(value), new String(array)
-                                .toLowerCase().toCharArray());
+                        Character.valueOf(value),
+                        new String(array).toLowerCase().toCharArray());
             }
 
             @Override
@@ -191,15 +197,15 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             public void sendBean(ComplexTestBean complexBean,
                     SimpleTestBean simpleBean, SimpleTestBean[] array) {
                 SimpleTestBean updatedSimpleBean = new SimpleTestBean();
-                updatedSimpleBean.setValue(complexBean.getInnerBean1()
-                        .getValue());
+                updatedSimpleBean
+                        .setValue(complexBean.getInnerBean1().getValue());
 
                 ComplexTestBean updatedComplexBean = new ComplexTestBean();
                 updatedComplexBean.setInnerBean1(complexBean.getInnerBean2());
-                updatedComplexBean.setInnerBean2(complexBean
-                        .getInnerBeanCollection().get(0));
-                updatedComplexBean.setInnerBeanCollection(Arrays.asList(
-                        simpleBean, updatedSimpleBean));
+                updatedComplexBean.setInnerBean2(
+                        complexBean.getInnerBeanCollection().get(0));
+                updatedComplexBean.setInnerBeanCollection(
+                        Arrays.asList(simpleBean, updatedSimpleBean));
                 updatedComplexBean.setPrivimite(complexBean.getPrivimite() + 1);
 
                 ArrayList<SimpleTestBean> arrayList = new ArrayList<SimpleTestBean>(
@@ -217,14 +223,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
                 Collections.reverse(beanArrayList);
                 List<Integer[]> updatedObjectArrayList = new ArrayList<Integer[]>();
                 for (int[] array : primitiveArrayList) {
-                    updatedObjectArrayList.add(new Integer[] {
-                            Integer.valueOf(array.length),
-                            Integer.valueOf(array[0]) });
+                    updatedObjectArrayList
+                            .add(new Integer[] { Integer.valueOf(array.length),
+                                    Integer.valueOf(array[0]) });
                 }
 
-                rpc.sendArrayList(Arrays.asList(
-                        new int[] { primitiveArrayList.size() },
-                        new int[] { objectArrayList.get(0).length }),
+                rpc.sendArrayList(
+                        Arrays.asList(new int[] { primitiveArrayList.size() },
+                                new int[] { objectArrayList.get(0).length }),
                         updatedObjectArrayList, beanArrayList);
             }
 
@@ -236,16 +242,17 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             @Override
             public void sendListArray(List<Integer>[] objectListArray,
                     List<SimpleTestBean>[] beanListArray) {
-                rpc.sendListArray(new List[] { objectListArray[1],
-                        objectListArray[0] }, new List[] { Collections
-                        .singletonList(beanListArray[0].get(0)) });
+                rpc.sendListArray(
+                        new List[] { objectListArray[1], objectListArray[0] },
+                        new List[] { Collections
+                                .singletonList(beanListArray[0].get(0)) });
             }
 
             @Override
             public void sendEnum(ContentMode contentMode, ContentMode[] array,
                     List<ContentMode> list) {
-                ContentMode nextContentMode = ContentMode.values()[contentMode
-                        .ordinal() + 1];
+                ContentMode nextContentMode = ContentMode
+                        .values()[contentMode.ordinal() + 1];
                 rpc.sendEnum(nextContentMode,
                         list.toArray(new ContentMode[list.size()]),
                         Arrays.asList(array));
@@ -275,13 +282,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
             public void sendJson(JsonValue value1, JsonValue value2,
                     JsonString string) {
                 if (value1.getType() != JsonType.BOOLEAN) {
-                    throw new RuntimeException("Expected boolean, got "
-                            + value1.toJson());
+                    throw new RuntimeException(
+                            "Expected boolean, got " + value1.toJson());
                 }
 
                 if (value2.getType() != JsonType.NULL) {
-                    throw new RuntimeException("Expected null, got "
-                            + value2.toJson());
+                    throw new RuntimeException(
+                            "Expected null, got " + value2.toJson());
                 }
 
                 JsonObject returnObject = Json.createObject();
@@ -343,10 +350,12 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
 
         rpc.log("state.doubleValue: " + getState().doubleValue);
         rpc.log("state.doubleObjectValue: " + getState().doubleObjectValue);
-        rpc.log("state.doubleArray: " + Arrays.toString(getState().doubleArray));
+        rpc.log("state.doubleArray: "
+                + Arrays.toString(getState().doubleArray));
 
         rpc.log("state.string: " + getState().string);
-        rpc.log("state.stringArray: " + Arrays.toString(getState().stringArray));
+        rpc.log("state.stringArray: "
+                + Arrays.toString(getState().stringArray));
 
         rpc.log("state.jsonNull: " + getState().jsonNull.getType().name());
         rpc.log("state.jsonString: "
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
index 95c04ebcfe..6a35edd234 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
@@ -49,8 +49,8 @@ public interface SerializerTestRpc extends ServerRpc, ClientRpc {
 
     public void sendConnector(Connector connector);
 
-    public void sendBean(ComplexTestBean complexBean,
-            SimpleTestBean simpleBean, SimpleTestBean[] array);
+    public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean,
+            SimpleTestBean[] array);
 
     public void sendNull(String value1, String value2);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
index 33a8956810..f72f779d77 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
@@ -33,8 +33,8 @@ import com.vaadin.tests.widgetset.server.TestWidgetComponent;
 
 @Connect(TestWidgetComponent.class)
 public class TestWidgetConnector extends AbstractComponentConnector {
-    public static class SubPartAwareSimplePanel extends SimplePanel implements
-            SubPartAware {
+    public static class SubPartAwareSimplePanel extends SimplePanel
+            implements SubPartAware {
         @Override
         public Element getSubPartElement(String subPart) {
             Widget target = getWidget();
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
index 948c1ece3d..ed41bb63b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
@@ -25,8 +25,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.UseStateFromHierachyComponent;
 
 @Connect(UseStateFromHierachyComponent.class)
-public class UseStateFromHierachyChangeConnector extends
-        AbstractSingleComponentContainerConnector {
+public class UseStateFromHierachyChangeConnector
+        extends AbstractSingleComponentContainerConnector {
 
     @Override
     public SimplePanel getWidget() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
index 9dbededb50..66dbf98f22 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.widgetset.client;
 import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Connector;
 
-public class UseStateFromHierachyChangeConnectorState extends
-        AbstractComponentState {
+public class UseStateFromHierachyChangeConnectorState
+        extends AbstractComponentState {
     public Connector child;
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
index 39dca8d799..3d689165d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
@@ -70,8 +70,8 @@ public class CsrfButtonConnector extends AbstractComponentConnector {
     }
 
     private String csrfTokenInfo() {
-        return getMockConnection().getMessageHandler().getCsrfToken()
-                + ", " + getMockConnection().getLastCsrfTokenReceiver() + ", "
+        return getMockConnection().getMessageHandler().getCsrfToken() + ", "
+                + getMockConnection().getLastCsrfTokenReceiver() + ", "
                 + getMockConnection().getLastCsrfTokenSent();
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
index e13dd5030b..d2939e5b4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
@@ -20,8 +20,8 @@ import com.vaadin.shared.ui.Connect;
 @Connect(com.vaadin.tests.dd.SpacebarPanner.class)
 public class SpacebarPannerConnector extends AbstractExtensionConnector {
 
-    Logger logger = Logger.getLogger(SpacebarPannerConnector.class
-            .getSimpleName());
+    Logger logger = Logger
+            .getLogger(SpacebarPannerConnector.class.getSimpleName());
 
     private boolean trigger = false;
     private VUI vui;
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
index 9b05ff35d8..6f404c779b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
@@ -27,8 +27,8 @@ import com.vaadin.tests.contextclick.BrowserContextMenuInSubComponent.BrowserCon
  * Client-side connector of the {@link BrowserContextMenuExtension}.
  */
 @Connect(BrowserContextMenuExtension.class)
-public class BrowserContextMenuExtensionConnector extends
-        AbstractExtensionConnector {
+public class BrowserContextMenuExtensionConnector
+        extends AbstractExtensionConnector {
 
     @Override
     protected void extend(ServerConnector target) {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
index c735797731..f39c8119be 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
@@ -19,8 +19,8 @@ import com.vaadin.client.widget.escalator.SpacerUpdater;
 import com.vaadin.client.widgets.Escalator;
 import com.vaadin.shared.ui.grid.ScrollDestination;
 
-public class EscalatorBasicClientFeaturesWidget extends
-        PureGWTTestApplication<Escalator> {
+public class EscalatorBasicClientFeaturesWidget
+        extends PureGWTTestApplication<Escalator> {
 
     public static class LogWidget extends Composite {
 
@@ -66,12 +66,13 @@ public class EscalatorBasicClientFeaturesWidget extends
         }
     }
 
-    public static class UpdaterLifetimeWidget extends
-            EscalatorBasicClientFeaturesWidget {
+    public static class UpdaterLifetimeWidget
+            extends EscalatorBasicClientFeaturesWidget {
 
         private final EscalatorUpdater debugUpdater = new EscalatorUpdater() {
             @Override
-            public void preAttach(Row row, Iterable<FlyweightCell> cellsToAttach) {
+            public void preAttach(Row row,
+                    Iterable<FlyweightCell> cellsToAttach) {
                 log("preAttach", cellsToAttach);
             }
 
@@ -87,7 +88,8 @@ public class EscalatorBasicClientFeaturesWidget extends
             }
 
             @Override
-            public void preDetach(Row row, Iterable<FlyweightCell> cellsToDetach) {
+            public void preDetach(Row row,
+                    Iterable<FlyweightCell> cellsToDetach) {
                 log("preDetach", cellsToDetach);
             }
 
@@ -105,9 +107,10 @@ public class EscalatorBasicClientFeaturesWidget extends
                 TableCellElement cellElement = cells.iterator().next()
                         .getElement();
                 boolean isAttached = cellElement.getParentElement() != null
-                        && cellElement.getParentElement().getParentElement() != null;
-                logWidget.log(methodName + ": elementIsAttached == "
-                        + isAttached);
+                        && cellElement.getParentElement()
+                                .getParentElement() != null;
+                logWidget.log(
+                        methodName + ": elementIsAttached == " + isAttached);
             }
         };
 
@@ -123,8 +126,8 @@ public class EscalatorBasicClientFeaturesWidget extends
     private static final String GENERAL_MENU = "General";
     private static final String FEATURES_MENU = "Features";
 
-    private static abstract class TestEscalatorUpdater implements
-            EscalatorUpdater {
+    private static abstract class TestEscalatorUpdater
+            implements EscalatorUpdater {
 
         @Override
         public void preAttach(Row row, Iterable<FlyweightCell> cellsToAttach) {
@@ -466,8 +469,8 @@ public class EscalatorBasicClientFeaturesWidget extends
         addMenuCommand("Add one column to end", new ScheduledCommand() {
             @Override
             public void execute() {
-                insertColumns(escalator.getColumnConfiguration()
-                        .getColumnCount(), 1);
+                insertColumns(
+                        escalator.getColumnConfiguration().getColumnCount(), 1);
             }
         }, menupath);
         addMenuCommand("Add ten columns", new ScheduledCommand() {
@@ -486,8 +489,9 @@ public class EscalatorBasicClientFeaturesWidget extends
         addMenuCommand("Remove one column from end", new ScheduledCommand() {
             @Override
             public void execute() {
-                removeColumns(escalator.getColumnConfiguration()
-                        .getColumnCount() - 1, 1);
+                removeColumns(
+                        escalator.getColumnConfiguration().getColumnCount() - 1,
+                        1);
             }
         }, menupath);
 
@@ -502,8 +506,8 @@ public class EscalatorBasicClientFeaturesWidget extends
                 new ScheduledCommand() {
                     @Override
                     public void execute() {
-                        escalator.getColumnConfiguration()
-                                .setColumnWidth(0, -1);
+                        escalator.getColumnConfiguration().setColumnWidth(0,
+                                -1);
                     }
                 }, menupath);
 
@@ -544,31 +548,31 @@ public class EscalatorBasicClientFeaturesWidget extends
         addMenuCommand("Remove 5 rows from bottom", new ScheduledCommand() {
             @Override
             public void execute() {
-                removeRows(escalator.getBody(), escalator.getBody()
-                        .getRowCount() - 5, 5);
+                removeRows(escalator.getBody(),
+                        escalator.getBody().getRowCount() - 5, 5);
             }
         }, menupath);
         addMenuCommand("Remove 50 rows from bottom", new ScheduledCommand() {
             @Override
             public void execute() {
-                removeRows(escalator.getBody(), escalator.getBody()
-                        .getRowCount() - 50, 50);
+                removeRows(escalator.getBody(),
+                        escalator.getBody().getRowCount() - 50, 50);
             }
         }, menupath);
         addMenuCommand("Remove 50 rows from almost bottom",
                 new ScheduledCommand() {
                     @Override
                     public void execute() {
-                        removeRows(escalator.getBody(), escalator.getBody()
-                                .getRowCount() - 60, 50);
+                        removeRows(escalator.getBody(),
+                                escalator.getBody().getRowCount() - 60, 50);
                     }
                 }, menupath);
         addMenuCommand("Remove all, insert 30 and scroll 40px",
                 new ScheduledCommand() {
                     @Override
                     public void execute() {
-                        removeRows(escalator.getBody(), 0, escalator.getBody()
-                                .getRowCount());
+                        removeRows(escalator.getBody(), 0,
+                                escalator.getBody().getRowCount());
                         insertRows(escalator.getBody(), 0, 30);
                         escalator.setScrollTop(40);
                     }
@@ -595,7 +599,8 @@ public class EscalatorBasicClientFeaturesWidget extends
         }, menupath);
     }
 
-    private void createRowsMenu(final RowContainer container, String[] menupath) {
+    private void createRowsMenu(final RowContainer container,
+            String[] menupath) {
         addMenuCommand("Add one row to beginning", new ScheduledCommand() {
             @Override
             public void execute() {
@@ -650,8 +655,8 @@ public class EscalatorBasicClientFeaturesWidget extends
 
                 @Override
                 public void init(Spacer spacer) {
-                    spacer.getElement().setInnerText(
-                            "Spacer for row " + spacer.getRow());
+                    spacer.getElement()
+                            .setInnerText("Spacer for row " + spacer.getRow());
                 }
             };
 
@@ -690,7 +695,8 @@ public class EscalatorBasicClientFeaturesWidget extends
         createSpacersMenuForRow(99, menupath);
     }
 
-    private void createSpacersMenuForRow(final int rowIndex, String[] menupath) {
+    private void createSpacersMenuForRow(final int rowIndex,
+            String[] menupath) {
         menupath = new String[] { menupath[0], menupath[1], "Row " + rowIndex };
         addMenuCommand("Set 100px", new ScheduledCommand() {
             @Override
@@ -726,7 +732,8 @@ public class EscalatorBasicClientFeaturesWidget extends
                 }, menupath);
     }
 
-    private void insertRows(final RowContainer container, int offset, int number) {
+    private void insertRows(final RowContainer container, int offset,
+            int number) {
         if (container == escalator.getBody()) {
             data.insertRows(offset, number);
             escalator.getBody().insertRows(offset, number);
@@ -735,7 +742,8 @@ public class EscalatorBasicClientFeaturesWidget extends
         }
     }
 
-    private void removeRows(final RowContainer container, int offset, int number) {
+    private void removeRows(final RowContainer container, int offset,
+            int number) {
         if (container == escalator.getBody()) {
             data.removeRows(offset, number);
             escalator.getBody().removeRows(offset, number);
@@ -756,44 +764,44 @@ public class EscalatorBasicClientFeaturesWidget extends
 
     private void resetColRow() {
         if (escalator.getColumnConfiguration().getColumnCount() > 0) {
-            removeColumns(0, escalator.getColumnConfiguration()
-                    .getColumnCount());
+            removeColumns(0,
+                    escalator.getColumnConfiguration().getColumnCount());
         }
         if (escalator.getFooter().getRowCount() > 0) {
-            removeRows(escalator.getFooter(), 0, escalator.getFooter()
-                    .getRowCount());
+            removeRows(escalator.getFooter(), 0,
+                    escalator.getFooter().getRowCount());
         }
 
         if (escalator.getBody().getRowCount() > 0) {
-            removeRows(escalator.getBody(), 0, escalator.getBody()
-                    .getRowCount());
+            removeRows(escalator.getBody(), 0,
+                    escalator.getBody().getRowCount());
         }
 
         if (escalator.getHeader().getRowCount() > 0) {
-            removeRows(escalator.getHeader(), 0, escalator.getHeader()
-                    .getRowCount());
+            removeRows(escalator.getHeader(), 0,
+                    escalator.getHeader().getRowCount());
         }
     }
 
     private void resetRowCol() {
         if (escalator.getFooter().getRowCount() > 0) {
-            removeRows(escalator.getFooter(), 0, escalator.getFooter()
-                    .getRowCount());
+            removeRows(escalator.getFooter(), 0,
+                    escalator.getFooter().getRowCount());
         }
 
         if (escalator.getBody().getRowCount() > 0) {
-            removeRows(escalator.getBody(), 0, escalator.getBody()
-                    .getRowCount());
+            removeRows(escalator.getBody(), 0,
+                    escalator.getBody().getRowCount());
         }
 
         if (escalator.getHeader().getRowCount() > 0) {
-            removeRows(escalator.getHeader(), 0, escalator.getHeader()
-                    .getRowCount());
+            removeRows(escalator.getHeader(), 0,
+                    escalator.getHeader().getRowCount());
         }
 
         if (escalator.getColumnConfiguration().getColumnCount() > 0) {
-            removeColumns(0, escalator.getColumnConfiguration()
-                    .getColumnCount());
+            removeColumns(0,
+                    escalator.getColumnConfiguration().getColumnCount());
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
index e7ebcfeb51..5e596a5006 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
@@ -33,7 +33,8 @@ public class EscalatorProxy extends Escalator {
     private class ColumnConfigurationProxy implements ColumnConfiguration {
         private ColumnConfiguration columnConfiguration;
 
-        public ColumnConfigurationProxy(ColumnConfiguration columnConfiguration) {
+        public ColumnConfigurationProxy(
+                ColumnConfiguration columnConfiguration) {
             this.columnConfiguration = columnConfiguration;
         }
 
@@ -76,7 +77,8 @@ public class EscalatorProxy extends Escalator {
         }
 
         @Override
-        public double getColumnWidth(int index) throws IllegalArgumentException {
+        public double getColumnWidth(int index)
+                throws IllegalArgumentException {
             return columnConfiguration.getColumnWidth(index);
         }
 
@@ -99,8 +101,8 @@ public class EscalatorProxy extends Escalator {
         }
     }
 
-    private class BodyRowContainerProxy extends RowContainerProxy implements
-            BodyRowContainer {
+    private class BodyRowContainerProxy extends RowContainerProxy
+            implements BodyRowContainer {
         private BodyRowContainer rowContainer;
 
         public BodyRowContainerProxy(BodyRowContainer rowContainer) {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
index b6386afe44..769c88aa51 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
@@ -96,8 +96,8 @@ import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data
  * @since
  * @author Vaadin Ltd
  */
-public class GridBasicClientFeaturesWidget extends
-        PureGWTTestApplication<Grid<List<Data>>> {
+public class GridBasicClientFeaturesWidget
+        extends PureGWTTestApplication<Grid<List<Data>>> {
     public static final String ROW_STYLE_GENERATOR_NONE = "None";
     public static final String ROW_STYLE_GENERATOR_ROW_INDEX = "Row numbers";
     public static final String ROW_STYLE_GENERATOR_EVERY_THIRD = "Every third";
@@ -125,7 +125,8 @@ public class GridBasicClientFeaturesWidget extends
         public void bind(EditorRequest<List<Data>> request) {
             List<Data> rowData = ds.getRow(request.getRowIndex());
 
-            boolean hasSelectionColumn = !(grid.getSelectionModel() instanceof None);
+            boolean hasSelectionColumn = !(grid
+                    .getSelectionModel() instanceof None);
             for (int i = 0; i < rowData.size(); i++) {
                 int columnIndex = hasSelectionColumn ? i + 1 : i;
                 getWidget(columnIndex).setText(rowData.get(i).value.toString());
@@ -144,8 +145,8 @@ public class GridBasicClientFeaturesWidget extends
                 request.failure(
                         "Syntethic fail of editor in column 2. "
                                 + "This message is so long that it doesn't fit into its box",
-                        Collections.<Column<?, List<Data>>> singleton(grid
-                                .getColumn(2)));
+                        Collections.<Column<?, List<Data>>> singleton(
+                                grid.getColumn(2)));
                 return;
             }
             try {
@@ -472,8 +473,8 @@ public class GridBasicClientFeaturesWidget extends
                 final Label columnOrderLabel = new Label();
                 columnOrderLabel.getElement().setId("columnreorder");
                 addLineEnd(columnOrderLabel, 300);
-                columnReorderHandler = grid
-                        .addColumnReorderHandler(new ColumnReorderHandler<List<Data>>() {
+                columnReorderHandler = grid.addColumnReorderHandler(
+                        new ColumnReorderHandler<List<Data>>() {
 
                             private int eventIndex = 0;
 
@@ -508,17 +509,14 @@ public class GridBasicClientFeaturesWidget extends
                                 columnOrderLabel.getElement().setAttribute(
                                         "counter", "" + (++eventIndex));
                                 columnOrderLabel.getElement().setAttribute(
-                                        "useroriginated",
-                                        (Boolean.toString(event
-                                                .isUserOriginated())));
+                                        "useroriginated", (Boolean.toString(
+                                                event.isUserOriginated())));
                                 columnOrderLabel.getElement().setAttribute(
                                         "ishidden",
                                         (Boolean.toString(event.isHidden())));
                                 columnOrderLabel.getElement().setAttribute(
-                                        "columnindex",
-                                        ""
-                                                + grid.getColumns().indexOf(
-                                                        event.getColumn()));
+                                        "columnindex", "" + grid.getColumns()
+                                                .indexOf(event.getColumn()));
                             }
                         };
 
@@ -546,9 +544,8 @@ public class GridBasicClientFeaturesWidget extends
                         location = "somewhere";
                     }
 
-                    getLogger().info(
-                            "Prevented opening a context menu in grid "
-                                    + location);
+                    getLogger().info("Prevented opening a context menu in grid "
+                            + location);
                 }
             };
 
@@ -644,8 +641,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void execute() {
                 DataSource<List<Data>> ds = grid.getDataSource();
-                final RowHandle<List<Data>> rowHandle = ds.getHandle(ds
-                        .getRow(0));
+                final RowHandle<List<Data>> rowHandle = ds
+                        .getHandle(ds.getRow(0));
 
                 new Timer() {
                     @Override
@@ -671,13 +668,14 @@ public class GridBasicClientFeaturesWidget extends
                 grid.setRowStyleGenerator(new RowStyleGenerator<List<Data>>() {
 
                     @Override
-                    public String getStyle(RowReference<List<Data>> rowReference) {
+                    public String getStyle(
+                            RowReference<List<Data>> rowReference) {
                         if (rowReference.getRowIndex() % 3 == 0) {
                             return "third";
                         } else {
                             // First manual col is integer
-                            Integer value = (Integer) rowReference.getRow()
-                                    .get(COLUMNS - MANUALLY_FORMATTED_COLUMNS).value;
+                            Integer value = (Integer) rowReference.getRow().get(
+                                    COLUMNS - MANUALLY_FORMATTED_COLUMNS).value;
                             return value.toString();
                         }
                     }
@@ -692,7 +690,8 @@ public class GridBasicClientFeaturesWidget extends
                 grid.setRowStyleGenerator(new RowStyleGenerator<List<Data>>() {
 
                     @Override
-                    public String getStyle(RowReference<List<Data>> rowReference) {
+                    public String getStyle(
+                            RowReference<List<Data>> rowReference) {
                         return Integer.toString(rowReference.getRowIndex());
                     }
                 });
@@ -710,43 +709,44 @@ public class GridBasicClientFeaturesWidget extends
         addMenuCommand(CELL_STYLE_GENERATOR_SIMPLE, new ScheduledCommand() {
             @Override
             public void execute() {
-                grid.setCellStyleGenerator(new CellStyleGenerator<List<Data>>() {
-
-                    @Override
-                    public String getStyle(
-                            CellReference<List<Data>> cellReference) {
-                        Grid.Column<?, List<Data>> column = cellReference
-                                .getColumn();
-                        if (column == grid.getColumn(2)) {
-                            return "two";
-                        } else if (column == grid.getColumn(COLUMNS
-                                - MANUALLY_FORMATTED_COLUMNS)) {
-                            // First manual col is integer
-                            Integer value = (Integer) column
-                                    .getValue(cellReference.getRow());
-                            return value.toString();
+                grid.setCellStyleGenerator(
+                        new CellStyleGenerator<List<Data>>() {
 
-                        } else {
-                            return null;
-                        }
-                    }
-                });
+                            @Override
+                            public String getStyle(
+                                    CellReference<List<Data>> cellReference) {
+                                Grid.Column<?, List<Data>> column = cellReference
+                                        .getColumn();
+                                if (column == grid.getColumn(2)) {
+                                    return "two";
+                                } else if (column == grid.getColumn(
+                                        COLUMNS - MANUALLY_FORMATTED_COLUMNS)) {
+                                    // First manual col is integer
+                                    Integer value = (Integer) column
+                                            .getValue(cellReference.getRow());
+                                    return value.toString();
+
+                                } else {
+                                    return null;
+                                }
+                            }
+                        });
             }
         }, cellStyleGeneratorNamePath);
         addMenuCommand(CELL_STYLE_GENERATOR_COL_INDEX, new ScheduledCommand() {
             @Override
             public void execute() {
-                grid.setCellStyleGenerator(new CellStyleGenerator<List<Data>>() {
+                grid.setCellStyleGenerator(
+                        new CellStyleGenerator<List<Data>>() {
 
-                    @Override
-                    public String getStyle(
-                            CellReference<List<Data>> cellReference) {
-                        return cellReference.getRowIndex()
-                                + "_"
-                                + grid.getColumns().indexOf(
-                                        cellReference.getColumn());
-                    }
-                });
+                            @Override
+                            public String getStyle(
+                                    CellReference<List<Data>> cellReference) {
+                                return cellReference.getRowIndex() + "_"
+                                        + grid.getColumns().indexOf(
+                                                cellReference.getColumn());
+                            }
+                        });
             }
         }, cellStyleGeneratorNamePath);
 
@@ -776,15 +776,16 @@ public class GridBasicClientFeaturesWidget extends
             public void execute() {
                 List<Column> columns = new ArrayList<Column>(grid.getColumns());
                 Collections.reverse(columns);
-                grid.setColumnOrder(columns.toArray(new Column[columns.size()]));
+                grid.setColumnOrder(
+                        columns.toArray(new Column[columns.size()]));
             }
         }, "Component", "State");
         addMenuCommand("Column Reordering", new ScheduledCommand() {
 
             @Override
             public void execute() {
-                grid.setColumnReorderingAllowed(!grid
-                        .isColumnReorderingAllowed());
+                grid.setColumnReorderingAllowed(
+                        !grid.isColumnReorderingAllowed());
             }
         }, "Component", "State");
         addMenuCommand("250px", new ScheduledCommand() {
@@ -820,8 +821,8 @@ public class GridBasicClientFeaturesWidget extends
     }
 
     private void createScrollToRowMenu() {
-        String[] menupath = new String[] { "Component", "State",
-                "Scroll to...", null };
+        String[] menupath = new String[] { "Component", "State", "Scroll to...",
+                null };
 
         for (int i = 0; i < ROWS; i += 100) {
             menupath[3] = "Row " + i + "...";
@@ -988,8 +989,8 @@ public class GridBasicClientFeaturesWidget extends
                         Column<?, List<Data>> col = reordered.remove(index);
                         reordered.add(index - 1, col);
                     }
-                    grid.setColumnOrder(reordered.toArray(new Column[reordered
-                            .size()]));
+                    grid.setColumnOrder(
+                            reordered.toArray(new Column[reordered.size()]));
                 }
             }, "Component", "Columns", "Column " + i);
         }
@@ -1051,8 +1052,8 @@ public class GridBasicClientFeaturesWidget extends
         addMenuCommand("Bottom", new ScheduledCommand() {
             @Override
             public void execute() {
-                grid.setDefaultHeaderRow(grid.getHeaderRow(grid
-                        .getHeaderRowCount() - 1));
+                grid.setDefaultHeaderRow(
+                        grid.getHeaderRow(grid.getHeaderRowCount() - 1));
             }
         }, "Component", "Header", "Default row");
         addMenuCommand("Unset", new ScheduledCommand() {
@@ -1099,8 +1100,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void execute() {
                 row.join(row.getCell(grid.getColumn(0)),
-                        row.getCell(grid.getColumn(1))).setText(
-                        "Join column cells 0, 1");
+                        row.getCell(grid.getColumn(1)))
+                        .setText("Join column cells 0, 1");
 
             }
         }, menuPath);
@@ -1109,8 +1110,8 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void execute() {
-                row.join(grid.getColumn(1), grid.getColumn(2)).setText(
-                        "Join columns 1, 2");
+                row.join(grid.getColumn(1), grid.getColumn(2))
+                        .setText("Join columns 1, 2");
                 ;
 
             }
@@ -1130,9 +1131,8 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void execute() {
-                row.join(
-                        grid.getColumns().toArray(
-                                new Grid.Column[grid.getColumnCount()]))
+                row.join(grid.getColumns()
+                        .toArray(new Grid.Column[grid.getColumnCount()]))
                         .setText("Join all columns");
                 ;
 
@@ -1245,8 +1245,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void execute() {
                 row.join(row.getCell(grid.getColumn(0)),
-                        row.getCell(grid.getColumn(1))).setText(
-                        "Join column cells 0, 1");
+                        row.getCell(grid.getColumn(1)))
+                        .setText("Join column cells 0, 1");
 
             }
         }, menuPath);
@@ -1255,8 +1255,8 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void execute() {
-                row.join(grid.getColumn(1), grid.getColumn(2)).setText(
-                        "Join columns 1, 2");
+                row.join(grid.getColumn(1), grid.getColumn(2))
+                        .setText("Join columns 1, 2");
                 ;
 
             }
@@ -1266,9 +1266,8 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void execute() {
-                row.join(
-                        grid.getColumns().toArray(
-                                new Grid.Column[grid.getColumnCount()]))
+                row.join(grid.getColumns()
+                        .toArray(new Grid.Column[grid.getColumnCount()]))
                         .setText("Join all columns");
                 ;
 
@@ -1312,7 +1311,8 @@ public class GridBasicClientFeaturesWidget extends
             return new HtmlRenderer() {
 
                 @Override
-                public void render(RendererCellReference cell, String htmlString) {
+                public void render(RendererCellReference cell,
+                        String htmlString) {
                     super.render(cell, "<b>" + htmlString + "</b>");
                 }
             };
@@ -1346,8 +1346,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1357,8 +1357,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1368,8 +1368,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1380,8 +1380,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1391,8 +1391,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1402,8 +1402,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1414,8 +1414,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1425,8 +1425,8 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
@@ -1436,14 +1436,15 @@ public class GridBasicClientFeaturesWidget extends
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
                 CellReference<?> focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(),
-                        focused.getRowIndex(), focused.getColumnIndex());
+                updateLabel(label, event.toDebugString(), focused.getRowIndex(),
+                        focused.getColumnIndex());
             }
         });
 
     }
 
-    private void updateLabel(VLabel label, String output, int object, int column) {
+    private void updateLabel(VLabel label, String output, int object,
+            int column) {
         String coords = "(" + object + ", " + column + ")";
         label.setText(coords + " " + output);
     }
@@ -1600,18 +1601,19 @@ public class GridBasicClientFeaturesWidget extends
             public void execute() {
                 grid.setSidebarOpen(true);
 
-                Scheduler.get().scheduleFixedDelay(new Scheduler.RepeatingCommand() {
-                    @Override
-                    public boolean execute() {
-                        if(grid.isSidebarOpen()) {
-                            grid.setEnabled(false);
+                Scheduler.get()
+                        .scheduleFixedDelay(new Scheduler.RepeatingCommand() {
+                            @Override
+                            public boolean execute() {
+                                if (grid.isSidebarOpen()) {
+                                    grid.setEnabled(false);
 
-                            return false;
-                        }
+                                    return false;
+                                }
 
-                        return true;
-                    }
-                }, 250);
+                                return true;
+                            }
+                        }, 250);
             }
         }, menupath);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
index b2893463a7..b949a0df2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
@@ -27,8 +27,8 @@ import com.vaadin.client.renderers.HtmlRenderer;
 import com.vaadin.client.widgets.Grid;
 import com.vaadin.client.widgets.Grid.SelectionMode;
 
-public class GridCellFocusOnResetSizeWidget extends
-        PureGWTTestApplication<Grid<String[]>> {
+public class GridCellFocusOnResetSizeWidget
+        extends PureGWTTestApplication<Grid<String[]>> {
 
     private Grid<String[]> grid;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
index 64020683f6..629f7f424f 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
@@ -47,8 +47,8 @@ public class GridClickExtensionConnector extends AbstractExtensionConnector {
                 CellReference<?> cellRef = event.getTargetCell();
 
                 // Gather needed information.
-                String rowKey = getParent().getRowKey(
-                        (JsonObject) cellRef.getRow());
+                String rowKey = getParent()
+                        .getRowKey((JsonObject) cellRef.getRow());
                 String columnId = getParent().getColumnId(cellRef.getColumn());
                 MouseEventDetails clickDetails = MouseEventDetailsBuilder
                         .buildMouseEventDetails(event.getNativeEvent());
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
index 2b8f454ed1..c5b08204ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
@@ -51,8 +51,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers;
 
 @Connect(GridClientColumnRenderers.GridController.class)
-public class GridClientColumnRendererConnector extends
-        AbstractComponentConnector {
+public class GridClientColumnRendererConnector
+        extends AbstractComponentConnector {
 
     public static enum Renderers {
         TEXT_RENDERER, WIDGET_RENDERER, HTML_RENDERER, NUMBER_RENDERER, DATE_RENDERER, CPLX_RENDERER;
@@ -84,8 +84,8 @@ public class GridClientColumnRendererConnector extends
                     DelayedDataSource.this.firstRowIndex = firstRowIndex;
                     DelayedDataSource.this.numberOfRows = numberOfRows;
                     dataChangeHandler.dataUpdated(firstRowIndex, numberOfRows);
-                    dataChangeHandler
-                            .dataAvailable(firstRowIndex, numberOfRows);
+                    dataChangeHandler.dataAvailable(firstRowIndex,
+                            numberOfRows);
                 }
             }.schedule(latency);
         }
@@ -130,14 +130,15 @@ public class GridClientColumnRendererConnector extends
         // Provide data as data source
         if (Location.getParameter("latency") != null) {
             grid.setDataSource(new DelayedDataSource(
-                    new ListDataSource<String>(columnData), Integer
-                            .parseInt(Location.getParameter("latency"))));
+                    new ListDataSource<String>(columnData),
+                    Integer.parseInt(Location.getParameter("latency"))));
         } else {
             grid.setDataSource(new ListDataSource<String>(columnData));
         }
 
         // Add a column to display the data in
-        Grid.Column<String, String> c = createColumnWithRenderer(Renderers.TEXT_RENDERER);
+        Grid.Column<String, String> c = createColumnWithRenderer(
+                Renderers.TEXT_RENDERER);
         grid.addColumn(c);
         grid.getDefaultHeaderRow().getCell(c).setText("Column 1");
 
@@ -150,8 +151,8 @@ public class GridClientColumnRendererConnector extends
         grid.addSortHandler(new SortHandler<String>() {
             @Override
             public void sort(SortEvent<String> event) {
-                Element console = Document.get().getElementById(
-                        "testDebugConsole");
+                Element console = Document.get()
+                        .getElementById("testDebugConsole");
                 String text = "Client-side sort event received<br>"
                         + "Columns: " + event.getOrder().size() + ", order: ";
                 for (SortOrder order : event.getOrder()) {
@@ -181,13 +182,9 @@ public class GridClientColumnRendererConnector extends
                         }
                         getWidget().addColumn(column);
 
-                        getWidget()
-                                .getDefaultHeaderRow()
-                                .getCell(column)
-                                .setText(
-                                        "Column "
-                                                + String.valueOf(getWidget()
-                                                        .getColumnCount() + 1));
+                        getWidget().getDefaultHeaderRow().getCell(column)
+                                .setText("Column " + String.valueOf(
+                                        getWidget().getColumnCount() + 1));
                     }
 
                     @Override
@@ -211,7 +208,8 @@ public class GridClientColumnRendererConnector extends
                     @SuppressWarnings("unchecked")
                     public void triggerClientSortingTest() {
                         Grid<String> grid = getWidget();
-                        ListSorter<String> sorter = new ListSorter<String>(grid);
+                        ListSorter<String> sorter = new ListSorter<String>(
+                                grid);
 
                         // Make sorter sort the numbers in natural order
                         sorter.setComparator(
@@ -294,7 +292,8 @@ public class GridClientColumnRendererConnector extends
             return new HtmlRenderer() {
 
                 @Override
-                public void render(RendererCellReference cell, String htmlString) {
+                public void render(RendererCellReference cell,
+                        String htmlString) {
                     super.render(cell, "<b>" + htmlString + "</b>");
                 }
             };
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
index e352b10064..07c23262ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
@@ -25,8 +25,8 @@ import com.vaadin.client.renderers.TextRenderer;
 import com.vaadin.client.widgets.Grid;
 import com.vaadin.client.widgets.Grid.SelectionMode;
 
-public class GridClientDataSourcesWidget extends
-        PureGWTTestApplication<Grid<String[]>> {
+public class GridClientDataSourcesWidget
+        extends PureGWTTestApplication<Grid<String[]>> {
 
     private interface RestCallback {
         void onResponse(RestishDataSource.Backend.Result result);
@@ -75,7 +75,7 @@ public class GridClientDataSourcesWidget extends
          * somewhere.
          * <p>
          * It's scoped inside the RDS class only because it's tied to that.
-         * */
+         */
         private class Backend {
             public class Result {
                 public int size;
@@ -100,11 +100,13 @@ public class GridClientDataSourcesWidget extends
 
             }
 
-            private List<String[]> fetchRows(int firstRowIndex, int numberOfRows) {
+            private List<String[]> fetchRows(int firstRowIndex,
+                    int numberOfRows) {
                 List<String[]> rows = new ArrayList<String[]>();
                 for (int i = 0; i < numberOfRows; i++) {
                     String id = String.valueOf(firstRowIndex + i);
-                    rows.add(new String[] { id, "cell " + id + " #" + modCount });
+                    rows.add(new String[] { id,
+                            "cell " + id + " #" + modCount });
                 }
                 return rows;
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
index d73bc84227..8ac700edce 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
@@ -24,8 +24,8 @@ import com.vaadin.client.widget.grid.datasources.ListDataSource;
 import com.vaadin.client.widgets.Grid;
 import com.vaadin.client.widgets.Grid.SelectionMode;
 
-public class GridColumnAutoWidthClientWidget extends
-        PureGWTTestApplication<Grid<List<String>>> {
+public class GridColumnAutoWidthClientWidget
+        extends PureGWTTestApplication<Grid<List<String>>> {
 
     private Grid<List<String>> grid;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
index a865d90b43..52d6ea51d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
@@ -57,8 +57,8 @@ public class GridDataChangeHandlerWidget extends Composite {
         }
     }
 
-    public static class RemoteDelayedDataSource extends
-            AbstractRemoteDataSource<String> {
+    public static class RemoteDelayedDataSource
+            extends AbstractRemoteDataSource<String> {
 
         private List<String> rows;
 
@@ -93,8 +93,8 @@ public class GridDataChangeHandlerWidget extends Composite {
         initWidget(panel);
 
         panel.setWidget(grid);
-        grid.setDataSource(new RemoteDelayedDataSource(Arrays.asList("A", "B",
-                "C", "D", "E")));
+        grid.setDataSource(new RemoteDelayedDataSource(
+                Arrays.asList("A", "B", "C", "D", "E")));
         grid.addColumn(new Column<String, String>("letter") {
             @Override
             public String getValue(String row) {
@@ -107,8 +107,8 @@ public class GridDataChangeHandlerWidget extends Composite {
 
             @Override
             public boolean execute() {
-                grid.setDataSource(new DelayedDataSource(Arrays.asList("X",
-                        "Y", "Z")));
+                grid.setDataSource(
+                        new DelayedDataSource(Arrays.asList("X", "Y", "Z")));
                 if (run) {
                     return false;
                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
index 4f1ea48be5..4bd2623c4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
@@ -21,8 +21,8 @@ import com.vaadin.client.widgets.Grid.Column;
 import com.vaadin.client.widgets.Grid.SelectionMode;
 import com.vaadin.shared.ui.grid.HeightMode;
 
-public class GridDefaultTextRendererWidget extends
-        PureGWTTestApplication<Grid<String>> {
+public class GridDefaultTextRendererWidget
+        extends PureGWTTestApplication<Grid<String>> {
     /*
      * This can't be null, because grid thinks that a row object of null means
      * "data is still being fetched".
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
index 8202c2ccc0..d961f08389 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
@@ -17,8 +17,8 @@ public class GridHeightByRowOnInitWidget extends Composite {
         initWidget(panel);
 
         panel.setWidget(grid);
-        grid.setDataSource(new ListDataSource<String>(Arrays.asList("A", "B",
-                "C", "D", "E")));
+        grid.setDataSource(new ListDataSource<String>(
+                Arrays.asList("A", "B", "C", "D", "E")));
         grid.addColumn(new Column<String, String>("letter") {
             @Override
             public String getValue(String row) {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
index d35580b3c6..68933c0c20 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
@@ -24,8 +24,8 @@ import com.vaadin.client.widget.grid.datasources.ListDataSource;
 import com.vaadin.client.widgets.Grid;
 import com.vaadin.client.widgets.Grid.Column;
 
-public class GridRendererChangeWidget extends
-        PureGWTTestApplication<Grid<String[]>> {
+public class GridRendererChangeWidget
+        extends PureGWTTestApplication<Grid<String[]>> {
 
     public class MyButtonRenderer extends ButtonRenderer {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
index e89057a148..f140e825f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
@@ -21,7 +21,8 @@ import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.shared.ui.Connect;
 
 @Connect(com.vaadin.tests.components.grid.IntArrayRenderer.class)
-public class IntArrayRendererConnector extends AbstractRendererConnector<int[]> {
+public class IntArrayRendererConnector
+        extends AbstractRendererConnector<int[]> {
 
     public static class IntArrayRenderer implements Renderer<int[]> {
         private static final String JOINER = " :: ";
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
index 04dd08d274..a5c3192af2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
@@ -22,8 +22,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.widgetset.client.SimpleTestBean;
 
 @Connect(com.vaadin.tests.components.grid.BeanRenderer.class)
-public class PojoRendererConnector extends
-        AbstractRendererConnector<SimpleTestBean> {
+public class PojoRendererConnector
+        extends AbstractRendererConnector<SimpleTestBean> {
 
     public static class BeanRenderer implements Renderer<SimpleTestBean> {
         @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
index 63faf1d651..967ee764ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
@@ -60,7 +60,8 @@ public class RowAwareRendererConnector extends AbstractRendererConnector<Void> {
         }
 
         @Override
-        public boolean onBrowserEvent(CellReference<?> cell, NativeEvent event) {
+        public boolean onBrowserEvent(CellReference<?> cell,
+                NativeEvent event) {
             String key = getRowKey((JsonObject) cell.getRow());
             getRpcProxy(RowAwareRendererRpc.class).clicky(key);
             cell.getElement().setInnerText(
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
index 43d96afd2b..c6d7a7ff74 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
@@ -39,8 +39,8 @@ import com.vaadin.tests.widgetset.server.gwtrpc.GwtRpcButton;
 @Connect(GwtRpcButton.class)
 public class GwtRpcButtonConnector extends AbstractComponentConnector {
 
-    static Logger logger = Logger.getLogger(GwtRpcButtonConnector.class
-            .getName());
+    static Logger logger = Logger
+            .getLogger(GwtRpcButtonConnector.class.getName());
     static {
         logger.setLevel(Level.ALL);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
index 93eda8ca34..efe7607f51 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
@@ -27,6 +27,7 @@ public interface GwtRpcServiceTestAsync {
     /*
      * Dummy async method to verify if RPC works.
      */
-    void giveMeThat(String that, String haveThis, AsyncCallback<String> callback);
+    void giveMeThat(String that, String haveThis,
+            AsyncCallback<String> callback);
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
index 6b12e7d3c6..4c7f01949b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
@@ -29,9 +29,8 @@ public class ComponentInStateStateConnector extends AbstractComponentConnector {
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
 
-        getWidget().setText(
-                "Client-side type of other component: "
-                        + getOtherComponent().getClass().getName());
+        getWidget().setText("Client-side type of other component: "
+                + getOtherComponent().getClass().getName());
     }
 
     public ComponentConnector getOtherComponent() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
index 36c54c8ee6..aee16c334d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
@@ -14,8 +14,8 @@ import com.vaadin.tests.minitutorials.v7a2.MyComponent;
 @Connect(MyComponent.class)
 public class MyComponentConnector extends AbstractComponentConnector {
 
-    MyComponentServerRpc rpc = RpcProxy
-            .create(MyComponentServerRpc.class, this);
+    MyComponentServerRpc rpc = RpcProxy.create(MyComponentServerRpc.class,
+            this);
 
     public MyComponentConnector() {
         getWidget().addClickHandler(new ClickHandler() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
index 88911e245d..823bdecf81 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
@@ -9,11 +9,12 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.minitutorials.v7a2.WidgetContainer;
 
 @Connect(WidgetContainer.class)
-public class WidgetContainerConnector extends
-        AbstractComponentContainerConnector {
+public class WidgetContainerConnector
+        extends AbstractComponentContainerConnector {
 
     @Override
-    public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
+    public void onConnectorHierarchyChange(
+            ConnectorHierarchyChangeEvent event) {
         List<ComponentConnector> children = getChildComponents();
         VWidgetContainer widget = getWidget();
         widget.clear();
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
index 2f1d31a9d7..d8d1f43c32 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
@@ -12,7 +12,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.tests.minitutorials.v7b1.CapsLockWarningWithRpc;
 
 @Connect(CapsLockWarningWithRpc.class)
-public class CapsLockWarningWithRpcConnector extends AbstractExtensionConnector {
+public class CapsLockWarningWithRpcConnector
+        extends AbstractExtensionConnector {
 
     private CapsLockWarningRpc rpc = getRpcProxy(CapsLockWarningRpc.class);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
index c7b29e271b..ffed717730 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
@@ -89,7 +89,8 @@ public class TestWidgetRegistryGenerator extends Generator {
                     Invoker.class.getCanonicalName());
             w.indent();
 
-            w.println("public Object invoke(Object target, Object... params) {");
+            w.println(
+                    "public Object invoke(Object target, Object... params) {");
             w.indent();
 
             w.println("return new %s();",
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
index 1750e99727..864d64662e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
@@ -52,10 +52,10 @@ public class TestWidgetComponent extends AbstractComponent {
         Widgetset widgetset = uiClass.getAnnotation(Widgetset.class);
         if (widgetset == null
                 || !widgetset.value().equals(TestingWidgetSet.NAME)) {
-            throw new IllegalStateException("You must add @"
-                    + Widgetset.class.getSimpleName() + "("
-                    + TestingWidgetSet.class.getSimpleName() + ".NAME) to "
-                    + uiClass.getSimpleName());
+            throw new IllegalStateException(
+                    "You must add @" + Widgetset.class.getSimpleName() + "("
+                            + TestingWidgetSet.class.getSimpleName()
+                            + ".NAME) to " + uiClass.getSimpleName());
         }
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
index 3349024340..6cac7dbaf3 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
@@ -20,8 +20,8 @@ import com.vaadin.tests.widgetset.client.UseStateFromHierachyChangeConnectorStat
 import com.vaadin.ui.AbstractSingleComponentContainer;
 import com.vaadin.ui.Component;
 
-public class UseStateFromHierachyComponent extends
-        AbstractSingleComponentContainer {
+public class UseStateFromHierachyComponent
+        extends AbstractSingleComponentContainer {
 
     @Override
     protected UseStateFromHierachyChangeConnectorState getState() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
index 6283285b40..1a70dd0718 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
@@ -29,7 +29,8 @@ import com.vaadin.launcher.CustomDeploymentConfiguration.Conf;
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
-@CustomDeploymentConfiguration({ @Conf(name = "disable-xsrf-protection", value = "true") })
+@CustomDeploymentConfiguration({
+        @Conf(name = "disable-xsrf-protection", value = "true") })
 public class CsrfTokenDisabled extends AbstractCsrfTokenUI {
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
index cd02c6da77..ef244372b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
@@ -19,7 +19,8 @@ import com.vaadin.launcher.CustomDeploymentConfiguration;
 import com.vaadin.launcher.CustomDeploymentConfiguration.Conf;
 
 @SuppressWarnings("serial")
-@CustomDeploymentConfiguration({ @Conf(name = "disable-xsrf-protection", value = "false") })
+@CustomDeploymentConfiguration({
+        @Conf(name = "disable-xsrf-protection", value = "false") })
 public class CsrfTokenEnabled extends AbstractCsrfTokenUI {
 
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
index ce260f108d..3f028450b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
@@ -92,8 +92,8 @@ public class GridClientColumnRenderers extends UI {
         content.addComponent(controls);
         setContent(content);
 
-        final NativeSelect select = new NativeSelect(
-                "Add Column with Renderer", Arrays.asList(Renderers.values()));
+        final NativeSelect select = new NativeSelect("Add Column with Renderer",
+                Arrays.asList(Renderers.values()));
         select.setItemCaptionMode(ItemCaptionMode.EXPLICIT);
         for (Renderers renderer : Renderers.values()) {
             select.setItemCaption(renderer, renderer.toString());
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
index df01b4dc81..d484e2cf30 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
@@ -24,8 +24,8 @@ import com.vaadin.tests.widgetset.client.gwtrpc.GwtRpcServiceTest;
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
-public class GwtRpcServletTest extends RemoteServiceServlet implements
-        GwtRpcServiceTest {
+public class GwtRpcServletTest extends RemoteServiceServlet
+        implements GwtRpcServiceTest {
 
     @Override
     public String giveMeThat(String that, String haveThis) {