Format Java files using Eclipse Neon and Vaadin settings

Using the same formatting in the 7.7 branch and the master branch
eases porting of fixes

Change-Id: I51b4693f2f120447702cf322ce4505608ad92987

1962 files changed, 11751 insertions, 11389 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..4f2100401f 100644
--- a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 {
@@ -280,7 +281,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
 
     /**
      * Parses application runner URIs.
-     * 
+     *
      * If request URL is e.g.
      * http://localhost:8080/vaadin/run/com.vaadin.demo.Calc then
      * <ul>
@@ -288,7 +289,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
      * <li>Runner servlet=run</li>
      * <li>Vaadin application=com.vaadin.demo.Calc</li>
      * </ul>
-     * 
+     *
      * @param request
      * @return string array containing widgetset URI, application URI and
      *         context, runner, application classname
@@ -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/CustomDeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/launcher/CustomDeploymentConfiguration.java
index da903c13e0..6198c39a66 100644
--- a/uitest/src/main/java/com/vaadin/launcher/CustomDeploymentConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/launcher/CustomDeploymentConfiguration.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
index 5861ede412..356ea24193 100644
--- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,7 +56,7 @@ import com.vaadin.launcher.util.BrowserLauncher;
 
 /**
  * Class for running Jetty servlet container within Eclipse project.
- * 
+ *
  */
 public class DevelopmentServerLauncher {
 
@@ -65,10 +65,10 @@ public class DevelopmentServerLauncher {
 
     /**
      * Main function for running Jetty.
-     * 
+     *
      * Command line Arguments are passed through to Jetty, see runServer method
      * for options.
-     * 
+     *
      * @param args
      * @throws Exception
      */
@@ -131,7 +131,7 @@ public class DevelopmentServerLauncher {
 
     /**
      * Run the server with specified arguments.
-     * 
+     *
      * @param serverArgs
      * @return
      * @throws Exception
@@ -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);
                                         }
@@ -353,7 +349,7 @@ public class DevelopmentServerLauncher {
 
     /**
      * Assign default value for given key.
-     * 
+     *
      * @param map
      * @param key
      * @param value
@@ -367,9 +363,9 @@ public class DevelopmentServerLauncher {
 
     /**
      * Parse all command line arguments into a map.
-     * 
+     *
      * Arguments format "key=value" are put into map.
-     * 
+     *
      * @param args
      * @return map of arguments key value pairs.
      */
@@ -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/launcher/util/BrowserLauncher.java b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java
index 04c6a46e64..0821070ab7 100644
--- a/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,13 +25,13 @@ import java.io.InputStreamReader;
 /**
  * This class opens default browser for DemoLauncher class. Default browser is
  * detected by the operating system.
- * 
+ *
  */
 public class BrowserLauncher {
 
     /**
      * Open browser on specified URL.
-     * 
+     *
      * @param url
      */
     public static void openBrowser(String url) {
diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
index a3fc282131..98312dd609 100644
--- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
+++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/CurrentTimeMillis.java b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java
index 0937c53864..f1e049405e 100644
--- a/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java
+++ b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 
 /**
  * Test UI (empty) to check high resolution time availability in browser.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CurrentTimeMillis extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 7b9f3d9926..c0c3399367 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,10 +39,10 @@ import com.vaadin.ui.VerticalLayout;
  * page (themes/example/layout/custom.html) and source code below. Body panel
  * contents are changed when menu items are clicked. Contents are HTML pages
  * located at themes/example/layout directory.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 4.0.0
- * 
+ *
  */
 public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication
         implements Listener {
@@ -113,15 +113,15 @@ 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);
     }
 
     /**
      * Login button clicked. Hide login components and replace username
      * component with "Welcome user Username" message.
-     * 
+     *
      */
     public void loginClicked() {
         username.setVisible(false);
@@ -129,14 +129,15 @@ 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));
     }
 
     /**
      * Set body panel caption, remove all existing components and add given
      * custom layout in it.
-     * 
+     *
      */
     public void setBody(String customLayout) {
         VerticalLayout bodyLayout = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
index f63989fafb..a092a065b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Simple test helper to test Focusable.focus() method.
- * 
+ *
  */
 public class FocusingComponents extends CustomComponent {
     GridLayout lo = new GridLayout(2, 1);
diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
index c62a9ea51b..15dc7c3b79 100644
--- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,10 +32,10 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin
  * UI components.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 4.0.0
- * 
+ *
  */
 public class LayoutDemo extends com.vaadin.server.LegacyApplication {
 
@@ -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);
 
     }
@@ -144,7 +147,7 @@ public class LayoutDemo extends com.vaadin.server.LegacyApplication {
 
     /**
      * Add multiple demo component to given layout.
-     * 
+     *
      * @param layout
      *            where components are added
      * @param numberOfComponents
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 559fc5ca0e..08e85a3c11 100644
--- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,15 +28,15 @@ import com.vaadin.ui.Window;
 /**
  * Simple program that demonstrates "modal windows" that block all access other
  * windows.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 4.0.1
  * @see com.vaadin.server.VaadinSession
  * @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..3276fb5f9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/OrderedLayoutSwapComponents.java b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
index 1474afe28c..8c6bcfe20e 100644
--- a/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,10 +27,10 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * This Component contains some simple test to see that component updates its
  * contents propertly.
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class OrderedLayoutSwapComponents extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 7e71c4dc76..5245fdfc44 100644
--- a/uitest/src/main/java/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,11 +37,11 @@ import com.vaadin.ui.VerticalLayout;
  * This is a demonstration of how URL parameters can be recieved and handled.
  * Parameters and URL:s can be received trough the windows by registering
  * URIHandler and ParameterHandler classes window.
- * 
+ *
  * @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/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index c58c73753f..5869494ac7 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 08f8bc4d7a..ef5b459af7 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..adb714c4cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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();
@@ -88,7 +90,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent {
 
     /**
      * Adds n Table components to given container
-     * 
+     *
      * @param testContainer2
      */
     private void populateContainer(VerticalLayout container, int n) {
diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index e9f04a4c85..1ac7620d5b 100644
--- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,9 +38,9 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin
  * UI components.
- * 
+ *
  * @author Vaadin Ltd.
- * 
+ *
  */
 public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
 
@@ -99,7 +99,8 @@ public class RandomLayoutStress 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");
         layoutA = new HorizontalLayout();
         // Add 4 random components
         fillLayout(layoutA, componentCountA);
@@ -161,7 +162,8 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
             break;
         case 4:
             // Link
-            result = new Link("", new ExternalResource("http://www.vaadin.com"));
+            result = new Link("",
+                    new ExternalResource("http://www.vaadin.com"));
             result.setCaption("Link component " + caption);
             break;
         case 5:
@@ -170,12 +172,11 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
             panelLayout.setMargin(true);
             result = new Panel(panelLayout);
             result.setCaption("Panel component " + caption);
-            panelLayout
-                    .addComponent(new Label(
-                            "Panel is a container for other components, by default it draws a frame around it's "
-                                    + "extremities and may have a caption to clarify the nature of the contained components' purpose."
-                                    + " Panel contains an layout where the actual contained components are added, "
-                                    + "this layout may be switched on the fly."));
+            panelLayout.addComponent(new Label(
+                    "Panel is a container for other components, by default it draws a frame around it's "
+                            + "extremities and may have a caption to clarify the nature of the contained components' purpose."
+                            + " Panel contains an layout where the actual contained components are added, "
+                            + "this layout may be switched on the fly."));
             ((Panel) result).setWidth("250px");
             break;
         case 6:
@@ -198,7 +199,7 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
 
     /**
      * Add demo components to given layout
-     * 
+     *
      * @param layout
      */
     private void fillLayout(Layout layout, int numberOfComponents) {
diff --git a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
index 84c9d70299..93577563e9 100644
--- a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..97327f58ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..d4feea0d67 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..4543538d7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -45,14 +45,14 @@ import com.vaadin.ui.VerticalLayout;
  * TestBench finds out testable classes within given java packages and adds them
  * to menu from where they can be executed. Class is considered testable if it
  * is of class Application or CustomComponent.
- * 
+ *
  * Note: edit TestBench.testablePackages array
- * 
+ *
  * @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;
@@ -269,13 +271,13 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements
     /**
      * Return all testable classes within given package. Class is considered
      * testable if it's superclass is Application or CustomComponent.
-     * 
+     *
      * @param packageName
      * @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/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index edd70ece4e..2d6047ac27 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,8 +53,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
     VerticalLayout main = new VerticalLayout();
 
     final String eventListenerString = "Component.Listener feedback: ";
-    Label eventListenerFeedback = new Label(eventListenerString
-            + " <no events occured>");
+    Label eventListenerFeedback = new Label(
+            eventListenerString + " <no events occured>");
     int count = 0;
 
     public TestCaptionWrapper() {
@@ -70,8 +70,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
     public void createNewView() {
         main.removeAllComponents();
 
-        main.addComponent(new Label(
-                "Each Layout and their contained components should "
+        main.addComponent(
+                new Label("Each Layout and their contained components should "
                         + "have icon, caption, description, user error defined. "
                         + "Eeach layout should contain similar components."));
 
@@ -136,16 +136,16 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         final Label label = new Label("Label " + count++);
         test(layout, label);
 
-        final Link link = new Link("Link " + count++, new ExternalResource(
-                "www.vaadin.com"));
+        final Link link = new Link("Link " + count++,
+                new ExternalResource("www.vaadin.com"));
         test(layout, link);
 
-        final NativeSelect nativeSelect = new NativeSelect("NativeSelect "
-                + count++);
+        final NativeSelect nativeSelect = new NativeSelect(
+                "NativeSelect " + count++);
         test(layout, nativeSelect);
 
-        final OptionGroup optionGroup = new OptionGroup("OptionGroup "
-                + count++);
+        final OptionGroup optionGroup = new OptionGroup(
+                "OptionGroup " + count++);
         test(layout, optionGroup);
 
         final ProgressIndicator pi = new ProgressIndicator();
@@ -169,8 +169,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         final Tree tree = new Tree("Tree " + count++);
         test(layout, tree);
 
-        final TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect "
-                + count++);
+        final TwinColSelect twinColSelect = new TwinColSelect(
+                "TwinColSelect " + count++);
         test(layout, twinColSelect);
 
         final Upload upload = new Upload("Upload (non-functional)", null);
@@ -186,7 +186,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
 
     /**
      * Stresses component by configuring it
-     * 
+     *
      * @param c
      */
     void test(AbstractComponent c) {
@@ -203,7 +203,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
 
     /**
      * Stresses component by configuring it in a given layout
-     * 
+     *
      * @param c
      */
     void test(Layout layout, AbstractComponent c) {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
index d431562c8e..7f9efc23a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.vaadin.tests;
 
@@ -15,7 +15,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * @author marc
- * 
+ *
  */
 public class TestComponentAddAndRecursion extends CustomComponent {
     Panel p;
@@ -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..bb3e4206af 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.vaadin.tests;
 
@@ -23,7 +23,7 @@ import com.vaadin.ui.themes.Reindeer;
 
 /**
  * @author marc
- * 
+ *
  */
 public class TestContainerChanges extends CustomComponent {
     Container cont = new IndexedContainer();
@@ -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/TestDateField.java b/uitest/src/main/java/com/vaadin/tests/TestDateField.java
index b5611b8246..b761ced34f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestDateField.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class TestDateField extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
index 7927b7f0ee..0becce7f93 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index d6c72ee8e9..63aba2bd92 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
index 705f2e1766..6215a6680f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
index e07d00a04f..b916d77527 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,10 +30,10 @@ import com.vaadin.ui.Select;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * This Component contains some simple test to see that component updates its
  * contents propertly.
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class TestForChildComponentRendering extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index f5edc40c56..c195e36cf9 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TestForGridLayoutChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index ba7d59fb2b..3c45c3fba4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,10 +30,10 @@ import com.vaadin.ui.Link;
 import com.vaadin.ui.Select;
 
 /**
- * 
+ *
  * This Component contains some simple test to see that component updates its
  * contents propertly.
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class TestForGridLayoutChildComponentRendering extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
index a4f2dcd106..4e27852104 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,11 +32,11 @@ import com.vaadin.ui.VerticalLayout;
  * TODO: Note you need to add Theme under WebContent/VAADIN/Themes/mytheme in
  * order to see actual visible results on the browser. Currently changes are
  * visible only by inspecting DOM.
- * 
+ *
  * @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..c570207a64 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 b8d1c17241..039276f85d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 Field.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 1963dfbf12..e75d52b56d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,11 +28,11 @@ import com.vaadin.ui.RichTextArea;
 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..2bb9b9b50e 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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();
     }
@@ -262,7 +264,7 @@ public class TestForStyledUpload extends LegacyApplication implements
 
         /**
          * Returns the fileName.
-         * 
+         *
          * @return String
          */
         @Override
@@ -272,7 +274,7 @@ public class TestForStyledUpload extends LegacyApplication implements
 
         /**
          * Returns the mimeType.
-         * 
+         *
          * @return String
          */
         public String getMimeType() {
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..783109a5de 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,14 +29,14 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * This Component contains some simple test to see that component updates its
  * contents propertly.
- * 
+ *
  * @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 67f7faf44e..7d4dc13cf2 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Some test cases for trees. Events panel logs events that happen server side.
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class TestForTrees extends CustomComponent implements Handler {
@@ -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 Field.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 0046457f30..f1db3e70a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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();
     }
@@ -334,7 +337,7 @@ public class TestForUpload extends CustomComponent implements
 
         /**
          * Returns the fileName.
-         * 
+         *
          * @return String
          */
         @Override
@@ -344,7 +347,7 @@ public class TestForUpload extends CustomComponent implements
 
         /**
          * Returns the mimeType.
-         * 
+         *
          * @return String
          */
         public String getMimeType() {
@@ -414,7 +417,7 @@ public class TestForUpload extends CustomComponent implements
 
         /**
          * Returns the fileName.
-         * 
+         *
          * @return String
          */
         @Override
@@ -424,7 +427,7 @@ public class TestForUpload extends CustomComponent implements
 
         /**
          * Returns the mimeType.
-         * 
+         *
          * @return String
          */
         public String getMimeType() {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
index 5de80fd833..a66eeab9c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..04d25b67b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TestIFrames.java b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
index 244ea10dfa..2611724fa7 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index 84ea616e3f..b6644b813b 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,9 +33,9 @@ import com.vaadin.ui.VerticalLayout;
  * and Datefield render their popups incorrectly. Popus tend to be "left behind"
  * from the actual components. When the page is even bigger or longer, the
  * popups are eventually rendered outside the visual parts of the page.
- * 
+ *
  * @author Ville Ingman
- * 
+ *
  */
 public class TestSelectAndDatefieldInDeepLayouts extends CustomComponent {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
index b8ade0d8b6..6f868b71fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..f5f0b5c7ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -262,13 +262,13 @@ public class TestSizeableIncomponents extends LegacyApplication {
         /**
          * Instantiates and populates component with test data to be ready for
          * testing.
-         * 
+         *
          * @return
          * @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/TestSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
index 0266bcc108..78b1abcaac 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index 238e7bf317..b248582f7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,9 +34,9 @@ import com.vaadin.ui.VerticalLayout;
  * items hierarchically into <code>com.vaadin.ui.Component.Tree</code>, how to
  * receive ExpandEvent and implement
  * <code>com.vaadin.ui.Tree.ExpandListener</code>.
- * 
+ *
  * @since 4.0.0
- * 
+ *
  */
 public class TreeFilesystem extends com.vaadin.server.LegacyApplication
         implements Tree.ExpandListener {
@@ -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);
@@ -91,7 +91,7 @@ public class TreeFilesystem extends com.vaadin.server.LegacyApplication
      * Populates files to tree as items. In this example items are of String
      * type that consist of file path. New items are added to tree and item's
      * parent and children properties are updated.
-     * 
+     *
      * @param file
      *            path which contents are added to tree
      * @param parent
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 55e57a7d92..0149b7afb6 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,12 +37,12 @@ import com.vaadin.ui.VerticalLayout;
  * <code>com.vaadin.data.util.FilesystemContainer</code>, how to read
  * <code>com.vaadin.ui.Component.Event</code> objects, how to receive and handle
  * any event by implementing <code>com.vaadin.ui.Component.Listener</code>.
- * 
+ *
  * @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..83e541e7d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..cbae212b33 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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);
         }
@@ -87,7 +88,7 @@ public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
 
     /**
      * Sample class which is bound to Vaadin components
-     * 
+     *
      */
     public class 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/VerifyAssertionsEnabled.java b/uitest/src/main/java/com/vaadin/tests/VerifyAssertionsEnabled.java
index aa757e5f24..5f4b362b06 100644
--- a/uitest/src/main/java/com/vaadin/tests/VerifyAssertionsEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyAssertionsEnabled.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/VerifyJreVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java
index 025a66f022..5ded17ab2f 100644
--- a/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
index c015b65e1f..2ab6be25ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
+++ b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
@@ -35,7 +35,7 @@ public class WindowWaiAriaRoles extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -86,7 +86,7 @@ public class WindowWaiAriaRoles extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -96,7 +96,7 @@ public class WindowWaiAriaRoles extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
index 0f4c179cee..aa1e925637 100644
--- a/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
@@ -55,7 +55,7 @@ public class ActionsOnInvisibleComponents extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -65,7 +65,7 @@ public class ActionsOnInvisibleComponents extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 e94a4b1ade..996e540081 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) {
         TextField tf = new TextField();
         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 146e85f5f3..70d636ed27 100644
--- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
@@ -18,7 +18,7 @@ import com.vaadin.ui.TextField;
 public class GAESyncTest extends LegacyApplication {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -3724319151122707926l;
 
@@ -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..5f42bfbace 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 080d36fa48..de04f39d7c 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -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 TextField reconnectDialogMessage = new TextField(
                 "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 TextField reconnectDialogReconnectAttempts = new TextField(
                 "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 TextField reconnectDialogReconnectInterval = new TextField(
                 "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 TextField reconnectDialogGracePeriod = new TextField(
                 "Reconnect dialog grace period (ms)");
         reconnectDialogGracePeriod.setConverter(Integer.class);
-        reconnectDialogGracePeriod
-                .setConvertedValue(getReconnectDialogConfiguration()
-                        .getDialogGracePeriod());
+        reconnectDialogGracePeriod.setConvertedValue(
+                getReconnectDialogConfiguration().getDialogGracePeriod());
         reconnectDialogGracePeriod
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
@@ -206,13 +204,13 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
 
         final CheckBox reconnectDialogModal = new CheckBox(
                 "Reconnect dialog modality");
-        reconnectDialogModal.setValue(getReconnectDialogConfiguration()
-                .isDialogModal());
+        reconnectDialogModal
+                .setValue(getReconnectDialogConfiguration().isDialogModal());
         reconnectDialogModal.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                getReconnectDialogConfiguration().setDialogModal(
-                        reconnectDialogModal.getValue());
+                getReconnectDialogConfiguration()
+                        .setDialogModal(reconnectDialogModal.getValue());
             }
         });
 
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..2494f9ce90 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..cfd3141b44 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..74c9073a15 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..9e463569c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..4608fe14b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..db9d053f26 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..29c8d2b24d 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 d8f7fface3..8f73d24a6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
@@ -37,8 +37,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);
             }
         }));
@@ -66,8 +66,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/ResynchronizeUI.java b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeUI.java
index 62331ec95e..721fc7185b 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java
index 7dbfa8cf40..e52f2cbc5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java b/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java
index 83d31b184e..47643484dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..272fae0334 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
index 3059017faa..ece0e51268 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/CleanupBrokenUI.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
index 4af4f23bfa..fc0dd2af3c 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Label;
 /**
  * Tests that UI is cleaned from session despite any errors that happen in
  * detach.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CleanupBrokenUI extends AbstractTestUIWithLog {
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..0781aed0f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..467bed010f 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..c21a5ed173 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..2f3a21162b 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/applicationservlet/InitParamUIProvider.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
index 3750fdd370..0e5a5290b6 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java
index 206e763497..1ac71f9fb9 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
index a7920b5410..6187a65c00 100644
--- a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
index 146e996eaf..fc4ac2a7e0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalSplitPanel;
 
 public abstract class AbstractComponentContainerTest<T extends AbstractComponentContainer>
-        extends AbstractComponentTest<T> implements ComponentAttachListener,
-        ComponentDetachListener {
+        extends AbstractComponentTest<T>
+        implements ComponentAttachListener, ComponentDetachListener {
 
     private String CATEGORY_COMPONENT_CONTAINER_FEATURES = "Component container features";
     private Command<T, ComponentSize> addButtonCommand = new Command<T, ComponentSize>() {
@@ -147,9 +147,11 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ComponentAttachListener) AbstractComponentContainerTest.this);
+                c.addListener(
+                        (ComponentAttachListener) AbstractComponentContainerTest.this);
             } else {
-                c.removeListener((ComponentAttachListener) AbstractComponentContainerTest.this);
+                c.removeListener(
+                        (ComponentAttachListener) AbstractComponentContainerTest.this);
             }
         }
     };
@@ -159,9 +161,11 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ComponentDetachListener) AbstractComponentContainerTest.this);
+                c.addListener(
+                        (ComponentDetachListener) AbstractComponentContainerTest.this);
             } else {
-                c.removeListener((ComponentDetachListener) AbstractComponentContainerTest.this);
+                c.removeListener(
+                        (ComponentDetachListener) AbstractComponentContainerTest.this);
             }
         }
     };
@@ -312,8 +316,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
         // addCommands.put("VerticalLayout", addVerticalLayoutCommand);
 
         ComponentSize[] sizes = new ComponentSize[] {
-                new ComponentSize(null, null),
-                new ComponentSize("200px", null),
+                new ComponentSize(null, null), new ComponentSize("200px", null),
                 new ComponentSize("100%", null),
                 new ComponentSize(null, "200px"),
                 new ComponentSize(null, "100%"),
@@ -352,8 +355,8 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
 
             createClickAction("auto", componentHeightCategory,
                     setComponentHeight, Integer.valueOf(i), null);
-            createClickAction("auto", componentWidthCategory,
-                    setComponentWidth, Integer.valueOf(i), null);
+            createClickAction("auto", componentWidthCategory, setComponentWidth,
+                    Integer.valueOf(i), null);
             for (String option : options) {
                 createClickAction(option, componentHeightCategory,
                         setComponentHeight, Integer.valueOf(i), option);
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..a3b432800c 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.";
@@ -111,11 +110,11 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
 
     /**
      * Override to add items to the "settings" menu.
-     * 
+     *
      * NOTE, Call super class first to preserve current order. If you override
      * this in a class and another class overrides it you might break tests
      * because the wrong items will be selected.
-     * 
+     *
      * @param settingsMenu
      */
     protected void populateSettingsMenu(MenuItem settingsMenu) {
@@ -208,7 +207,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
     /**
      * Construct the component that is to be tested. This method uses a no-arg
      * constructor by default. Override to customize.
-     * 
+     *
      * @return Instance of the component that is to be tested.
      * @throws IllegalAccessException
      * @throws InstantiationException
@@ -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));
     }
@@ -457,7 +457,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
     /**
      * Creates category named "category" with id "categoryId" in parent category
      * "parentCategory". Each categoryId must be globally unique.
-     * 
+     *
      * @param category
      * @param categoryId
      * @param parentCategory
@@ -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);
                 }
@@ -564,7 +565,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
 
     /**
      * Unselect all child menu items
-     * 
+     *
      * @param parent
      */
     protected void unselectChildren(MenuItem parent) {
@@ -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/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
index 8666956bdb..d46b9c2988 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -15,15 +15,24 @@ import com.vaadin.ui.Layout.SpacingHandler;
 public abstract class AbstractComponentTestCase<T extends AbstractComponent>
         extends TestBase {
 
-    protected static final ThemeResource ICON_16_HELP_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/16/help.png");
-    protected static final ThemeResource ICON_16_FOLDER_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/16/folder.png");
-    protected static final ThemeResource ICON_16_ERROR_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/16/error.png");
-    protected static final ThemeResource ICON_16_USER_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/16/user.png");
-    protected static final ThemeResource ICON_16_USER_PNG_UNCACHEABLE = uncacheableThemeResource("../runo/icons/16/user.png");
-    protected static final ThemeResource ICON_32_ATTENTION_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/32/attention.png");
-    protected static final ThemeResource ICON_32_ATTENTION_PNG_UNCACHEABLE = uncacheableThemeResource("../runo/icons/32/attention.png");
-    protected static final ThemeResource ICON_64_EMAIL_REPLY_PNG_CACHEABLE = cacheableThemeResource("../runo/icons/64/email-reply.png");
-    protected static final ThemeResource ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE = uncacheableThemeResource("../runo/icons/64/email-reply.png");
+    protected static final ThemeResource ICON_16_HELP_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/16/help.png");
+    protected static final ThemeResource ICON_16_FOLDER_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/16/folder.png");
+    protected static final ThemeResource ICON_16_ERROR_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/16/error.png");
+    protected static final ThemeResource ICON_16_USER_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/16/user.png");
+    protected static final ThemeResource ICON_16_USER_PNG_UNCACHEABLE = uncacheableThemeResource(
+            "../runo/icons/16/user.png");
+    protected static final ThemeResource ICON_32_ATTENTION_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/32/attention.png");
+    protected static final ThemeResource ICON_32_ATTENTION_PNG_UNCACHEABLE = uncacheableThemeResource(
+            "../runo/icons/32/attention.png");
+    protected static final ThemeResource ICON_64_EMAIL_REPLY_PNG_CACHEABLE = cacheableThemeResource(
+            "../runo/icons/64/email-reply.png");
+    protected static final ThemeResource ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE = uncacheableThemeResource(
+            "../runo/icons/64/email-reply.png");
 
     private List<T> testComponents = new ArrayList<T>();
 
@@ -198,7 +207,8 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
 
     };
 
-    protected <VALUET> void doCommand(Command<T, VALUET> command, VALUET value) {
+    protected <VALUET> void doCommand(Command<T, VALUET> command,
+            VALUET value) {
         doCommand(command, value, null);
     }
 
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/AbstractOrderedLayoutWithCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
index c5dcba7e7b..34ae3baf6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test to see if AbstractOrderedLayout displays captions correctly with
  * expanding ratios.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbstractOrderedLayoutWithCaptions extends AbstractTestUI {
@@ -52,7 +52,7 @@ public class AbstractOrderedLayoutWithCaptions extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -62,7 +62,7 @@ public class AbstractOrderedLayoutWithCaptions extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..e2e9488a1a 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);
         }
     }
 
@@ -112,7 +111,7 @@ public abstract class AbstractTestUI extends UI {
      * is given. Supports transport=xhr (disables push), transport=websocket
      * (forces websocket into use), transport=streaming (forces streaming into
      * use). Using ?transport=xyz disables the fallback transport.
-     * 
+     *
      * @param request
      *            The UI init request
      */
@@ -154,7 +153,7 @@ public abstract class AbstractTestUI extends UI {
      * {@link #addComponent(Component)} instead to add the component to the
      * layout used by this UI. If you don't want to use the top-level layout
      * used by this class, you instead inherit directly from UI.
-     * 
+     *
      * @deprecated Use {@link #addComponent(Component)} or inherit from UI
      *             instead.
      */
@@ -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/AbstractTestUIWithLog.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIWithLog.java
index 6f97cbba05..83843bca99 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIWithLog.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIWithLog.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 c619ceb200..a15ed4427b 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 9bb01cd56f..b8a1527b9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
@@ -18,8 +18,8 @@ import com.vaadin.ui.Field;
 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";
 
@@ -51,7 +51,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
 
     /**
      * Override to provide custom actions for the test case.
-     * 
+     *
      * @param actions
      *            Array with default actions. Add custom actions to this. Never
      *            null.
@@ -64,7 +64,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
      * Method that creates the "actions" shown in the upper part of the screen.
      * Override this only if you do not want the default actions. Custom actions
      * can be added through #createCustomActions();
-     * 
+     *
      * @return A List with actions to which more actions can be added.
      */
     protected List<Component> createActions() {
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..8794c69abe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -147,7 +147,7 @@ public class DeclarativeTestUI extends AbstractTestUI {
      * the component to the receiving type; if there's a mismatch between what
      * you expect and what's written in the design, this will fail with a
      * ClassCastException.
-     * 
+     *
      * @return a Vaadin component
      */
     @SuppressWarnings("unchecked")
@@ -155,15 +155,15 @@ 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;
     }
 
     /**
      * Get access to the logger of this class
-     * 
+     *
      * @return a Logger instance
      */
     protected Logger getLogger() {
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 7c5f0c9282..e56a29c17c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
@@ -101,15 +101,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 +121,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/FileDownloaderUI.java b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
index b1379080e9..29c8ab5eaa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 cffc8ca27b..6764831d34 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 TextField text = new TextField("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/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
index 15f39f6e5d..f2d48a9ffa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @deprecated Use {@link AbstractTestUI} or {@link AbstractTestUIWithLog}
  *             instead. TestBase is a LegacyApplication
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java
index 06fec3b233..6aff2b4e2c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.ui.Button;
 
 /**
  * Test to see if tooltip delay is working properly.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TooltipDelay extends AbstractTestUI {
@@ -38,7 +38,7 @@ public class TooltipDelay extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -48,7 +48,7 @@ public class TooltipDelay extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java
index 30222722d9..18eae4c68d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * This UI is used for testing that a tooltip is not positioned partially
  * outside the browser window when there is enough space to display it.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TooltipPosition extends AbstractTestUI {
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/TouchDevicesTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
index 764d5a49a3..626f9c3565 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
@@ -26,8 +26,8 @@ public class TouchDevicesTooltip extends AbstractTestUI {
     private void createTextField(int n) {
         TextField textField = new TextField("Value" + n);
         textField.setConverter(new StringToIntegerConverter());
-        textField.addValidator(new IntegerRangeValidator(getErrorMessage(n), 0,
-                100));
+        textField.addValidator(
+                new IntegerRangeValidator(getErrorMessage(n), 0, 100));
         textField.setImmediate(true);
         textField.setValue("-5");
         addComponent(textField);
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/UnknownComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
index 982ff8d71e..e4c3eb7766 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 8b76b0e4e1..a92586d823 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..eaa450e070 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Tests how AbsoluteLayout handles relative sized contents.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("tests-tickets")
@@ -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(
@@ -60,7 +60,7 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
      * Creates an {@link AbsoluteLayout} of fixed size that contains a
      * full-sized {@link Table} that has been forced to full size with css.
      * Represents the workaround given for this ticket.
-     * 
+     *
      * @return the created layout
      */
     private Component createComparisonTableOnFixed() {
@@ -79,7 +79,7 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
     /**
      * Creates an {@link AbsoluteLayout} of fixed size that contains a
      * full-sized {@link Table}.
-     * 
+     *
      * @return the created layout
      */
     private Component createTableOnFixed() {
@@ -98,7 +98,7 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
     /**
      * Creates an {@link AbsoluteLayout} of fixed size that contains a
      * half-sized {@link Table}.
-     * 
+     *
      * @return the created layout
      */
     private Component createHalfTableOnFixed() {
@@ -163,7 +163,7 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
     /**
      * Creates an {@link AbsoluteLayout} of fixed size that contains a
      * fixed-sized {@link AbsoluteLayout}.
-     * 
+     *
      * @return the created layout
      */
     private Component createFullOnFixed() {
@@ -186,7 +186,7 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI {
     /**
      * Creates an {@link AbsoluteLayout} of full size that contains another
      * full-sized {@link AbsoluteLayout}.
-     * 
+     *
      * @return the created layout
      */
     private AbsoluteLayout createFullOnFull() {
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/AllComponentTooltipTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 777eb4b518..28ba5a6d92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
index e6daf8356c..51e5a13af5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
index f412be726a..8b3317a503 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
index 1a15e7c5ae..27780a3bc7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
index 5924ab7d32..6a0754eed3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
index 23be0f62b4..f9086f6401 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
index 0697286f38..fc1f596fb8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 2eef498aff..e621375bcf 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/AbstractFieldCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index 0aaa7c5f13..d210aeee6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
@@ -27,7 +27,8 @@ public class AbstractFieldCommitWithInvalidValues extends TestBase {
     protected void setup() {
         tf = new TextField("A field, must contain 1-2 chars",
                 new ObjectProperty<String>("a"));
-        tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false));
+        tf.addValidator(
+                new StringLengthValidator("Invalid length", 1, 2, false));
         tf.setBuffered(true);
         tf.setRequired(true);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index 496a44a6c1..a7dffc9de5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
@@ -18,9 +18,9 @@ import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
 
-public abstract class AbstractFieldTest<T extends AbstractField> extends
-        AbstractComponentTest<T> implements ValueChangeListener,
-        ReadOnlyStatusChangeListener {
+public abstract class AbstractFieldTest<T extends AbstractField>
+        extends AbstractComponentTest<T>
+        implements ValueChangeListener, ReadOnlyStatusChangeListener {
 
     private boolean sortValueChanges = true;
 
@@ -54,8 +54,8 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
         super.populateSettingsMenu(settingsMenu);
 
         if (AbstractField.class.isAssignableFrom(getTestClass())) {
-            MenuItem abstractField = settingsMenu
-                    .addItem("AbstractField", null);
+            MenuItem abstractField = settingsMenu.addItem("AbstractField",
+                    null);
             abstractField.addItem("Show value", new MenuBar.Command() {
 
                 @Override
@@ -101,8 +101,8 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
 
     private void createReadOnlyStatusChangeListener(String category) {
 
-        createBooleanAction("Read only status change listener", category,
-                false, readonlyStatusChangeListenerCommand);
+        createBooleanAction("Read only status change listener", category, false,
+                readonlyStatusChangeListenerCommand);
     }
 
     protected Command<T, Boolean> valueChangeListenerCommand = new Command<T, Boolean>() {
@@ -121,9 +121,11 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this);
+                c.addListener(
+                        (ReadOnlyStatusChangeListener) AbstractFieldTest.this);
             } else {
-                c.removeListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this);
+                c.removeListener(
+                        (ReadOnlyStatusChangeListener) AbstractFieldTest.this);
             }
         }
     };
@@ -189,7 +191,8 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
         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");
 
         createClickAction("(empty string)", subCategory, setValueCommand, "");
         createClickAction("(null)", subCategory, setValueCommand, null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index 1f407c710f..490c3175d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
@@ -48,7 +48,8 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField>
             if (value) {
                 c.addListener((TextChangeListener) AbstractTextFieldTest.this);
             } else {
-                c.removeListener((TextChangeListener) AbstractTextFieldTest.this);
+                c.removeListener(
+                        (TextChangeListener) AbstractTextFieldTest.this);
             }
         }
     };
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 d4b2f89522..8243848f97 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() {
         DateField df = new DateField("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 4fd81081ea..032381b932 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
@@ -17,13 +17,13 @@ public class DoubleInTextField extends AbstractComponentDataBindingTest {
 
         TextField salary = new TextField("Vaadin 7 - TextField with Double");
         addComponent(salary);
-        salary.setPropertyDataSource(new MethodProperty<Double>(person,
-                "salaryDouble"));
+        salary.setPropertyDataSource(
+                new MethodProperty<Double>(person, "salaryDouble"));
 
         TextField salary6 = new TextField("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 716c1d4348..5ba9e16207 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 TextField(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/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
index 56e593ce0f..ba1d38be63 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
@@ -72,7 +72,7 @@ public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -82,7 +82,7 @@ public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
index 41a5febc16..d41a71d0dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 33359cc2c6..5c6ea9fd6d 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.data.util.converter.Converter;
 
-public class Vaadin6ImplicitDoubleConverter implements
-        Converter<String, Double> {
+public class Vaadin6ImplicitDoubleConverter
+        implements Converter<String, Double> {
 
     @Override
     public Double convertToModel(String value,
diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java
index 46fdbac797..87c4a6bd46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test UI for Accordion: old widget should be removed from the tab.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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/accordion/AccordionRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
index 80e0929f8d..876be6d8f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Test for removing component from Accordion.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AccordionRemoveComponent extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
index af54e15b5a..9256848d2c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test UI for Accordion: tabs should stay selectable after remove tab.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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/ButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
index 9b10473d0f..c28df2fb15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ButtonIOSDragTest.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java
index 6031bff152..0b3eec3829 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java
index 35e9f737c6..2e9b5a9806 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test UI for availability (x,y) coordinates for button activated via keyboard.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ButtonKeyboardClick extends AbstractTestUI {
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 cfec4d1100..b577d271ea 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ButtonUpdateAltText.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java
index dd89d1b9a7..35b9c800ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.button;
 
@@ -28,7 +28,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -39,7 +39,7 @@ public class ButtonUpdateAltText extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -68,7 +68,7 @@ public class ButtonUpdateAltText extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -78,7 +78,7 @@ public class ButtonUpdateAltText extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/BeanItemContainerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
index bda3b34875..afc6f570c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
@@ -67,8 +67,8 @@ public class BeanItemContainerTestUI extends UI {
         // Add event table connected to same data source
         table = createTable();
         table.setContainerDataSource(events);
-        table.setVisibleColumns(new Object[] { "caption", "description",
-                "start", "end" });
+        table.setVisibleColumns(
+                new Object[] { "caption", "description", "start", "end" });
         content.addComponent(table);
 
         BasicEvent longEvent = new BasicEvent();
@@ -81,7 +81,7 @@ public class BeanItemContainerTestUI extends UI {
 
     /**
      * Creates a table with some actions
-     * 
+     *
      * @return
      */
     private Table createTable() {
@@ -94,7 +94,8 @@ public class BeanItemContainerTestUI extends UI {
             private final Action REMOVE = new Action("Remove event");
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 if (action == ADD) {
                     BasicEvent event = new BasicEvent();
                     event.setStart(new Date(100, 1, 1));
@@ -121,7 +122,7 @@ public class BeanItemContainerTestUI extends UI {
 
     /**
      * Opens up a modal dialog window where an event can be modified
-     * 
+     *
      * @param event
      *            The event to modify
      */
@@ -156,8 +157,8 @@ public class BeanItemContainerTestUI extends UI {
         fieldGroup.bind(startField, ContainerEventProvider.STARTDATE_PROPERTY);
         fieldGroup.bind(endField, ContainerEventProvider.ENDDATE_PROPERTY);
 
-        fieldGroup.setItemDataSource(new BeanItem<BasicEvent>(event, Arrays
-                .asList(ContainerEventProvider.CAPTION_PROPERTY,
+        fieldGroup.setItemDataSource(new BeanItem<BasicEvent>(event,
+                Arrays.asList(ContainerEventProvider.CAPTION_PROPERTY,
                         ContainerEventProvider.DESCRIPTION_PROPERTY,
                         ContainerEventProvider.STARTDATE_PROPERTY,
                         ContainerEventProvider.ENDDATE_PROPERTY)));
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..a8b76abf2e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..2f1bf8e734 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..799ed3c8d3 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
@@ -52,13 +52,14 @@ public class CalendarActionsUI extends UI {
 
             /*
              * (non-Javadoc)
-             * 
+             *
              * @see
              * com.vaadin.event.Action.Handler#handleAction(com.vaadin.event
              * .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",
@@ -69,7 +70,7 @@ public class CalendarActionsUI extends UI {
 
             /*
              * (non-Javadoc)
-             * 
+             *
              * @see com.vaadin.event.Action.Handler#getActions(java.lang.Object,
              * java.lang.Object)
              */
@@ -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..b884643cc7 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
  * Test: Vaadin Calendar: Navigation to invisible days of week (#12243)
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("tests-calendar")
@@ -40,7 +40,7 @@ public class CalendarBackwardForward extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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
 
         }
@@ -111,7 +114,7 @@ public class CalendarBackwardForward extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -121,7 +124,7 @@ public class CalendarBackwardForward extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..30fb67da1b 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.calendar;
 
@@ -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 15cde71838..29642a553c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..2122f7acd5 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha
 
 /**
  * Test UI for DnD regular (not all day event) in month view.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarMonthViewDndEvent extends AbstractTestUI {
@@ -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..c97f5ac257 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..13d5c837b9 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha
 
 /**
  * Test UI to check ability to reschedule events unlimited times.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarRescheduleEvent extends AbstractTestUI {
@@ -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/CalendarResizeOverlappingEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
index 2025ce2ea7..960d48e683 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,14 +30,14 @@ import com.vaadin.ui.components.calendar.event.CalendarEvent;
 import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarResizeOverlappingEvents extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -83,7 +83,7 @@ public class CalendarResizeOverlappingEvents extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -93,7 +93,7 @@ public class CalendarResizeOverlappingEvents extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..13c2f1f45d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,23 +27,23 @@ import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHand
 import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
- * 
+ *
  *         test for defect: Calendar event not shown correctly when partially
  *         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;
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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
 
         }
@@ -88,7 +88,7 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -98,7 +98,7 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
index b56f92962a..a8aca8e0d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
@@ -305,7 +305,8 @@ public class CalendarTest extends UI {
         event = getNewEvent("Appointment", start, end);
         event.setWhere("Office");
         event.setStyleName("color1");
-        event.setDescription("A longer description, which should display correctly.");
+        event.setDescription(
+                "A longer description, which should display correctly.");
         dataSource.addEvent(event);
 
         calendar.add(GregorianCalendar.DATE, 1);
@@ -407,9 +408,9 @@ public class CalendarTest extends UI {
                 // simulate week click
                 WeekClickHandler handler = (WeekClickHandler) calendarComponent
                         .getHandler(WeekClick.EVENT_ID);
-                handler.weekClick(new WeekClick(calendarComponent, calendar
-                        .get(GregorianCalendar.WEEK_OF_YEAR), calendar
-                        .get(GregorianCalendar.YEAR)));
+                handler.weekClick(new WeekClick(calendarComponent,
+                        calendar.get(GregorianCalendar.WEEK_OF_YEAR),
+                        calendar.get(GregorianCalendar.YEAR)));
             }
         });
 
@@ -449,8 +450,8 @@ public class CalendarTest extends UI {
 
     private void setWeekendsHidden(boolean weekendsHidden) {
         if (weekendsHidden) {
-            int firstToShow = (GregorianCalendar.MONDAY - calendar
-                    .getFirstDayOfWeek()) % 7;
+            int firstToShow = (GregorianCalendar.MONDAY
+                    - calendar.getFirstDayOfWeek()) % 7;
             calendarComponent.setFirstVisibleDayOfWeek(firstToShow + 1);
             calendarComponent.setLastVisibleDayOfWeek(firstToShow + 5);
         } else {
@@ -470,7 +471,8 @@ public class CalendarTest extends UI {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        calendarComponent.setReadOnly(readOnlyButton.getValue());
+                        calendarComponent
+                                .setReadOnly(readOnlyButton.getValue());
                     }
                 });
     }
@@ -485,7 +487,8 @@ public class CalendarTest extends UI {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        calendarComponent.setEnabled(!disabledButton.getValue());
+                        calendarComponent
+                                .setEnabled(!disabledButton.getValue());
                     }
                 });
     }
@@ -718,8 +721,8 @@ public class CalendarTest extends UI {
         s.setFilteringMode(FilteringMode.CONTAINS);
 
         Item i = s.addItem(DEFAULT_ITEMID);
-        i.getItemProperty("caption").setValue(
-                "Default (" + TimeZone.getDefault().getID() + ")");
+        i.getItemProperty("caption")
+                .setValue("Default (" + TimeZone.getDefault().getID() + ")");
         for (String id : TimeZone.getAvailableIDs()) {
             if (!s.containsId(id)) {
                 i = s.addItem(id);
@@ -1175,12 +1178,14 @@ public class CalendarTest extends UI {
 
     private void updateCaptionLabel() {
         DateFormatSymbols s = new DateFormatSymbols(getLocale());
-        String month = s.getShortMonths()[calendar.get(GregorianCalendar.MONTH)];
-        captionLabel.setValue(month + " "
-                + calendar.get(GregorianCalendar.YEAR));
+        String month = s.getShortMonths()[calendar
+                .get(GregorianCalendar.MONTH)];
+        captionLabel
+                .setValue(month + " " + calendar.get(GregorianCalendar.YEAR));
     }
 
-    private CalendarTestEvent getNewEvent(String caption, Date start, Date end) {
+    private CalendarTestEvent getNewEvent(String caption, Date start,
+            Date end) {
         CalendarTestEvent event = new CalendarTestEvent();
         event.setCaption(caption);
         event.setStart(start);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
index b4e759b20b..15199fcfcb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,7 +19,7 @@ import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
  * Test CalendarEvent implementation.
- * 
+ *
  * @see com.vaadin.addon.calendar.test.ui.Calendar.Event
  */
 public class CalendarTestEvent extends BasicEvent {
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..98e5ede3aa 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,10 +27,10 @@ import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHand
 import com.vaadin.ui.components.calendar.event.BasicEvent;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
- * 
+ *
  *         test for defect: calendar visible hours of day invalid shows invalid
  *         dates(week/day view) (#12521)
  */
@@ -42,7 +42,7 @@ public class CalendarVisibleHours extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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
 
         }
@@ -110,7 +113,7 @@ public class CalendarVisibleHours extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -120,7 +123,7 @@ public class CalendarVisibleHours extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/DndCalendarTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
index 62641aaba4..8178f9a745 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.Calendar;
 /**
  * Test UI for calendar as a drop target: CalendarTargetDetails should provide
  * getMouseEvent() method.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndCalendarTargetDetails extends DndTableTargetDetails {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
index 04b00dd039..b3b608310c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..6dce198c96 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..ffd289d047 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/CheckBoxImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
index fec753d5af..957d90c465 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index 22e260b442..72f4327d32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
@@ -46,7 +46,8 @@ public class CheckBoxNullValue extends TestBase {
                             .getErrorMessageForException(e));
                 }
                 valueLabel.setValue("Checkbox: " + checkbox.getValue()
-                        + "; Required checkbox: " + requiredCheckbox.getValue());
+                        + "; Required checkbox: "
+                        + requiredCheckbox.getValue());
             }
         });
         addComponent(valueLabel);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
index 0513c9db4f..fc220796a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
index f909f97996..8ccbbf14b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 6734c752de..6278d581b3 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> implements
-        ClickListener {
+public class CheckBoxes2 extends AbstractFieldTest<CheckBox>
+        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..cf76ec4ab6 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 544cdafaf0..5fdd4cf389 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -46,8 +46,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() {
@@ -104,7 +104,7 @@ public class ColorPickerTestUI extends AbstractTestUI implements
 
         /**
          * Instantiates a new my image source.
-         * 
+         *
          * @param fg
          *            the foreground
          * @param bg
@@ -130,14 +130,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. */
@@ -349,7 +347,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);
@@ -444,7 +443,7 @@ public class ColorPickerTestUI extends AbstractTestUI implements
     // This is called whenever a colorpicker popup is closed
     /**
      * Update display.
-     * 
+     *
      * @param fg
      *            the fg
      * @param bg
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
index d3dd0aeccc..bcdde0cd9a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.ColorPicker;
 
 /**
  * Test for color picker with default caption.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DefaultCaptionWidth extends AbstractTestUI {
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/ComboBoxClickIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
index b0450e22c3..6d4c6b3deb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.ComboBox;
 
 /**
  * Test UI to check click on icon in the combobox.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxClickIcon extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
index ccbde5f2df..ca66e2e71f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ComboBoxInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
index 082aca6989..2a2edc8074 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
index 8242eb9e57..da72349e81 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.ComboBox;
 /**
  * Test UI to verify that focus event actually update the ComboBox suggestion
  * popup
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxItemAddingWithFocusListener extends AbstractTestUI {
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/ComboBoxMouseSelectEnter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
index 5af4749349..141dd71a0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
index 802e7480f5..bc7941e00a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.ComboBox;
 
 /**
  * Tests mousewheel handling in ComboBox.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxMousewheel extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
index 6b0e42666f..c20b0a7e5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..f7f5a764ab 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..0dabc1a127 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());
             }
         });
     }
@@ -73,7 +73,7 @@ public class ComboBoxSQLContainerFilteredValueChange extends TestBase {
 
     /**
      * (Re)creates the test table
-     * 
+     *
      * @param connectionPool
      */
     private void createTestTable(JDBCConnectionPool connectionPool) {
@@ -99,7 +99,7 @@ public class ComboBoxSQLContainerFilteredValueChange extends TestBase {
 
     /**
      * Adds test data to the test table
-     * 
+     *
      * @param connectionPool
      * @throws SQLException
      */
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/ComboBoxScrollingWithArrows.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
index d9ae7da050..0794151932 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
@@ -29,7 +29,7 @@ public class ComboBoxScrollingWithArrows extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -42,7 +42,7 @@ public class ComboBoxScrollingWithArrows extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -52,7 +52,7 @@ public class ComboBoxScrollingWithArrows extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..1b02e9e5d8 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ComboBoxSetNullWhenNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
index a052a29bba..f6f22741c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 d1d2f58239..509824e836 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.addListener(new FieldEvents.FocusListener() {
             @Override
             public void focus(FocusEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
index f981b6fa07..66197cf483 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 d33a858dc8..ad4978c8e0 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() {
         TextField textField = new TextField("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/ComboBoxValoDoubleClick.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java
index f8886e3af7..250537f48e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 fe2cffdc4c..8588d77e30 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/ComboboxMenuBarAutoopen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
index f65b020bd1..d47bc5e7da 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.ui.Notification.Type;
 
 /**
  * Test UI for combobox popup which should be closed on any click outside it.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboboxMenuBarAutoopen extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
index 735491d80a..70d16fb62a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.ComboBox;
 /**
  * Test UI for issue #13488, where scrolling to the next page with pagelength 0
  * would break the rendering of any page except the first.
- * 
+ *
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
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..f07d8677a7 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.ComboBox;
 
 /**
  * Test UI for adding a stylename to a combobox with an undefined width.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboboxStyleChangeWidth extends AbstractTestUIWithLog {
@@ -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 5b2608b389..57b7551a84 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..f5b1109eed 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/CustomComponentHideContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
index 47dca9d57e..7b76da33d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/customfield/AbstractNestedFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
index 07c740a96d..a8682d8559 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
@@ -38,11 +38,11 @@ public abstract class AbstractNestedFormExample extends TestBase {
                 "taina.testaaja@example.com", "", "Ruukinkatu 2–4", 20540,
                 "Turku");
         Item item = table.addItem(person);
-        item.getItemProperty("Name").setValue(
-                person.getFirstName() + " " + person.getLastName());
+        item.getItemProperty("Name")
+                .setValue(person.getFirstName() + " " + person.getLastName());
         item = table.addItem(person2);
-        item.getItemProperty("Name").setValue(
-                person2.getFirstName() + " " + person2.getLastName());
+        item.getItemProperty("Name")
+                .setValue(person2.getFirstName() + " " + person2.getLastName());
         return table;
     }
 
@@ -58,8 +58,9 @@ public abstract class AbstractNestedFormExample extends TestBase {
                     removeComponent(personForm);
                 }
                 if (event.getProperty().getValue() != null) {
-                    personForm = new NestedPersonForm((Person) event
-                            .getProperty().getValue(), embeddedAddress);
+                    personForm = new NestedPersonForm(
+                            (Person) event.getProperty().getValue(),
+                            embeddedAddress);
                     personForm.setWidth("350px");
                     addComponent(personForm);
                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
index bc9f13c454..debeeba1d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
@@ -68,7 +68,8 @@ public class AddressField extends CustomField<Address> {
      * commit changes of the address form
      */
     @Override
-    public void commit() throws Buffered.SourceException, InvalidValueException {
+    public void commit()
+            throws Buffered.SourceException, InvalidValueException {
         addressForm.commit();
         super.commit();
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java
index e5ac67b32e..72e5a11fbc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java
@@ -29,9 +29,9 @@ public class AddressFormExample extends TestBase {
             public void buttonClick(ClickEvent event) {
                 field.commit();
                 Address address = field.getValue();
-                Notification.show("Address saved: "
-                        + address.getStreetAddress() + ", "
-                        + address.getPostalCode() + ", " + address.getCity());
+                Notification.show("Address saved: " + address.getStreetAddress()
+                        + ", " + address.getPostalCode() + ", "
+                        + address.getCity());
             }
         });
         addComponent(commitButton);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
index b6f46cadd0..b93028eccb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java
index 2703e01a27..5d7d3f1faa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java
@@ -10,10 +10,10 @@ import com.vaadin.ui.Layout;
 
 /**
  * Form that displays its fields in the layout of another form.
- * 
+ *
  * The fields are still logically part of this form even though they are in the
  * layout of the parent form. The embedded form itself is automatically hidden.
- * 
+ *
  * TODO Known issue: any field factory creating an {@link EmbeddedForm}
  * (directly or indirectly) should re-use the field once it has been created to
  * avoid the creation of duplicate fields when e.g. setting the visible item
@@ -25,7 +25,7 @@ public class EmbeddedForm extends Form {
 
     /**
      * Create a form that places its fields in another {@link Form}.
-     * 
+     *
      * @param parentForm
      *            form to which to embed the fields, not null
      */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java
index 9b40074433..16d99bb5ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java
@@ -39,8 +39,8 @@ public class NestedPersonForm extends Form {
         setItemDataSource(beanItem, Arrays.asList("firstName", "lastName",
                 "address", "email", "phoneNumber"));
         getFooter().addComponent(getButtonsLayout());
-        ((MarginHandler) getFooter()).setMargin(new MarginInfo(false, false,
-                true, true));
+        ((MarginHandler) getFooter())
+                .setMargin(new MarginInfo(false, false, true, true));
     }
 
     /**
@@ -87,8 +87,8 @@ public class NestedPersonForm extends Form {
             if ("address".equals(propertyId)) {
                 // create a custom field for the Address object
                 if (addressField == null) {
-                    Form form = (embeddedAddress && uiContext instanceof Form) ? (Form) uiContext
-                            : null;
+                    Form form = (embeddedAddress && uiContext instanceof Form)
+                            ? (Form) uiContext : null;
                     addressField = new AddressField(form);
                 }
                 f = addressField;
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 2e1ac21892..8bb0ef71d5 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.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TextField;
 
-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);
 
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 db5e81febf..31f33d356b 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 91b5dcc0ea..f979f8a7e5 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,10 +32,9 @@ 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 = new CustomLayout(new ByteArrayInputStream(
+                    "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>"
+                            .getBytes("UTF-8")));
             cl.addComponent(new TextField("This should be visible"), "first");
             Button button = new Button(
                     "This button is visible, together with one label");
@@ -47,8 +46,9 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
                 }
             });
             cl.addComponent(button, "second");
-            cl.addComponent(new TextField(
-                    "This won't be as the slot is missing"), "third");
+            cl.addComponent(
+                    new TextField("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/customlayout/CustomLayoutWithNullTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
index de1caf86df..37a99d989b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
index 54949a053d..03a8f795ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java
index 0832f5afeb..b4e36d3bc6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
index 1553594867..79c60f1984 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
@@ -48,7 +48,8 @@ public class CommitInvalid extends TestBase {
         /*
          * Create and configure Date Field, the actual component to be tested.
          */
-        dateProperty = new ObjectProperty<Date>(new Date(2009 - 1900, 4 - 1, 1));
+        dateProperty = new ObjectProperty<Date>(
+                new Date(2009 - 1900, 4 - 1, 1));
 
         dateField = new DateField("Year", dateProperty);
         dateField.setLocale(new Locale("fi", "FI"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
index fc3c8c97e8..ab48876afc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
index f51c75d57a..83eda35ef7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
@@ -172,8 +172,8 @@ public class CustomDateFormats extends TestBase {
 
         Label expectedLabel = new Label(expDateFormat.format(cal.getTime()));
         if (!pattern.equals(expectedDateFormat)) {
-            expectedLabel.setValue(expectedLabel.getValue()
-                    + " (differs from JDK)");
+            expectedLabel
+                    .setValue(expectedLabel.getValue() + " (differs from JDK)");
         }
         expectedLabel.setWidth(null);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
index 9dbd8fa6dc..86a5608aa2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java
index 9ce190a293..01d8f5cd0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDiscardValue.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDiscardValue.java
index 4839d02f3b..9303b6b38d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDiscardValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDiscardValue.java
@@ -17,8 +17,8 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test to demonstrate how discarding of field value works with various valid
  * and invalid data sources. Previously (Ticket #8069) the case where the
- * content of the datasource was null was not handled correctly. This value
- * is a valid data source value for the field, but discard did not actually discard
+ * content of the datasource was null was not handled correctly. This value is a
+ * valid data source value for the field, but discard did not actually discard
  * the value or remove error markers in this cases.
  *
  * @author Vaadin Ltd
@@ -29,11 +29,11 @@ public class DateFieldDiscardValue extends AbstractTestUI {
     public static final String PROP_NONULL = "A field with a valid date in the data source property";
     public static final String PROP_NULL_VALUE = "A field with a null value in the data source property";
     public static final String PROP_NULL = "A field with a null datasource property";
-    
+
     @Override
     protected void setup(VaadinRequest request) {
         String dateFormat = "dd/MM/yy";
-        
+
         final DateField df = new DateField(PROP_NONULL);
         df.setDateFormat(dateFormat);
         df.setBuffered(true);
@@ -41,7 +41,7 @@ public class DateFieldDiscardValue extends AbstractTestUI {
         try {
             date = new SimpleDateFormat(dateFormat).parse("25/07/16");
         } catch (ParseException e1) {
-            //This cannot happen
+            // This cannot happen
         }
         ObjectProperty<Date> prop = new ObjectProperty<Date>(date, Date.class);
         df.setPropertyDataSource(prop);
@@ -61,7 +61,7 @@ public class DateFieldDiscardValue extends AbstractTestUI {
         final DateField df1 = new DateField(PROP_NULL_VALUE);
         df1.setDateFormat(dateFormat);
         df1.setBuffered(true);
-       
+
         prop = new ObjectProperty<Date>(null, Date.class);
         df1.setPropertyDataSource(prop);
         button = new Button("Discard 2");
@@ -71,7 +71,7 @@ public class DateFieldDiscardValue extends AbstractTestUI {
             public void buttonClick(ClickEvent event) {
                 df1.discard();
             }
-            
+
         });
         hLayout = new HorizontalLayout(df1, button);
         layout.addComponent(hLayout);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
index 8a15d83121..615835245f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
@@ -38,7 +38,8 @@ public class DateFieldExtendedRange extends TestBase {
 
         fields[4] = makeDateField(true, fi, "Finnish locale with week numbers");
         fields[4].setShowISOWeekNumbers(true);
-        fields[5] = makeDateField(false, fi, "Finnish locale with week numbers");
+        fields[5] = makeDateField(false, fi,
+                "Finnish locale with week numbers");
         fields[5].setShowISOWeekNumbers(true);
 
         for (DateField f : fields) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java
index b38f58e5cc..b3695a3c5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
index fab97f46cb..864da0b871 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
@@ -96,8 +96,8 @@ public class DateFieldInSubWindow extends AbstractTestCase {
                 BeanItem<MyBean> myBeanItem = new BeanItem<MyBean>(myBean);
                 generalForm.setItemDataSource(myBeanItem);
 
-                generalForm.setVisibleItemProperties(new String[] { "myDate",
-                        "myString" });
+                generalForm.setVisibleItemProperties(
+                        new String[] { "myDate", "myString" });
                 generalForm.setValidationVisible(true);
                 layout.addComponent(generalForm);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
index 8157ce5028..8af47d6e2a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
index 60508a30d4..a1a88a4e79 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
index 247d1a079c..cd9e760f51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index 1baea1b793..1f5eb4b394 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
@@ -59,7 +59,8 @@ public class DateFieldPopupOffScreen extends AbstractTestCase {
         DateField df = new DateField();
         df.setLocale(new Locale("fi"));
         df.setResolution(Resolution.SECOND);
-        df.setDescription("This is a long, multiline tooltip.<br/>It should always be on screen so it can be read.");
+        df.setDescription(
+                "This is a long, multiline tooltip.<br/>It should always be on screen so it can be read.");
         df.setValue(new Date(1000000L));
         return df;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
index 4469ad3b1a..deba861ea2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.PopupDateField;
 
 /**
  * Test UI for date field Popup calendar.
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class DateFieldPopupPosition extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
index e477ee8487..f81e12151b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
@@ -18,8 +18,8 @@ public class DateFieldPrimaryStyleNames extends TestBase {
         idf.setPrimaryStyleName("my-inline-datefield");
         addComponent(idf);
 
-        addComponent(new Button("Set primary stylename",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Set primary stylename", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         df.setPrimaryStyleName("my-second-datefield");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index 070631bac2..fc31491afe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
@@ -86,34 +86,34 @@ public class DateFieldRangeValidation extends TestBase {
 
         actualDateField = createDateField();
         actualDateField.setValue(new Date(2011 - 1900, 12 - 1, 1));
-        actualDateField.addValidator(new RangeValidator<Date>("", Date.class,
-                null, null) {
-            @Override
-            public boolean isMinValueIncluded() {
-                return range.isFromInclusive();
-            }
-
-            @Override
-            public boolean isMaxValueIncluded() {
-                return range.isToInclusive();
-            }
-
-            @Override
-            public Date getMaxValue() {
-                return range.getTo();
-            }
-
-            @Override
-            public Date getMinValue() {
-                return range.getFrom();
-            }
-
-            @Override
-            public String getErrorMessage() {
-                return "Date must be in range " + getMinValue() + " - "
-                        + getMaxValue();
-            }
-        });
+        actualDateField.addValidator(
+                new RangeValidator<Date>("", Date.class, null, null) {
+                    @Override
+                    public boolean isMinValueIncluded() {
+                        return range.isFromInclusive();
+                    }
+
+                    @Override
+                    public boolean isMaxValueIncluded() {
+                        return range.isToInclusive();
+                    }
+
+                    @Override
+                    public Date getMaxValue() {
+                        return range.getTo();
+                    }
+
+                    @Override
+                    public Date getMinValue() {
+                        return range.getFrom();
+                    }
+
+                    @Override
+                    public String getErrorMessage() {
+                        return "Date must be in range " + getMinValue() + " - "
+                                + getMaxValue();
+                    }
+                });
         addComponent(fromField);
         addComponent(fromInclusive);
         addComponent(toField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
index 2daa3e3f96..477fab5590 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
@@ -148,8 +148,8 @@ public class DateFieldRanges extends AbstractTestUI {
         Calendar endCal = createCalendar();
         endCal.add(Calendar.DATE, 30);
 
-        dynamicDateField = createDateField(startCal.getTime(),
-                endCal.getTime(), null, Resolution.DAY, false);
+        dynamicDateField = createDateField(startCal.getTime(), endCal.getTime(),
+                null, Resolution.DAY, false);
         inlineDynamicDateField = createDateField(startCal.getTime(),
                 endCal.getTime(), null, Resolution.DAY, true);
 
@@ -210,8 +210,8 @@ public class DateFieldRanges extends AbstractTestUI {
         DateField df = createDateField(startCal.getTime(), endCal.getTime(),
                 null, Resolution.DAY, false);
         gl.addComponent(df);
-        DateField inline = createDateField(startCal.getTime(),
-                endCal.getTime(), null, Resolution.DAY, true);
+        DateField inline = createDateField(startCal.getTime(), endCal.getTime(),
+                null, Resolution.DAY, true);
         gl.addComponent(inline);
         inline.setId("staticInline");
         VerticalLayout vl = new VerticalLayout();
@@ -237,9 +237,8 @@ public class DateFieldRanges extends AbstractTestUI {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                label.setValue((gg.getValue() == null ? "Nothing" : gg
-                        .getValue().toString())
-                        + " selected. isValid: "
+                label.setValue((gg.getValue() == null ? "Nothing"
+                        : gg.getValue().toString()) + " selected. isValid: "
                         + gg.isValid());
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
index 10718cae8b..0f25ee5440 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -31,7 +31,8 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
     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/datefield/DateFieldWhenChangingValueAndEnablingParent.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
index 2c5e9e251b..56b2e5e8f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
@@ -11,7 +11,8 @@ import com.vaadin.ui.DateField;
 import com.vaadin.ui.PopupDateField;
 import com.vaadin.ui.VerticalLayout;
 
-public class DateFieldWhenChangingValueAndEnablingParent extends AbstractTestUI {
+public class DateFieldWhenChangingValueAndEnablingParent
+        extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -55,8 +56,8 @@ public class DateFieldWhenChangingValueAndEnablingParent extends AbstractTestUI
     }
 
     private DateField createDateField(boolean enabled) {
-        DateField df = new DateField("DateField, "
-                + (enabled ? "enabled" : "disabled"));
+        DateField df = new DateField(
+                "DateField, " + (enabled ? "enabled" : "disabled"));
         df.setEnabled(enabled);
         df.setId("DATEFIELD_" + (enabled ? "ENABLED" : "DISABLED"));
         return df;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
index d3bc4267ec..c97f3deb3c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
index 8e4de77837..4fdf9eab76 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,9 +17,9 @@ package com.vaadin.tests.components.datefield;
 
 /**
  * Test UI for date field Popup calendar in default theme.
- * 
+ *
  * All UI initialization is defined in super class.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DefaultDateFieldPopupPosition extends DateFieldPopupPosition {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index b5842694f0..e1782348d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
@@ -25,10 +25,11 @@ public class DefaultHandleUnparsableDateField extends TestBase {
             }
         });
 
-        final DateField validated = new DateField("Validated Default DateField");
+        final DateField validated = new DateField(
+                "Validated Default DateField");
         validated.setImmediate(true);
-        validated.addValidator(new NullValidator("Validator: Date is NULL",
-                false));
+        validated.addValidator(
+                new NullValidator("Validator: Date is NULL", false));
         addComponent(validated);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
index 49590a3cee..0798bb08b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
index affc5d322c..aaebb2e1a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
index 49d88630a8..f0d0577039 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.DateField;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DisabledParentLayout extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
index 31f97afabd..576d49aa18 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
@@ -63,16 +63,16 @@ public class DynamicallyChangeDateRange extends AbstractTestUI {
      * @param i
      */
     private void setRange(DateField df, int days) {
-        df.setRangeStart(new Date(df.getValue().getTime() - days * 24 * 60 * 60
-                * 1000));
-        df.setRangeEnd(new Date(df.getValue().getTime() + days * 24 * 60 * 60
-                * 1000));
+        df.setRangeStart(
+                new Date(df.getValue().getTime() - days * 24 * 60 * 60 * 1000));
+        df.setRangeEnd(
+                new Date(df.getValue().getTime() + days * 24 * 60 * 60 * 1000));
 
     }
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -82,7 +82,7 @@ public class DynamicallyChangeDateRange extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
index 1f8ef358af..669d691634 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
@@ -46,8 +46,8 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> {
 
     private InlineDateField createInlineDateField(String caption, String width,
             Locale locale) {
-        InlineDateField pd = new InlineDateField(caption + "("
-                + locale.toString() + ")");
+        InlineDateField pd = new InlineDateField(
+                caption + "(" + locale.toString() + ")");
         pd.setWidth(width);
         pd.setValue(new Date(12312312313L));
         pd.setLocale(locale);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
index 585395d747..0c99aa6664 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
@@ -75,8 +75,8 @@ public class LenientMode extends TestBase implements ValueChangeListener {
 
     @Override
     public void valueChange(ValueChangeEvent event) {
-        getMainWindow().showNotification(
-                "New value" + event.getProperty().getValue());
+        getMainWindow()
+                .showNotification("New value" + event.getProperty().getValue());
 
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
index f69c93419b..e5ac1ac6ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
index 9c2d3d7d51..43f4bbd3ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
@@ -18,8 +18,8 @@ public class LowResolution extends TestBase {
         dateField.addListener(new PopupDateField.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                getMainWindow().showNotification(
-                        "Date now" + event.getProperty());
+                getMainWindow()
+                        .showNotification("Date now" + event.getProperty());
             }
         });
         dateField.setImmediate(true);
@@ -31,8 +31,8 @@ public class LowResolution extends TestBase {
         dateField3.addListener(new PopupDateField.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                getMainWindow().showNotification(
-                        "Date now" + event.getProperty());
+                getMainWindow()
+                        .showNotification("Date now" + event.getProperty());
             }
         });
         dateField3.setImmediate(true);
@@ -44,8 +44,8 @@ public class LowResolution extends TestBase {
         dateField2.addListener(new PopupDateField.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                getMainWindow().showNotification(
-                        "Date now" + event.getProperty());
+                getMainWindow()
+                        .showNotification("Date now" + event.getProperty());
             }
         });
         dateField2.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
index 0b8ffa52fa..dec7e17453 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
index a267d72b7f..34aa8a0d48 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.TextField;
 /**
  * Tests that state change doesn't set input prompt back to PopupDateField if
  * focus is still in the input field.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupDateFieldInputPrompt extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
index 130ed8f3c5..79dd1b22df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
@@ -18,8 +18,8 @@ public class PopupDateFieldTextEnabled extends TestBase {
 
             @Override
             public void valueChange(Property.ValueChangeEvent event) {
-                field.setTextFieldEnabled((Boolean) event.getProperty()
-                        .getValue());
+                field.setTextFieldEnabled(
+                        (Boolean) event.getProperty().getValue());
                 if (field.isTextFieldEnabled()) {
                     box.setCaption(ENABLED);
                 } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index 62a788f4c2..df2825dc66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.datefield;
 
@@ -33,7 +33,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.NativeSelect;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -43,7 +43,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -86,7 +86,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -96,7 +96,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
index 9daf89d950..9bc567c0fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
@@ -42,8 +42,8 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
 
     private PopupDateField createPopupDateField(String caption, String width,
             Locale locale) {
-        PopupDateField pd = new PopupDateField(caption + "("
-                + locale.toString() + ")");
+        PopupDateField pd = new PopupDateField(
+                caption + "(" + locale.toString() + ")");
         pd.setWidth(width);
         pd.setValue(new Date(12312312313L));
         pd.setLocale(locale);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
index 59ff6aa9e8..60f1ac0782 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,9 +19,9 @@ import com.vaadin.annotations.Theme;
 
 /**
  * Test UI for date field Popup calendar in Valo theme.
- * 
+ *
  * All UI initialization is defined in super class.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
index b820ccf788..6d92bd51a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
index c7e16440bc..17d3185b17 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test UI for text area inside {@link DragAndDropWrapper}: text area should
  * obtain focus on click.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
index 90ec704a8c..3b173847cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test UI for DnD image element size
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DragAndDropRelativeWidth extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
index 2ce3a42957..149c13856b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test UI for text area: drag image should contain text-area text.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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..c00c23a537 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/EmbeddedThemeResource.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
index ecc746b858..a92c761465 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.themes.Reindeer;
  * Tests that {@link Embedded} uses correct theme when the theme is set with
  * {@link #setTheme(String)}, and also updates correctly if theme is changed
  * later. {@link Image} is used as the baseline for correct behaviour.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class EmbeddedThemeResource extends AbstractTestUI {
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/form/FormClearDatasourceRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
index df403ceb78..241c5ff928 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
@@ -49,12 +49,12 @@ public class FormClearDatasourceRepaint extends TestBase {
             }
         }));
 
-        addComponent(new Button("Change data source",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Change data source", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        form.setItemDataSource(new BeanItem<MyBean>(
-                                new MyBean()));
+                        form.setItemDataSource(
+                                new BeanItem<MyBean>(new MyBean()));
                     }
                 }));
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index b6b0624ba0..1fefe897d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
@@ -28,7 +28,8 @@ public class FormCommitWithInvalidValues extends TestBase {
         form = new Form();
         form.setFooter(null);
         TextField tf = new TextField("A field, must contain 1-2 chars");
-        tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false));
+        tf.addValidator(
+                new StringLengthValidator("Invalid length", 1, 2, false));
         tf.setRequired(true);
 
         form.addField("a", tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java
index 76ea039756..fedf86f675 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java
@@ -15,8 +15,8 @@ public class FormDescription extends TestBase {
         form.addField("AAAA", new TextField());
         addComponent(form);
 
-        addComponent(new Button("Toggle description",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Toggle description", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         if (form.getDescription() == null) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java
index fea24d92ad..2d9e8252f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,8 @@ public class FormErrorVisible extends AbstractTestUI {
         addComponent(new Label("The end to see where the last form ends"));
     }
 
-    private Form buildForm(String caption, boolean withError, boolean withFooter) {
+    private Form buildForm(String caption, boolean withError,
+            boolean withFooter) {
         Form form = new Form();
         form.setCaption(caption);
         form.addField("value", new TextField("MyField"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java
index 25487fba7c..f593f15ac5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java
@@ -14,7 +14,8 @@ public class FormFieldCaptions extends TestBase {
         Form form1 = new Form();
         Item item1 = createItem();
         for (Object propertyId : item1.getItemPropertyIds()) {
-            form1.addItemProperty(propertyId, item1.getItemProperty(propertyId));
+            form1.addItemProperty(propertyId,
+                    item1.getItemProperty(propertyId));
         }
 
         // Method 2
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java
index a47ab944a2..7e22818906 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java
@@ -14,11 +14,11 @@ public class FormNotGettingSmaller extends TestBase {
     @Override
     protected void setup() {
         Item item = new PropertysetItem();
-        item.addItemProperty("name", new ObjectProperty<String>(
-                "Charles Anthony"));
+        item.addItemProperty("name",
+                new ObjectProperty<String>("Charles Anthony"));
         item.addItemProperty("city", new ObjectProperty<String>("London"));
-        item.addItemProperty("isTallPerson", new ObjectProperty<Boolean>(
-                Boolean.FALSE));
+        item.addItemProperty("isTallPerson",
+                new ObjectProperty<Boolean>(Boolean.FALSE));
 
         Label spacer = new Label();
         HorizontalLayout buttons = new HorizontalLayout();
@@ -30,7 +30,8 @@ public class FormNotGettingSmaller extends TestBase {
         buttons.setExpandRatio(spacer, 1f);
 
         Form form = new Form();
-        form.setDescription("Ooh. Just a demonstration of things, really. Some long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.");
+        form.setDescription(
+                "Ooh. Just a demonstration of things, really. Some long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.");
 
         form.setItemDataSource(item);
         form.setFooter(buttons);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java
index 241c39d449..8a666a064a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java
@@ -24,8 +24,8 @@ public class FormPrimaryStyleName extends TestBase {
 
         addComponent(form);
 
-        addComponent(new Button("Set primary stylename",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Set primary stylename", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         form.setPrimaryStyleName("my-second-form");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
index 604beb5fcc..ad137f5a92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
@@ -54,7 +54,8 @@ public class FormTest extends AbstractFieldTest<Form> {
     private Command<Form, Class<? extends Layout>> formLayoutCommand = new Command<Form, Class<? extends Layout>>() {
 
         @Override
-        public void execute(Form c, Class<? extends Layout> value, Object data) {
+        public void execute(Form c, Class<? extends Layout> value,
+                Object data) {
             if (value == null) {
                 c.setLayout(null);
             } else {
@@ -77,7 +78,8 @@ public class FormTest extends AbstractFieldTest<Form> {
     private Command<Form, Class<? extends Layout>> formFooterCommand = new Command<Form, Class<? extends Layout>>() {
 
         @Override
-        public void execute(Form c, Class<? extends Layout> value, Object data) {
+        public void execute(Form c, Class<? extends Layout> value,
+                Object data) {
             if (value == null) {
                 c.setFooter(null);
             } else {
@@ -219,15 +221,15 @@ public class FormTest extends AbstractFieldTest<Form> {
 
         LinkedHashMap<String, Alignment> alignmentOptions = new LinkedHashMap<String, Alignment>();
         for (AlignmentInfo horizontal : new AlignmentInfo[] {
-                AlignmentInfo.LEFT, AlignmentInfo.CENTER, AlignmentInfo.RIGHT }) {
+                AlignmentInfo.LEFT, AlignmentInfo.CENTER,
+                AlignmentInfo.RIGHT }) {
             for (AlignmentInfo vertical : new AlignmentInfo[] {
                     AlignmentInfo.TOP, AlignmentInfo.MIDDLE,
                     AlignmentInfo.BOTTOM }) {
-                Alignment a = new Alignment(horizontal.getBitMask()
-                        + vertical.getBitMask());
-                alignmentOptions.put(
-                        a.getHorizontalAlignment() + " "
-                                + a.getVerticalAlignment(), a);
+                Alignment a = new Alignment(
+                        horizontal.getBitMask() + vertical.getBitMask());
+                alignmentOptions.put(a.getHorizontalAlignment() + " "
+                        + a.getVerticalAlignment(), a);
 
             }
 
@@ -238,8 +240,8 @@ public class FormTest extends AbstractFieldTest<Form> {
             public void execute(Form c, Alignment value, Object data) {
                 Layout l = c.getFooter();
                 if (l instanceof AlignmentHandler) {
-                    ((AlignmentHandler) l).setComponentAlignment(l
-                            .getComponentIterator().next(), value);
+                    ((AlignmentHandler) l).setComponentAlignment(
+                            l.getComponentIterator().next(), value);
                 }
 
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java
index 6e823204e9..2b248c6389 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java
@@ -33,9 +33,10 @@ public class FormTooltips extends AbstractTestUI {
         final Form form = new Form();
         form.setId("tooltipForm");
         form.setDescription("Some description");
-        form.setItemDataSource(new BeanItem<Person>(new Person("foo", "bar",
-                "baz", 12, Sex.MALE, null)), Arrays.asList(new String[] {
-                "firstName", "lastName", "age" }));
+        form.setItemDataSource(
+                new BeanItem<Person>(
+                        new Person("foo", "bar", "baz", 12, Sex.MALE, null)),
+                Arrays.asList(new String[] { "firstName", "lastName", "age" }));
         ((TextField) form.getField("firstName"))
                 .setDescription("Fields own tooltip");
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
index 24d207739e..d2ea66e838 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
@@ -31,7 +31,8 @@ public class FormWithPropertyFormatterConnected extends TestBase {
                                 throws Exception {
                             String str = formattedValue.replaceAll("[^0-9.]",
                                     "");
-                            if (formattedValue.toLowerCase().contains("months")) {
+                            if (formattedValue.toLowerCase()
+                                    .contains("months")) {
                                 return Double.parseDouble(str) / 12;
                             }
                             return Double.parseDouble(str);
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..67320bb244 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test UI for Form layout click listener.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FormLayoutClickListener extends AbstractTestUIWithLog {
@@ -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/FormLayoutErrorHover.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index d3932c1df0..3de159facb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
index 45cb55637c..6e85898f0e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Test UI for H2 label inside FormLayout.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
index 7ed91979e2..6c600dddfc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java
index 6b17c557da..c4c7d3fd3f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 fc90427c79..cb35e778cc 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java
index 8ca88fbcd3..f40722afa2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.FormLayout;
 /**
  * Test UI for FormLayout: custom additional styles should be prefixed with
  * "v-formlayout-", not "v-layout-".
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StylePrefix extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
index 3e25f45283..65b8af12f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..e35448ad0e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridAddAndRemoveDataOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
index 36d92d79a0..ed801322fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
index fa2d7b5399..71c9f4ed2b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..7803106f7c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridCheckBoxDisplay.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
index e6aff73532..d97248eb2c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..4db47d3823 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..5d59d8946c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridColumnAutoExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
index 5333b3698e..b2a213b84d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
index a5a8b62d87..568ed3e867 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..418a740a76 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..f9009f5597 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridColumnWidthRecalculation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
index 43584eb5e1..a687f6258a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..0be2ad8cf0 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridCustomSelectionModel.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
index 008c24cdd3..e14862f9b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
index b49cf32b62..62b2f46ece 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
index e2f2704a5d..65e4eba08a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..9034e48830 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
index be82b49f0c..428c6e3569 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.ui.Label;
 /**
  * Tests the layouting of Grid's details row when it contains a HorizontalLayout
  * with expand ratios.
- * 
+ *
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
index 2880df44b0..fb50e77e37 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -43,8 +43,8 @@ public class GridDetailsLocation extends UI {
         @Override
         public Component getDetails(RowReference rowReference) {
             Person person = (Person) rowReference.getItemId();
-            Label label = new Label(person.getFirstName() + " "
-                    + person.getLastName());
+            Label label = new Label(
+                    person.getFirstName() + " " + person.getLastName());
             // currently the decorator row doesn't change its height when the
             // content height is different.
             label.setHeight("30px");
@@ -82,16 +82,16 @@ public class GridDetailsLocation extends UI {
         numberTextField.setImmediate(true);
         layout.addComponent(numberTextField);
 
-        layout.addComponent(new Button("Toggle and scroll",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Toggle and scroll", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         toggle();
                         scrollTo();
                     }
                 }));
-        layout.addComponent(new Button("Scroll and toggle",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Scroll and toggle", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         scrollTo();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
index 4955f499ba..31d287caf8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
index d77a8ddedc..8a2aeb3d2b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
index 1af1ad02d6..ce434115f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
index d3e0a2a7c7..61cb383b71 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
index e5532b10ad..d5cfca2091 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
index 4703c98994..b1c6ee57c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
index d2414a8c40..65bfdf0e68 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 0a302967e8..122d50399e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
index 181c9cae8d..392b1e7c00 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
index 2782a5fc6c..d11edd7f7b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
index 6c2efc9a25..8290757949 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -89,8 +89,8 @@ public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
     }
 
     private void addRemoveHeaderRow(final Grid grid, final HeaderRow row) {
-        row.getCell("action").setComponent(
-                new Button("Remove row", new ClickListener() {
+        row.getCell("action")
+                .setComponent(new Button("Remove row", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         grid.removeHeaderRow(row);
@@ -100,8 +100,8 @@ public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
     }
 
     private void addRemoveFooterRow(final Grid grid, final FooterRow row) {
-        row.getCell("action").setComponent(
-                new Button("Remove row", new ClickListener() {
+        row.getCell("action")
+                .setComponent(new Button("Remove row", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         grid.removeFooterRow(row);
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..be4e7f5403 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..78f2cdccfe 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridInGridLayout.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
index 629eba9045..250f337bea 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..d02a08266c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridInWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
index 967e29e134..3f83882a10 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
index 49b344bb85..3df985142b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
index 4632810561..acc7811cd4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
index 51c2598cc0..9662a63852 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Tests that details row displays GridLayout contents properly.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class GridLayoutDetailsRow extends AbstractTestUI {
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..6317cbae9d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridMultiSelectionScrollBar.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
index be1f32164c..b641f6e214 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
index 180ed0ded9..576f80b8aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
index e81733cb86..998300246f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
index fe4a9884f5..cedf67f734 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
index c970f97500..958749e545 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
index 3fa861b32e..89dc661bb1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/GridScrollToLineWhileResizing.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
index 194a9a3acc..62dcf5271c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..3861aee70e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..bd4f200f4d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridSingleColumn.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
index 2ab0282102..b97036ab74 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..44c9b1bb0d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridSubPixelProblemWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
index 1e921bb18c..d68888e55e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 e233edc5d0..56c6a157a9 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
@@ -62,8 +62,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);
@@ -91,8 +91,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/GridThemeChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
index 76f7e22ee0..1f3e8ab0e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
index b0128e936a..1f70588c13 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -98,9 +98,8 @@ public class GridThemeUI extends AbstractTestUIWithLog {
             getColumn("age").getEditorField().addValidator(
                     new IntegerRangeValidator("Must be between 0 and 100", 0,
                             100));
-            getColumn("birthDate").setRenderer(
-                    new DateRenderer(DateFormat.getDateInstance(
-                            DateFormat.MEDIUM, Locale.US)));
+            getColumn("birthDate").setRenderer(new DateRenderer(
+                    DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
         }
     }
 
@@ -139,9 +138,8 @@ public class GridThemeUI extends AbstractTestUIWithLog {
             getColumn("age").getEditorField().addValidator(
                     new IntegerRangeValidator("Must be between 0 and 100", 0,
                             100));
-            getColumn("birthDate").setRenderer(
-                    new DateRenderer(DateFormat.getDateInstance(
-                            DateFormat.MEDIUM, Locale.US)));
+            getColumn("birthDate").setRenderer(new DateRenderer(
+                    DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
 
             addFooterRowAt(0);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
index 8d9847b428..1aa1fd15f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..3c4933c24d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GridWithBrokenRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
index 4d44eeb248..3315bd3b3f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
index 91c5a06c66..789d9cf2b8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
index fd5e6fdc01..0a418006f5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
index b6da30d314..4177c5ce00 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
index ba3fc9cd0b..582362f0fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..bb7a93d378 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..7b1a281cd9 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/MyBeanJSRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
index a2d1c08ea0..f615e009df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.grid.JavaScriptRenderers.MyBean;
 import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
index 10fe20c478..93a091eae7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..4cc3e35a5d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/PersonTestGrid.java b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
index f654cd153d..f15d100874 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
index 02919f5c1b..3341648482 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
index d8394acd19..f999d1e8e9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..f9605d625d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..82c699479f 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/EscalatorBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
index 8e1a80a830..92b45f6fb1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
index ef997b3cae..9d207ac690 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..5bf23686c9 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
@@ -24,7 +24,7 @@ import com.vaadin.ui.UI;
 
 /**
  * Initializer shell for GridClientBasicFeatures test application
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -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 c39feeb4da..18cfb56660 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -83,7 +83,7 @@ import com.vaadin.ui.renderers.NumberRenderer;
 
 /**
  * Tests the basic features like columns, footers and headers
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -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) {
@@ -1262,8 +1284,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);
@@ -1303,7 +1325,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));
@@ -1376,9 +1399,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);
                             }
                         }
                     }
@@ -1387,9 +1409,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 {
@@ -1520,8 +1543,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",
@@ -1542,7 +1565,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/GridBasicFeaturesValo.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
index aef353fe93..91ceb2289e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
index 3f84d40b01..65aaf0323b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..1e1921ce5c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/grid/basicfeatures/GridHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
index 0b6e6c36dd..a57f83907e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
index 9494988cf4..ef0d8aaf36 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
index 6d602baf06..9950bd99c2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
index 8be2dab8fd..29939fe636 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.Grid;
 /**
  * Tests that removing and adding rows doesn't cause an infinite loop in the
  * browser.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
index cd4bf4e69b..090f03923e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
index 83dbdf541e..6c55d8f8bd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
index 9673626f45..ab7dd7f786 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
index 8b3cd02d9e..dc334a1a87 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test UI for TOP_CENTER and TOP_RIGHT alignments in VerticalLayout.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComponentAlignments extends AbstractTestUI {
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/GridLayoutCaptionAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
index 063a36ca04..a00163e504 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 ce59f9c89f..b40e27ba73 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,9 +27,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);
 
@@ -68,7 +67,7 @@ public class GridLayoutExtraSpacing extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -79,7 +78,7 @@ public class GridLayoutExtraSpacing extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
index 034ff024d0..7f7ea59d45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..a931244312 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..1c801333b1 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) {
@@ -139,7 +139,7 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
index e8261ec183..c4a1662f73 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
@@ -29,8 +29,8 @@ public class GridLayoutInForm extends TestBase {
 
         PropertysetItem item = new PropertysetItem();
         for (String propertyId : propertyIds) {
-            item.addItemProperty(propertyId, new ObjectProperty<String>(
-                    propertyId));
+            item.addItemProperty(propertyId,
+                    new ObjectProperty<String>(propertyId));
         }
 
         final Form form = new Form(gridLayout);
@@ -46,20 +46,20 @@ public class GridLayoutInForm extends TestBase {
 
         addComponent(panel);
 
-        addComponent(new Button("Use 15 first fields",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Use 15 first fields", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        form.setVisibleItemProperties(propertyIds
-                                .subList(0, 15));
+                        form.setVisibleItemProperties(
+                                propertyIds.subList(0, 15));
                     }
                 }));
-        addComponent(new Button("Use 15 last fields",
-                new Button.ClickListener() {
+        addComponent(
+                new Button("Use 15 last fields", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        form.setVisibleItemProperties(propertyIds.subList(35,
-                                50));
+                        form.setVisibleItemProperties(
+                                propertyIds.subList(35, 50));
                     }
                 }));
 
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 e432e7b674..b016c6361a 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
index 9bc29b5c82..9acfd880b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -59,8 +59,8 @@ public class GridLayoutScrollPosition extends AbstractTestUI {
                 .addValueChangeListener(new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        toggleableLabel.setVisible(visibilityToggleCheckBox
-                                .getValue());
+                        toggleableLabel.setVisible(
+                                visibilityToggleCheckBox.getValue());
                     }
                 });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
index 6cc96332d5..b9afd3007d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
@@ -33,7 +33,7 @@ public class GridLayoutWithNonIntegerWidth extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -43,7 +43,7 @@ public class GridLayoutWithNonIntegerWidth extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
index 0fc764e463..78b4a9d417 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
index 0ec8cd5030..48b80357a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 07abb61785..2173f1b926 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..6fa44bf7b0 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/JavaScriptNoLayoutHandlingUI.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
index 0181f17aba..a431ba17aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
index f9ef4c98cb..7b9f0199c5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 b9071ec44c..6dc896bf48 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,8 +42,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();
@@ -55,8 +55,8 @@ public class JavaScriptResizeListener extends AbstractTestUI {
                 addValueChangeListener(new ValueChangeListener() {
                     @Override
                     public void valueChange(Property.ValueChangeEvent event) {
-                        resizeJsComponent.setListenerEnabled(event
-                                .getProperty().getValue() == Boolean.TRUE);
+                        resizeJsComponent.setListenerEnabled(
+                                event.getProperty().getValue() == Boolean.TRUE);
                     }
                 });
             }
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/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
index c873a7efe7..519ac7069e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..f00a923647 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..d70c04c7e1 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..9379968570 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
@@ -27,7 +27,7 @@ public class LoginFormTest extends TestBase {
         loginForm.addListener(new LoginListener() {
 
             /**
-             * 
+             *
              */
             private static final long serialVersionUID = 1L;
 
@@ -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/media/AudioTest.java b/uitest/src/main/java/com/vaadin/tests/components/media/AudioTest.java
index 1e1e26346c..728c62ab8d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/media/AudioTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/media/AudioTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,12 +56,12 @@ public class AudioTest extends TestBase {
                 new MethodProperty<Boolean>(audio, "htmlContentAllowed"));
         checkBox.setImmediate(true);
         addComponent(checkBox);
-        checkBox = new CheckBox("muted", new MethodProperty<Boolean>(audio,
-                "muted"));
+        checkBox = new CheckBox("muted",
+                new MethodProperty<Boolean>(audio, "muted"));
         checkBox.setImmediate(true);
         addComponent(checkBox);
-        checkBox = new CheckBox("autoplay", new MethodProperty<Boolean>(audio,
-                "autoplay"));
+        checkBox = new CheckBox("autoplay",
+                new MethodProperty<Boolean>(audio, "autoplay"));
         checkBox.setImmediate(true);
         addComponent(checkBox);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/media/Media.java b/uitest/src/main/java/com/vaadin/tests/components/media/Media.java
index 5ccf9eb72b..ec4f7abd47 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/media/Media.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/media/Media.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java
index 2bcbbbba3e..bd7db43efa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.MenuBar.MenuItem;
 
 /**
  * Test UI for top click on expanded top level menu and sub-menus.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuBarClickOpenedMenu extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java
index 2613634576..ef9524254b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ public class MenuBarFocus extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -86,7 +86,7 @@ public class MenuBarFocus extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
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/MenuBarTooltipsNearEdge.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
index 4e42d97925..b686e1c5d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,13 +26,13 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test to see if tooltips will render in the correct locations near the edges.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuBarTooltipsNearEdge extends AbstractTestUI {
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -76,7 +76,7 @@ public class MenuBarTooltipsNearEdge extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -86,7 +86,7 @@ public class MenuBarTooltipsNearEdge extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..b3abe024ac 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
@@ -30,7 +30,7 @@ import com.vaadin.ui.MenuBar.MenuItem;
  * Some of the icons are textual (using FontAwesome) and should behave like
  * items with image icons: the icon should not be considered to be a part of the
  * item's caption.
- * 
+ *
  * @since
  * @author Vaadin
  */
@@ -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/menubar/MenuTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
index 2c9d43290f..8a25f6c56e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,13 +24,13 @@ import com.vaadin.ui.MenuBar.MenuItem;
 
 /**
  * Test to see if tooltips on menu items obscure other items on the menu.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuTooltip extends AbstractTestUI {
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -68,7 +68,7 @@ public class MenuTooltip extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -78,7 +78,7 @@ public class MenuTooltip extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
index 764844751c..3d17248826 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 
 /**
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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..cd38ea90c0 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.NativeButton;
 /**
  * UI used to validate click coordinates reported from clicks on NativeButton
  * elements.
- * 
+ *
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
@@ -34,7 +34,7 @@ public class NativeButtonClick extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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());
                     }
                 });
 
@@ -68,7 +68,7 @@ public class NativeButtonClick extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -78,7 +78,7 @@ public class NativeButtonClick extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..001a388ab9 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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);
@@ -85,7 +86,7 @@ public class NativeButtonIconAndText extends AbstractTestUI implements
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -95,7 +96,7 @@ public class NativeButtonIconAndText extends AbstractTestUI implements
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
@@ -105,7 +106,7 @@ public class NativeButtonIconAndText extends AbstractTestUI implements
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button.
      * ClickEvent)
      */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
index b770435161..6cf09d3557 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.Notification;
 
 /**
  * Test UI class for Notification with middle left and middle right positions.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java
index c0db1703bb..75ab3aff1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.Notification.Type;
 
 /**
  * UI for notification delay test.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NotificationDelay extends AbstractTestUI {
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 89e97c0b6a..fb896d922a 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.Notification;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 
-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/OptionGroupDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
index f16bd4b7dd..884b6719e0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
index bad9723539..ff486340fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.OptionGroup;
 
 /**
  * Testcase for #10451
- * 
+ *
  * @author Vaadin Ltd
  */
 public class OptionGroupRetainFocusKeyboardValueChange extends AbstractTestUI {
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/optiongroup/ReadOnlyOptionGroup.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
index 76258e574e..48bfdf152c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.OptionGroup;
 
 /**
  * Test UI for unset read-only flag of Option group with new items allowed.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ReadOnlyOptionGroup extends AbstractTestUI {
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 4f7a939ee5..0377ee07ab 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
@@ -108,10 +108,10 @@ public class BoxLayoutTest extends AbstractTestUI {
             public void valueChange(ValueChangeEvent 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);
 
@@ -128,7 +128,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 {
@@ -151,7 +152,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);
                     }
                 });
@@ -237,8 +239,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);
@@ -312,8 +314,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() {
@@ -328,16 +330,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);
                 }
@@ -363,8 +366,8 @@ public class BoxLayoutTest extends AbstractTestUI {
             @Override
             public void valueChange(ValueChangeEvent event) {
                 if (target != null) {
-                    target.setComponentError(componentError.getValue() ? new UserError(
-                            "Error message") : null);
+                    target.setComponentError(componentError.getValue()
+                            ? new UserError("Error message") : null);
                 }
             }
         });
@@ -377,8 +380,8 @@ public class BoxLayoutTest extends AbstractTestUI {
             @Override
             public void valueChange(ValueChangeEvent event) {
                 if (target != null && target instanceof AbstractField) {
-                    ((AbstractField<?>) target).setRequired(componentRequired
-                            .getValue());
+                    ((AbstractField<?>) target)
+                            .setRequired(componentRequired.getValue());
                 }
             }
         });
@@ -423,22 +426,22 @@ public class BoxLayoutTest extends AbstractTestUI {
                 componentIcon.setEnabled(target != null);
                 componentDescription.setEnabled(target != null);
                 componentError.setEnabled(target != null);
-                componentRequired.setEnabled(target != null
-                        && target instanceof AbstractField);
+                componentRequired.setEnabled(
+                        target != null && target instanceof AbstractField);
                 align.setEnabled(target != null);
                 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);
                     }
@@ -456,8 +459,8 @@ public class BoxLayoutTest extends AbstractTestUI {
                     componentDescription.setValue(target.getDescription());
                     componentError.setValue(target.getComponentError() != null);
                     if (target instanceof AbstractField) {
-                        componentRequired.setValue(((AbstractField<?>) target)
-                                .isRequired());
+                        componentRequired.setValue(
+                                ((AbstractField<?>) target).isRequired());
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
index c715aa383a..f9fd205c22 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * HorizontalLayout and VerticalLayout should not leak caption elements via
  * listeners when removing components from a layout.
- * 
+ *
  * @since 7.1.13
  * @author Vaadin Ltd
  */
@@ -21,7 +21,7 @@ public class CaptionLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -70,7 +70,7 @@ public class CaptionLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -80,7 +80,7 @@ public class CaptionLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
index 89490bd167..4487d0ff2a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.orderedlayout;
 
@@ -29,7 +29,7 @@ public class ErrorIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -61,7 +61,7 @@ public class ErrorIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -71,7 +71,7 @@ public class ErrorIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..550c93bb6f 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 030bfa693e..91c221c040 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.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextField;
 
-public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI {
+public class HorizontalLayoutFullsizeContentWithErrorMsg
+        extends AbstractTestUI {
 
     static final String FIELD_ID = "f";
     static final String BUTTON_ID = "b";
@@ -23,7 +24,7 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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);
@@ -55,7 +56,7 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
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 821a5dbb93..6742a5a8db 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..df706be46f 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Test hovering over nested layout caption
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NestedLayoutCaptionHover extends AbstractTestUI {
@@ -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/SpacingLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
index 647c187568..0705a14ee4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * HorizontalLayout and VerticalLayout should not leak .v-spacing elements via
  * listeners when removing components from a layout.
- * 
+ *
  * @since 7.1.12
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
index 233049b0ba..683250e760 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.orderedlayout;
 
@@ -29,7 +29,7 @@ public class TooltipOnRequiredIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -60,7 +60,7 @@ public class TooltipOnRequiredIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -70,7 +70,7 @@ public class TooltipOnRequiredIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 d55765b5e4..f5a3175a37 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,8 +23,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.TextField;
 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");
     TextField listenedTextField = new TextField();
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/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/page/PageTitle.java b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java
index 3979ede8c8..1beb1d4033 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 d9a9c14425..0665aabf45 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
@@ -18,7 +18,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..1cb33fc523 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/PanelRemoveShortcutListener.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java
index 28ebf0e2b2..ff786a029a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Test for removing a shortcut listener from Panel.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PanelRemoveShortcutListener extends AbstractTestUI {
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 d0a86cd67f..0b0d97f03f 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/panel/UndefinedSizeScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
index ef535baa0a..03ccc8ead3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
index 2c4bac03b0..7a39edf576 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/PopupViewAndFragment.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
index 8178cfdbe2..6289d7a76e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java
index 2bf587ba97..18a99b8a06 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.PopupView;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewCaption extends AbstractTestUI {
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 75f95977bd..7e317bcb20 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 TextField(
-                    "Empty html, contains component"));
+            pv[1] = new PopupView(null,
+                    new TextField("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 TextField(
-                    "This is the content of popupview 4"));
+            pv[3] = new PopupView("Popupview 4 - has component",
+                    new TextField("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/PopupViewResizeWhileOpen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
index cf3854ee69..70264c230c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Resizing PopupView's popup component while it is visible should also resize
  * the drop shadow of the overlay.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewResizeWhileOpen extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
index ca91597aa2..6059c7756f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.TextField;
 /**
  * Test UI to check availability of shortcut action listener in the popup view
  * oeverlay component.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewShortcutActionHandler extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
index 04bbf6df0a..b911afbbc1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.PopupView;
  * collection but is not inside the getChildComponents() collection. Popup view
  * should use getChildComponents() to avoid exception when extension is returned
  * by getChildren().
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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..bd2ca5a2c5 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ProgressBarStaticReindeer.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
index 6cf7fb0ded..1840c859c5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
index 4e1ff7c886..9962f5ca13 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..e9243d798c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 5b3a931e5b..284cabfeca 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.AbstractFieldTest;
 import com.vaadin.ui.ProgressIndicator;
 
-public class ProgressIndicatorTest extends AbstractFieldTest<ProgressIndicator> {
+public class ProgressIndicatorTest
+        extends AbstractFieldTest<ProgressIndicator> {
     ProgressIndicator progress = new ProgressIndicator();
     Command<ProgressIndicator, Float> setValueCommand = new Command<ProgressIndicator, Float>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
index c3433c3054..25af7ccec7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
@@ -17,14 +17,13 @@ public class RichTextAreaPreventsTextFieldAccess extends TestBase {
 
     @Override
     protected void setup() {
-        Label label = new Label(
-                "Steps to reproduce problem with IE8. "
-                        + "<br> Step 1: Click on the 'Open RichTextArea-Dialog' button "
-                        + "<br> Step 2: Write something in the RichTextArea. "
-                        + "Do not press outside the textfield for the "
-                        + "richTextArea. <br> Step 3: Press the 'removeWindowButton' "
-                        + "<br> Now you cannot write in the TextField on this page "
-                        + "<br> Resetting the focus to textfield explicitly, works around the issue");
+        Label label = new Label("Steps to reproduce problem with IE8. "
+                + "<br> Step 1: Click on the 'Open RichTextArea-Dialog' button "
+                + "<br> Step 2: Write something in the RichTextArea. "
+                + "Do not press outside the textfield for the "
+                + "richTextArea. <br> Step 3: Press the 'removeWindowButton' "
+                + "<br> Now you cannot write in the TextField on this page "
+                + "<br> Resetting the focus to textfield explicitly, works around the issue");
         label.setContentMode(ContentMode.HTML);
         addComponent(label);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
index 870c6cb8cb..9d981a7f45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 b0c6c08a62..733aac1df3 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.AbstractFieldTest;
 import com.vaadin.ui.AbstractSelect;
 
-public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
-        AbstractFieldTest<T> implements ItemClickListener {
+public abstract class AbstractSelectTestCase<T extends AbstractSelect>
+        extends AbstractFieldTest<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/ComboBoxAddWhileFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 470c97442f..9004e9feaf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.ComboBox;
 /**
  * TODO can't reproduce the issue with this test case, possibly need some
  * enhancements.
- * 
+ *
  */
 public class ComboBoxAddWhileFiltering extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
index 5976952f8c..8592037c12 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 2f58e35dc7..d934647958 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
@@ -14,7 +14,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;
 
@@ -66,31 +67,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/SelectItemCaptionRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
index 458bfda6fa..286221e7ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@ public class SelectItemCaptionRefresh extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -54,7 +54,7 @@ public class SelectItemCaptionRefresh extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -64,7 +64,7 @@ public class SelectItemCaptionRefresh extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
index 3012105ae9..cfb18defb0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/HiddenSliderHandle.java b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
index 105c20f7c6..e6e33ff942 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java
index a15e0d95ae..afe5ddb881 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java
index f28dfc8f79..2d944003f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/slider/SliderResize.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java
index 55ed56299c..6c1c296d25 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
index 89f834a42f..d53799fc9d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.slider;
 
@@ -27,7 +27,7 @@ import com.vaadin.ui.Slider;
 
 /**
  * Testcase for #12133
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SliderUpdateFromValueChange extends AbstractTestUI {
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..1e6dcbe7ca 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalSplitPanel;
 
 /**
  * Test UI for horizontal split panel height.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class HorizontalSplitPanelHeight extends AbstractTestUI {
@@ -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/RetainSplitterPositionWhenOutOfBounds.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
index ee5a1a62e7..f4caac67ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
index e6079dba60..d36a179dd4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.VerticalSplitPanel;
 
 /**
  * Test UI for duplicate primary style name in SplitPanel.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPanelDuplicateStyleName extends AbstractTestUIWithLog {
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/SplitPanelMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
index b788b568c2..a27ad897e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/SplitPanelStyleLeak.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
index b634e43f46..101764ff92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..e7f40bf65e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalSplitPanel;
 
 /**
  * Test for {@link SplitPositionChangeListeners}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPositionChange extends AbstractTestUIWithLog {
@@ -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..47fbabdb59 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test to see if selecting and deselecting a table row after select range has
  * been removed.
- * 
+ *
  * @since 7.1.13
  * @author Vaadin Ltd
  */
@@ -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..98b3ddb5d5 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Test to see if VScrollTable handles Push updates correctly.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Push
@@ -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) {
@@ -96,7 +95,7 @@ public class AsyncPushUpdates extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -106,7 +105,7 @@ public class AsyncPushUpdates extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..348a10040e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..fe1071671e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Test UI for table context menu position and size.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ContextMenuSize extends AbstractTestUI {
@@ -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/DelayedColumnLayouting.java b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
index c327ddb6f3..a8b22832b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,9 +26,9 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * For tables that are contained in a layout, a delayed column layouting should
  * not be visible (because it makes the column jump around).
- * 
+ *
  * #15189
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DelayedColumnLayouting extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
index baac7ce057..48fe6b19df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.ui.Table;
 /**
  * Test UI for empty table: empty table (without any data) throws client side
  * exception if it's a target for DnD.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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..bedfb6839a 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test UI for table as a drop target: AbstractSelectTargetDetails should
  * provide getMouseEvent() method.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndTableTargetDetails extends AbstractTestUI {
@@ -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 e792c90af1..b24e60369f 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..a19b73f22b 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
@@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * This test cannot be automated. http://dev.vaadin.com/ticket/6160, base code
  * by user radosdesign.
- * 
+ *
  * The test fails if even occasionally empty rows appear in the table. A
  * relatively good way to get them (before the fix) is to wait for the page to
  * load, move the scrollbar down, press 'R' before the rows have time to be
@@ -35,9 +35,9 @@ import com.vaadin.ui.VerticalLayout;
  * happen at all. On a slow 32-bit Windows 7 with Chrome version 22.0.1229.94 m
  * (no GWT dev mode) this test has managed to reproduce the problem maybe nine
  * times out of ten.
- * 
+ *
  * @author Anna Koskinen / Vaadin Oy
- * 
+ *
  */
 public class EmptyRowsWhenScrolling extends UI {
 
@@ -70,7 +70,7 @@ public class EmptyRowsWhenScrolling extends UI {
         /**
          * The constructor should first build the main layout, set the
          * composition root and then do any custom initialization.
-         * 
+         *
          * The constructor will not be automatically regenerated by the visual
          * editor.
          */
@@ -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/EmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
index ad9c70444d..fb175a21fa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ public class EmptyTable extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -37,7 +37,7 @@ public class EmptyTable extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -47,7 +47,7 @@ public class EmptyTable extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/FocusOnSelectedItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
index 177f4d68fc..e2df62d029 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,14 +24,14 @@ import com.vaadin.ui.Table;
 /**
  * Test to see if the correct row gets the focus when the row is selected from
  * the serverside and forces the table to scroll down
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FocusOnSelectedItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -61,7 +61,7 @@ public class FocusOnSelectedItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -71,7 +71,7 @@ public class FocusOnSelectedItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
index 5d2d68898c..fdbca92c58 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
@@ -64,9 +64,8 @@ public class Footer extends AbstractTestUI {
         Button footer1Btn = new Button("Change", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.setColumnFooter("col1",
-                        footer1Value.getValue() == null ? "" : footer1Value
-                                .getValue().toString());
+                table.setColumnFooter("col1", footer1Value.getValue() == null
+                        ? "" : footer1Value.getValue().toString());
             }
         });
         HorizontalLayout footer1 = new HorizontalLayout();
@@ -79,9 +78,8 @@ public class Footer extends AbstractTestUI {
         Button footer2Btn = new Button("Change", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.setColumnFooter("col2",
-                        footer2Value.getValue() == null ? "" : footer2Value
-                                .getValue().toString());
+                table.setColumnFooter("col2", footer2Value.getValue() == null
+                        ? "" : footer2Value.getValue().toString());
             }
         });
         HorizontalLayout footer2 = new HorizontalLayout();
@@ -94,9 +92,8 @@ public class Footer extends AbstractTestUI {
         Button footer3Btn = new Button("Change", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
-                table.setColumnFooter("col3",
-                        footer3Value.getValue() == null ? "" : footer3Value
-                                .getValue().toString());
+                table.setColumnFooter("col3", footer3Value.getValue() == null
+                        ? "" : footer3Value.getValue().toString());
             }
         });
         HorizontalLayout footer3 = new HorizontalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
index 8d6a32c9bb..9cd1be7b01 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
@@ -53,8 +53,8 @@ public class FooterClick extends AbstractTestUIWithLog {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setImmediate((Boolean) event.getProperty()
-                                .getValue());
+                        table.setImmediate(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
@@ -67,8 +67,8 @@ public class FooterClick extends AbstractTestUIWithLog {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setColumnReorderingAllowed((Boolean) event
-                                .getProperty().getValue());
+                        table.setColumnReorderingAllowed(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
index 2bb48a2b40..8ebda98af8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
@@ -42,8 +42,8 @@ public class HeaderClick extends AbstractTestUI {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setImmediate((Boolean) event.getProperty()
-                                .getValue());
+                        table.setImmediate(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
@@ -55,8 +55,8 @@ public class HeaderClick extends AbstractTestUI {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setSortEnabled((Boolean) event.getProperty()
-                                .getValue());
+                        table.setSortEnabled(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
@@ -69,8 +69,8 @@ public class HeaderClick extends AbstractTestUI {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setColumnReorderingAllowed((Boolean) event
-                                .getProperty().getValue());
+                        table.setColumnReorderingAllowed(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
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 09b3dde32c..5440b998ce 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
@@ -62,7 +62,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
                                 .isEmpty()) {
                             table.addHeaderClickListener(headerClickListener);
                         } else {
-                            table.removeHeaderClickListener(headerClickListener);
+                            table.removeHeaderClickListener(
+                                    headerClickListener);
                         }
                     }
                 });
@@ -92,7 +93,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
                                 .isEmpty()) {
                             table.addFooterClickListener(footerClickListener);
                         } else {
-                            table.removeFooterClickListener(footerClickListener);
+                            table.removeFooterClickListener(
+                                    footerClickListener);
                         }
                     }
                 });
@@ -117,8 +119,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        table.setColumnReorderingAllowed((Boolean) event
-                                .getProperty().getValue());
+                        table.setColumnReorderingAllowed(
+                                (Boolean) event.getProperty().getValue());
                     }
                 });
 
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 6376ad7df0..c3f1190192 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
@@ -15,8 +15,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;
@@ -32,7 +32,8 @@ public class HeaderPositionWhenSorting extends AbstractTestUI implements
                 if (((Boolean) event.getProperty().getValue())) {
                     table.addItemClickListener(HeaderPositionWhenSorting.this);
                 } else {
-                    table.removeItemClickListener(HeaderPositionWhenSorting.this);
+                    table.removeItemClickListener(
+                            HeaderPositionWhenSorting.this);
                 }
 
             }
@@ -55,7 +56,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(new ValueChangeListener() {
 
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 b89582bb7e..d0ab91487d 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
@@ -25,7 +25,8 @@ public class HeaderUpdateWhenNoRows extends AbstractTestUI {
             @Override
             public void valueChange(ValueChangeEvent 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/HiddenComponentCells.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
index fa88325429..c5717c1556 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.table;
 
@@ -26,7 +26,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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 cb69856e95..85eeee75e9 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
@@ -58,9 +58,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"));
 
@@ -137,19 +135,20 @@ public class ItemClickEvents extends AbstractTestUI {
 
     private static HorizontalLayout createHorizontalLayout(Component c) {
         HorizontalLayout layout = new HorizontalLayout();
-        CheckBox b = new CheckBox("immediate", new MethodProperty<Boolean>(c,
-                "immediate"));
+        CheckBox b = new CheckBox("immediate",
+                new MethodProperty<Boolean>(c, "immediate"));
         b.setImmediate(true);
         layout.addComponent(b);
-        b = new CheckBox("selectable", new MethodProperty<Boolean>(c,
-                "selectable"));
+        b = new CheckBox("selectable",
+                new MethodProperty<Boolean>(c, "selectable"));
         b.setImmediate(true);
         layout.addComponent(b);
-        b = new CheckBox("nullsel", new MethodProperty<Boolean>(c,
-                "nullSelectionAllowed"));
+        b = new CheckBox("nullsel",
+                new MethodProperty<Boolean>(c, "nullSelectionAllowed"));
         b.setImmediate(true);
         layout.addComponent(b);
-        b = new CheckBox("multi", new MethodProperty<Boolean>(c, "multiSelect"));
+        b = new CheckBox("multi",
+                new MethodProperty<Boolean>(c, "multiSelect"));
         b.setImmediate(true);
         layout.addComponent(b);
         return layout;
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/LeftColumnAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
index 7789d0ae19..3840dbf325 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.Table.Align;
 /**
  * Test UI for issue #13399 : Left alignment should not be set explicitly
  * instead of relying on default behavior
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("tests-table")
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/OddEvenRowStyling.java b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
index 808b05e233..6bd361c599 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.ui.Table;
 
 /**
  * @author jonatan
- * 
+ *
  */
 public class OddEvenRowStyling extends TestBase {
 
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 1e3c058458..be9fdeea99 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/RefreshRenderedCellsOnlyIfAttached.java b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
index 809cb67226..258ce70f28 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * There shouldn't be any attempts to refresh table's cells if the table isn't
  * attached.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -38,7 +38,7 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -53,7 +53,7 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
         final Table t = new Table() {
             /*
              * (non-Javadoc)
-             * 
+             *
              * @see com.vaadin.ui.Table#refreshRenderedCells()
              */
             @Override
@@ -91,7 +91,7 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
 
     /**
      * Remove Table's parent component.
-     * 
+     *
      * @since
      */
     protected void removeTableParent() {
@@ -100,7 +100,7 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -110,7 +110,7 @@ public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/SelectAllConstantViewport.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
index 5a406eac48..0a0fb46462 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Table;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -31,7 +31,7 @@ public class SelectAllConstantViewport extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -76,7 +76,7 @@ public class SelectAllConstantViewport extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -87,7 +87,7 @@ public class SelectAllConstantViewport extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
index 4778bca3b5..39da709ada 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
index 8d3e922fa9..79a8f0c7ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
index 5e1c4cca66..32e5ee3589 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.table;
 
@@ -29,7 +29,7 @@ import com.vaadin.ui.Table.ColumnHeaderMode;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -39,7 +39,7 @@ public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -83,7 +83,7 @@ public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -93,7 +93,7 @@ public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
@@ -104,7 +104,8 @@ public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
     public class ImageGenerator implements ColumnGenerator {
 
         @Override
-        public Object generateCell(Table source, Object itemId, Object columnId) {
+        public Object generateCell(Table source, Object itemId,
+                Object columnId) {
             return "" + itemId;
         }
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
index e643ef5fa0..97a240ae2e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 
@@ -35,7 +35,7 @@ public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -70,7 +70,7 @@ public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -82,7 +82,7 @@ public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @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..d73aa7a4f3 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
@@ -10,7 +10,7 @@ public class ShowLastItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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);
             }
         });
 
@@ -45,7 +46,7 @@ public class ShowLastItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -55,7 +56,7 @@ public class ShowLastItem extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
index 499cce58c8..d27ff16998 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..a961b0b205 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TableAfterRemovingExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
index a2c8dd02e6..993524f20c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.table;
 
 /**
  * Test that column natural width is restored after removing expand ratio
- * 
+ *
  * @author Vaadin Ltd
  */
 
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 eb5beec6bd..f38603b78d 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
@@ -13,8 +13,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;
@@ -53,7 +53,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.addListener(new ValueChangeListener() {
 
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..cbf7887195 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ import com.vaadin.ui.Table;
 /**
  * Tests that previously focused component's blur event happens before any
  * variable changes in the focused Table.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableBlurFocus extends AbstractTestUIWithLog {
@@ -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/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
index dd5d162e17..a7d81427da 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
@@ -47,16 +47,16 @@ public class TableChildMeasurementHint extends AbstractTestUI {
         table3.setSizeFull();
         table3.setChildMeasurementHint(ChildMeasurementHint.MEASURE_NEVER);
 
-        buttonLayout.addComponent(new Button("Show table1",
-                new ClickListener() {
+        buttonLayout
+                .addComponent(new Button("Show table1", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         layout.addComponent(table1);
                         table1.focus();
                     }
                 }));
-        buttonLayout.addComponent(new Button("Show table2",
-                new ClickListener() {
+        buttonLayout
+                .addComponent(new Button("Show table2", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         layout.removeComponent(table1);
@@ -64,8 +64,8 @@ public class TableChildMeasurementHint extends AbstractTestUI {
                         table2.focus();
                     }
                 }));
-        buttonLayout.addComponent(new Button("Show table3",
-                new ClickListener() {
+        buttonLayout
+                .addComponent(new Button("Show table3", new ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         layout.removeComponent(table2);
@@ -92,7 +92,8 @@ public class TableChildMeasurementHint extends AbstractTestUI {
         for (int i = 0; i < 2; i++) {
             table.addItem(
                     makeRow(new Object[] { "Nicolaus" + i, "Copernicus", 1473 },
-                            5), j++);
+                            5),
+                    j++);
             table.addItem(
                     makeRow(new Object[] { "Tycho" + i, "Brahe", 1546 }, 5),
                     j++);
@@ -123,8 +124,8 @@ public class TableChildMeasurementHint extends AbstractTestUI {
             @Override
             public Object generateCell(Table components, Object o, Object o2) {
                 GridLayout b = new GridLayout();
-                b.addComponents(new Label("l1"), new Button("b"), new Label(
-                        "l2"));
+                b.addComponents(new Label("l1"), new Button("b"),
+                        new Label("l2"));
                 b.setWidthUndefined();
                 return b;
             }
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 64f1a64558..c0cf73f43b 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);
                 TextField textfield = new TextField();
-                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);
                 TextField textfield = new TextField();
-                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..587acba8eb 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TableColumnWidthsAndSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
index 8f0a8803f3..b40cf2749d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 3b639be21f..2638cf8c05 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 1d909d101e..229df893b2 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
@@ -30,7 +30,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 055820210a..70353ef48f 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
@@ -11,7 +11,7 @@ import com.vaadin.ui.Table;
  * Setting table height and setting column header mode as hidden leaves the body
  * height of the table as it would be with the headers visible and leaves an
  * empty area below the body.
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class TableHeightWhenHidingHeaders extends AbstractTestCase {
@@ -39,7 +39,8 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase {
                 if ((Boolean) event.getProperty().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/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
index 809e639448..a0de92fca4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
@@ -32,8 +32,8 @@ public class TableItemDescriptionGeneratorUI extends AbstractTestUI {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                table.setContainerDataSource(createContainer(componentDescription
-                        .getValue()));
+                table.setContainerDataSource(
+                        createContainer(componentDescription.getValue()));
             }
         });
         componentDescription.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
index 9718236c42..8454d27a98 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.ui.themes.ValoTheme;
 /**
  * Test for ensuring page doesn't jump up to the Table selection on IE with
  * these steps:
- * 
+ *
  * <p>
  * 1. refresh page <br>
  * 2. click within URL bar <br>
@@ -44,7 +44,7 @@ import com.vaadin.ui.themes.ValoTheme;
  * The problem is that IE for some reason does not fire a blur event for the
  * table at step 4, leading to table thinking it is focused when it is updated
  * in step 6.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme(ValoTheme.THEME_NAME)
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..347368e224 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ public class TableMoveFocusWithSelection extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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() {
 
@@ -104,7 +103,7 @@ public class TableMoveFocusWithSelection extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -114,7 +113,7 @@ public class TableMoveFocusWithSelection extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/TableNavigationPageDown.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
index b1281dcc7b..3221324b26 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..220e88ccdf 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..b475c99846 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..acb2d8eb8e 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
@@ -14,10 +14,11 @@ import com.vaadin.ui.Table;
 /**
  * Scroll position should be restored when removing and re-adding all rows in
  * 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/TableRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
index 2985932145..3067a8a82c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
index eb5efbc4f3..d752364c38 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
@@ -33,12 +33,13 @@ public class TableRowHeight extends TestBase {
         addComponent(table1);
 
         Table table2 = initTable(PAGELENGTH, true, false, false);
-        addComponent(new Label("Table with label component in generated column"));
+        addComponent(
+                new Label("Table with label component in generated column"));
         addComponent(table2);
 
         Table table3 = initTable(PAGELENGTH, false, true, false);
-        addComponent(new Label(
-                "Table with layout component in generated column"));
+        addComponent(
+                new Label("Table with layout component in generated column"));
         addComponent(table3);
 
         Table table4 = initTable(PAGELENGTH, true, true, false);
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..c6512cebc1 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,7 +16,7 @@
 package com.vaadin.tests.components.table;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 import com.vaadin.data.Item;
@@ -31,13 +31,13 @@ import com.vaadin.ui.VerticalLayout;
 
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -46,7 +46,7 @@ import com.vaadin.ui.VerticalLayout;
  */
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
@@ -54,7 +54,7 @@ public class TableScrollAfterAddRow extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.UI#init(com.vaadin.server.VaadinRequest)
      */
     @Override
@@ -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);
@@ -146,7 +146,7 @@ public class TableScrollAfterAddRow extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -157,7 +157,7 @@ public class TableScrollAfterAddRow extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
index 0e2e1b76e1..9d66e166bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.Window;
  * Test to see if Table appears to scroll up under an obscure set of conditions
  * (Scrolled down, set to expand, selecting updates a TextField that precedes
  * the Table in a VerticalLayout.) (#10106)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableScrollUpOnSelect extends AbstractTestUI {
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 030a4ee259..6dc37aacd6 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/TableSizeInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
index da37d1f2d2..4ee80d8643 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/TableSortingIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
index 93fe8d7d9e..a032cd142c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,14 +29,14 @@ import com.vaadin.ui.Table;
 /**
  * Test if the table sorting indicators update correctly when the table is
  * sorted serverside
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableSortingIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -70,7 +70,7 @@ public class TableSortingIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -80,7 +80,7 @@ public class TableSortingIndicator extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 3b5949dd40..4a9ef40ab3 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
@@ -59,8 +59,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());
             }
         });
 
@@ -76,7 +76,7 @@ public class TableSqlContainer extends AbstractTestUI {
 
     /**
      * (Re)creates the test table
-     * 
+     *
      * @param connectionPool
      */
     private void createTestTable(JDBCConnectionPool connectionPool) {
@@ -102,7 +102,7 @@ public class TableSqlContainer extends AbstractTestUI {
 
     /**
      * Adds test data to the test table
-     * 
+     *
      * @param connectionPool
      * @throws SQLException
      */
@@ -113,14 +113,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/TableToggleColumnVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
index e78f247184..6aac469c26 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..b29207943b 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TableTooManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
index 2d27636420..ac50b5c149 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,7 +44,7 @@ public class TableTooManyColumns extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -54,7 +54,7 @@ public class TableTooManyColumns extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 544fe9bb67..0430061946 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
@@ -37,8 +37,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");
@@ -47,8 +47,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");
@@ -57,8 +57,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();
@@ -66,15 +66,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 11f450baf2..5912e8b148 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 TextField fieldA = new TextField(valA) {
             @Override
             public void setPropertyDataSource(Property newDataSource) {
@@ -54,7 +55,8 @@ public class TableUnregisterComponent extends TestBase {
                 if (COL_B.equals(propertyId)) {
                     Field<String> field = new TextField() {
                         @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..2b7fe48536 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,14 +24,14 @@ import com.vaadin.ui.Table;
 /**
  * Test whether adding the first item to a table calculates the table width
  * correctly
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableWidthItemRemove extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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);
             }
         });
@@ -66,7 +65,7 @@ public class TableWidthItemRemove extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -76,7 +75,7 @@ public class TableWidthItemRemove extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 c571329d14..631ba22f97 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -45,11 +45,11 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase {
     /**
      * Container which throws an exception on every fifth call to
      * {@link #getContainerProperty(Object, Object)}.
-     * 
+     *
      * @author Vaadin Ltd
      * @version @VERSION@
      * @since 7.0
-     * 
+     *
      */
     public class BrokenContainer extends IndexedContainer {
         private int counter = 0;
@@ -79,11 +79,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;
             }
@@ -142,9 +143,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);
                                 }
                             }
                         }
@@ -164,8 +165,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 a3f0ce2f13..a6a5747b85 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
-            Converter<String, Integer> {
+    public static class MyIntegerConverter
+            implements Converter<String, Integer> {
 
         @Override
         public Integer convertToModel(String value,
@@ -57,7 +57,8 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
 
     public static class MyConverterFactory extends DefaultConverterFactory {
         @Override
-        protected Converter<String, ?> createStringConverter(Class<?> sourceType) {
+        protected Converter<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..ebfe4df455 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..eb05bcb0f2 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
@@ -36,7 +36,7 @@ public class TabletContextMenu extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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());
             }
 
@@ -118,7 +119,7 @@ public class TabletContextMenu extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -128,7 +129,7 @@ public class TabletContextMenu extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/UnnecessaryScrollbarWhenZooming.java b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
index 8d95261825..2e78927947 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 b0622e748c..f8f1b8379f 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
@@ -51,8 +51,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/HtmlInTabCaption.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
index 66a27a10b5..281104cac1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ public class HtmlInTabCaption extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
index 939bd645ea..f6fc84fc4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,10 +23,10 @@ import com.vaadin.ui.TabSheet.Tab;
 
 /**
  * In case a selected tab is removed the new selected one should be a neighbor.
- * 
+ *
  * In case an unselected tab is removed and the selected one is not visible, the
  * scroll should not jump to the selected one.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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..456b28126c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Tests the width of the tab bar, especially when using relative width for the
  * {@link TabSheet}.
- * 
+ *
  * Created for ticket <a href="http://dev.vaadin.com/ticket/12805">#12805</a>.
  */
 public class TabBarWidth extends AbstractTestUI {
@@ -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/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index 620f04fe60..ac31b99abd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
@@ -23,9 +23,9 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test if the click and key tab selection in a tabsheet generate the correct
  * focus/blur events.
- * 
+ *
  * The solution was broken in ticket (#14304)
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
index 0d7ec48a99..6ccec44113 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
@@ -14,10 +14,10 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 /**
  * TabSheet test in case user selects a tab and on the selection listener the
  * selected tab is changed to another one.
- * 
+ *
  * This test used to cause nonfunctional TabSheet if the current tab was 1, user
  * selects 5, then the selection listener will revert the selected tab to 1.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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/TabSheetClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java
index 2cadde567f..caa9b0efbf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.TabSheet.Tab;
 /**
  * This test UI is used for checking that when a tab is closed, another one is
  * scrolled into view.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -32,7 +32,7 @@ public class TabSheetClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -52,7 +52,7 @@ public class TabSheetClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -62,7 +62,7 @@ public class TabSheetClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
index c4af98eb3f..32496a1227 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
index 941073d617..b4ab64e20b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
index 779ab6b614..26e4ab64f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.tabsheet;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
index 2ccbfeef76..e7c31b33fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.TabSheet;
 
 /**
  * Test UI to check that TabsheetBaseConnector reacts on disabling its parent.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TabSheetInDisabledParent extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
index b2313020a3..e597867260 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/TabSheetScrollOnTabClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
index 1400100f3b..038ed3a7c6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.TabSheet.Tab;
  * This testUI is used for testing that the scroll position of a tab sheet does
  * not change when tabs are removed. The exception is removing the leftmost
  * visible tab.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -36,7 +36,7 @@ public class TabSheetScrollOnTabClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -78,7 +78,7 @@ public class TabSheetScrollOnTabClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -88,7 +88,7 @@ public class TabSheetScrollOnTabClose extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/TabSheetWithTabIds.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
index 42d65f66c9..f496d6d8b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.tabsheet;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
index 3a5be51e47..912dc8b83d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * If the space is pressed on the tabs of a tabsheet the browser default scroll
  * behavior must be prevented.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
index 0105498f27..408b2d71ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.TabSheet;
 
 /**
  * Test to see if tabsheet navigation buttons render correctly in Chameleon
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("chameleon")
@@ -33,7 +33,7 @@ public class TabsheetNotEnoughHorizontalSpace extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -54,7 +54,7 @@ public class TabsheetNotEnoughHorizontalSpace extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -64,7 +64,7 @@ public class TabsheetNotEnoughHorizontalSpace extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 bbbd4ca7e4..0e1a3389a9 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/tabsheet/VetoTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java
index 6671b8641d..3bf872377e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..d3e9f528ef 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
@@ -8,7 +8,7 @@ import com.vaadin.ui.TextArea;
 
 /**
  * @author denis
- * 
+ *
  */
 public class ScrollCursor extends TestBase {
 
@@ -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 756970898e..e8f670feda 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
@@ -37,8 +37,8 @@ public class TextAreaCursorPosition extends TestBase {
             public void textChange(TextChangeEvent event) {
                 AbstractTextField component = (AbstractTextField) event
                         .getComponent();
-                cursorPosition.setValue(String.valueOf(component
-                        .getCursorPosition()));
+                cursorPosition.setValue(
+                        String.valueOf(component.getCursorPosition()));
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
index b2607050a4..c11c369b20 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
@@ -92,8 +92,8 @@ public class TextAreaSizeResetted extends AbstractTestUI {
         addPollListener(new UIEvents.PollListener() {
             @Override
             public void poll(UIEvents.PollEvent event) {
-                pollIndicator.setValue(String.valueOf(System
-                        .currentTimeMillis()));
+                pollIndicator
+                        .setValue(String.valueOf(System.currentTimeMillis()));
             }
         });
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
index ac51b5fc87..e62d0e779c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,32 +28,32 @@ import com.vaadin.ui.TextField;
 /**
  * Test to verify fields become implicitly "immediate" when adding value change
  * listener to them.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
 public class AutomaticImmediate extends AbstractTestUIWithLog {
 
     /**
-     * 
+     *
      */
     static final String BUTTON = "button";
     /**
-     * 
+     *
      */
     static final String EXPLICIT_FALSE = "explicit-false";
     /**
-     * 
+     *
      */
     static final String FIELD = "field";
     /**
-     * 
+     *
      */
     static final String LISTENER_TOGGLE = "listener-toggle";
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -64,7 +64,7 @@ public class AutomaticImmediate extends AbstractTestUIWithLog {
 
             /*
              * (non-Javadoc)
-             * 
+             *
              * @see com.vaadin.ui.AbstractField#fireValueChange(boolean)
              */
             @Override
@@ -126,7 +126,7 @@ public class AutomaticImmediate extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -136,7 +136,7 @@ public class AutomaticImmediate extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 c7e449c314..19e062b980 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -86,7 +86,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -96,7 +96,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 938ecf60ce..f108aaa5da 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/EnumTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
index 99e08ae32d..958564a0c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java
index b8f9c9aa3f..b1fa785247 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java
@@ -13,17 +13,20 @@ public class InputPromptAndCursorPosition extends AbstractTestUI {
     protected void setup(VaadinRequest request) {
         final TextField tf = new TextField();
         tf.setColumns(40);
-        tf.setValue("Delete this text to reveal input prompt and update cursor position.");
+        tf.setValue(
+                "Delete this text to reveal input prompt and update cursor position.");
         tf.setInputPrompt("This is an input prompt");
 
         final Label l = new Label("Cursor position: ?");
-        Button button = new Button("Update cursor position", new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                l.setValue("Cursor position: " + tf.getCursorPosition());
-            }
-        });
+        Button button = new Button("Update cursor position",
+                new Button.ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        l.setValue(
+                                "Cursor position: " + tf.getCursorPosition());
+                    }
+                });
 
         addComponent(tf);
         addComponent(l);
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 e117657a3a..d109140741 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,9 +28,9 @@ import com.vaadin.ui.TextField;
 /**
  * To verify bug fix: Reproducing of bug Textfield value not updated when
  * InputPromt and ShortcutListener are used
- * 
+ *
  * #13492
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("reindeer")
@@ -43,7 +43,7 @@ public class InputPromptGetText extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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/OutOfSyncIssueWithKeyboardShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
index 955a9c2772..6215d41d18 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
@@ -86,9 +86,8 @@ public class OutOfSyncIssueWithKeyboardShortcut extends TestBase {
                 public void valueChange(ValueChangeEvent event) {
                     Object value = event.getProperty().getValue();
                     if (value != null) {
-                        String fragment = "edit/"
-                                + String.valueOf(value)
-                                        .replaceAll("[^0-9]", "");
+                        String fragment = "edit/" + String.valueOf(value)
+                                .replaceAll("[^0-9]", "");
                         if (!fragment.equals(previousFragment)) {
                             navigateTo(fragment);
                         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
index 79f5a7e83b..7089770386 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Test for required text field.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class RequiredTextField extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index d63d7ddc66..1f959be136 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
@@ -52,8 +52,8 @@ public class SelectionAndCursorPosition extends TestBase {
         fl.addComponent(b);
 
         HorizontalLayout selectRange = new HorizontalLayout();
-        selectRange
-                .setCaption("Select range of text ( setSelectionRange(int start, int lengt) )");
+        selectRange.setCaption(
+                "Select range of text ( setSelectionRange(int start, int lengt) )");
         final TextField start = new TextField("From:");
         final TextField length = new TextField("Selection length:");
         b = new Button("select");
@@ -85,8 +85,8 @@ public class SelectionAndCursorPosition extends TestBase {
 
         setCursorPosition.addComponent(pos);
         setCursorPosition.addComponent(b);
-        setCursorPosition
-                .setCaption("Set cursor position ( setCursorPosition(int pos) )");
+        setCursorPosition.setCaption(
+                "Set cursor position ( setCursorPosition(int pos) )");
         fl.addComponent(setCursorPosition);
 
         getLayout().addComponent(textField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java
index da4ea9de0b..f12ebc6ff2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java
@@ -30,8 +30,8 @@ public class SetTabIndex extends TestBase {
         readonly.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                boolean readonly = Boolean.valueOf(event.getProperty()
-                        .getValue().toString());
+                boolean readonly = Boolean
+                        .valueOf(event.getProperty().getValue().toString());
                 field1.setReadOnly(readonly);
                 field2.setReadOnly(readonly);
                 field3.setReadOnly(readonly);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
index 531392b84a..b149cbce5c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
@@ -66,15 +66,15 @@ public class TextChangeEvents extends TestBase {
 
     /**
      * "Autosuggest"
-     * 
+     *
      * Known issue is timing if suggestion comes while typing more content. IMO
      * we will not support this kind of features in default TextField, but
      * hopefully make it easily extendable to perfect suggest feature. MT
      * 2010-10
-     * 
+     *
      */
-    private class VaadinDeveloperNameField extends TextField implements
-            TextChangeListener {
+    private class VaadinDeveloperNameField extends TextField
+            implements TextChangeListener {
         private String[] names = new String[] { "Matti Tahvonen",
                 "Marc Englund", "Joonas Lehtinen", "Jouni Koivuviita",
                 "Marko Grönroos", "Artur Signell" };
@@ -94,7 +94,8 @@ public class TextChangeEvents extends TestBase {
 
         @Override
         public void textChange(TextChangeEvent event) {
-            boolean atTheEndOfText = event.getText().length() == getCursorPosition();
+            boolean atTheEndOfText = event.getText()
+                    .length() == getCursorPosition();
             String match = findMatch(event.getText());
             if (match != null) {
                 setStyleName("match");
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 d64dbb42d6..26342a71cc 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
@@ -149,8 +149,8 @@ public class TextChangeEvents2 extends TestBase {
                                 TextField next = tfs[idx + 1];
                                 next.focus();
                                 if (len > 4) {
-                                    next.setValue(txt.substring(4, len > 8 ? 8
-                                            : len));
+                                    next.setValue(txt.substring(4,
+                                            len > 8 ? 8 : len));
                                 } else {
                                     next.selectAll();
                                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 5991ac6ff7..b61a6015f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -22,11 +22,8 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase {
             @Override
             public void attach() {
                 super.attach();
-                TestUtils
-                        .injectCSS(
-                                getUI(),
-                                ".red { background:red;} "
-                                        + ".green { background:green;} .blue { background:blue;} .cyan { background:cyan;} .magenta { background:magenta;}");
+                TestUtils.injectCSS(getUI(), ".red { background:red;} "
+                        + ".green { background:green;} .blue { background:blue;} .cyan { background:cyan;} .magenta { background:magenta;}");
             }
         };
         tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
index 9fe18f131b..0f2812e66b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 21dba6a196..f0d2d44720 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
@@ -10,8 +10,8 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.TextField;
 
-public class TextFieldFocusAndBlurListeners extends TestBase implements
-        FocusListener, BlurListener, ValueChangeListener {
+public class TextFieldFocusAndBlurListeners extends TestBase
+        implements FocusListener, BlurListener, ValueChangeListener {
     private Log log = new Log(5).setNumberLogRows(false);
 
     @Override
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 4299336f74..fc0a5d9b8e 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 10793a8bad..401d901df0 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.tests.components.abstractfield.AbstractTextFieldTest;
 import com.vaadin.ui.TextField;
 
-public class TextFieldTest extends AbstractTextFieldTest<TextField> implements
-        TextChangeListener {
+public class TextFieldTest extends AbstractTextFieldTest<TextField>
+        implements TextChangeListener {
 
     @Override
     protected Class<TextField> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
index c125d8da86..89d2a76370 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,8 @@ import com.vaadin.ui.Window;
 
 @SuppressWarnings("serial")
 @Theme("chameleon")
-public class TextFieldTruncatesUnderscoresInModalDialogs extends AbstractTestUI {
+public class TextFieldTruncatesUnderscoresInModalDialogs
+        extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -36,8 +37,8 @@ public class TextFieldTruncatesUnderscoresInModalDialogs extends AbstractTestUI
         FormLayout formLayout = new FormLayout();
         formLayout.setSpacing(true);
 
-        formLayout.addComponent(new Button("Disappear",
-                new Button.ClickListener() {
+        formLayout.addComponent(
+                new Button("Disappear", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
index 443f290809..42b47508ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.Tree;
 /**
  * Test UI for tree as a drop target: AbstractSelectTargetDetails should provide
  * getMouseEvent() method.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndTreeTargetDetails extends DndTableTargetDetails {
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 ab9bcd9a99..f93ea99867 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
@@ -64,16 +64,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/TreeFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
index 6df69c850b..41e7d1527e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
@@ -49,8 +49,8 @@ public class TreeFiltering extends TestBase {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                cont.setIncludeParentsWhenFiltering(((CheckBox) event
-                        .getProperty()).getValue());
+                cont.setIncludeParentsWhenFiltering(
+                        ((CheckBox) event.getProperty()).getValue());
                 ccTree.markAsDirty();
             }
         });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
index b20b7c3aab..e381c5c358 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index bb7c0350f2..21b45f7111 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
index dfea493281..342aa398e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.Tree;
 
 /**
  * Test UI for keyboard navigation for first and last tree item.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeKeyboardNavigationToNone extends AbstractTestUI {
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/MinimalWidthColumns.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
index c4679f739b..f47357c9c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
@@ -10,7 +10,7 @@ public class MinimalWidthColumns extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
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..ba80e52814 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TreeTableOutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index b8a0ac61c2..9684306fcf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/TreeTableRowGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
index e8da4abbec..0ac904e0cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
index 6bc6fa74c0..3996852686 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.TreeTable;
 
 /**
  * Test UI for RowHeaderMode.ICON_ONLY in TreeTable.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTableRowHeaderMode extends AbstractTestUI {
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/TreeTableScrollOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
index 07cf7f8c2e..921bd6cada 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/CurrentUiRetained.java b/uitest/src/main/java/com/vaadin/tests/components/ui/CurrentUiRetained.java
index cba2adb5db..fe7edacb6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/CurrentUiRetained.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/CurrentUiRetained.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java
index a960e9cc46..52aded0cdb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java
index ca9ebcd451..e6608a035a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java
index 9557a2d2b0..26452f2c71 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/MultiFileUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
index 007a49e0e2..b7661184f7 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..db19dcbaea 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;
@@ -97,7 +97,7 @@ public class MultipleUIUploadTest extends AbstractTestUI {
 
         /**
          * Returns the fileName.
-         * 
+         *
          * @return String
          */
         public String getFileName() {
@@ -106,7 +106,7 @@ public class MultipleUIUploadTest extends AbstractTestUI {
 
         /**
          * Returns the mimeType.
-         * 
+         *
          * @return String
          */
         public String getMimeType() {
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..8dae69afe1 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/StaticViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java
index 813206dbe8..f1cc2a2add 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
index 0d38de5923..95c420a16c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.ui.TextField;
 /**
  * UI test for TextArea behavior when ENTER has been assigned as a keyboard
  * shortcut.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TextAreaEventPropagation extends AbstractTestUIWithLog {
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..3ce7711127 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..0c7fcb6c65 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..1f2837c837 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/UIAutoGeneratedStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
index 35dc4cd325..7346878e28 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 
 /**
  * Empty test ui to check auto-generated style name for UI.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UIAutoGeneratedStyleName extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java
index 7d5bbe156b..6f36c1bf16 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
index 7d9f09892c..37ad97cae6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java
index 9fcc1eedde..4168e7689e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/UiDependenciesInHtml.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
index 96210b2027..ce8963a2ba 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
index e80686f6f3..68c470351f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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/ui/WindowAndUIShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
index c5c9c16e2d..1db45c7ba2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
@@ -23,16 +23,15 @@ public class WindowAndUIShortcuts extends UI {
 
         final VerticalLayout mainLayout = new VerticalLayout();
 
-        mainLayout.addComponent(new Button("Show page",
-                new Button.ClickListener() {
+        mainLayout.addComponent(
+                new Button("Show page", new Button.ClickListener() {
                     @Override
                     public void buttonClick(Button.ClickEvent clickEvent) {
                         final VerticalLayout pageLayout = new VerticalLayout();
                         pageLayout.setSpacing(true);
 
                         pageLayout.addComponent(new Label("Page"));
-                        pageLayout.addComponent(new Button(
-                                "Open dialog window",
+                        pageLayout.addComponent(new Button("Open dialog window",
                                 new Button.ClickListener() {
                                     @Override
                                     public void buttonClick(
@@ -55,12 +54,12 @@ public class WindowAndUIShortcuts extends UI {
                                             Button.ClickEvent clickEvent) {
                                         mainLayout.removeComponent(pageLayout);
 
-                                        Notification
-                                                .show("OMG! Page is also closed!");
+                                        Notification.show(
+                                                "OMG! Page is also closed!");
                                     }
                                 });
-                        closeButton
-                                .setClickShortcut(ShortcutAction.KeyCode.ESCAPE);
+                        closeButton.setClickShortcut(
+                                ShortcutAction.KeyCode.ESCAPE);
                         pageLayout.addComponent(closeButton);
 
                         mainLayout.addComponent(pageLayout);
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 7e7a084eed..475f6c7b0a 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..ef2ed2ffda 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;
     }
@@ -177,7 +178,7 @@ public class TestSampler extends TabSheet {
 
     /**
      * Register a component to the TestSampler for style name changes/additions.
-     * 
+     *
      * @param component
      */
     public void registerComponent(Component component) {
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 6ae220bb3a..3610957ebf 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/uitest/components/WindowsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
index 9a2ebae7f3..18db56ea36 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
@@ -74,7 +74,7 @@ public class WindowsCssTest extends VerticalLayout {
     }
 
     /**
-     * 
+     *
      * @param caption
      * @param primaryStyleName
      *            - the style defined styleName
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/UploadImmediateButtonWidth.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
index 48dd96bc43..c0593b7bb5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..3d26f6cb77 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/upload/UploadTitleWithTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
index e2d47ab901..21c18c1feb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.Upload;
 
 /**
  * Test UI for browser-dependent tootlip for Upload component.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UploadTitleWithTooltip extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
index 7f23362efd..8a99c8f493 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
index 2c5e415408..19887fc5cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.Window;
 /**
  * Reproducing bug #12943 where an action on a Button or ComboBox placed at the
  * bottom of a window in a scroll panel, will scroll up the parent panel.
- * 
+ *
  * This was due to the fact that with the state confirmation notification from
  * the server, the window.setVisible would be call again, and the hack that
  * solved the scrollbars in a window (#11994) would cause the our bug.
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/CloseModalSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
index 4e07c591ae..2b2bf47009 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
index b952df0ed9..34e385fe15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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/ExtraWindowShownWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
index c7379f666b..828855afb6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
@@ -61,10 +61,10 @@ public class ExtraWindowShownWaiAria extends AbstractTestUI {
                         }
 
                         w.setTabStopEnabled(tabStop.getValue());
-                        w.setTabStopTopAssistiveText(topTabStopMessage
-                                .getValue());
-                        w.setTabStopBottomAssistiveText(bottomTabStopMessage
-                                .getValue());
+                        w.setTabStopTopAssistiveText(
+                                topTabStopMessage.getValue());
+                        w.setTabStopBottomAssistiveText(
+                                bottomTabStopMessage.getValue());
 
                         Button close = new Button("Close",
                                 new Button.ClickListener() {
@@ -75,8 +75,8 @@ public class ExtraWindowShownWaiAria extends AbstractTestUI {
                                 });
                         layout.addComponent(close);
                         Button iconButton = new Button("A button with icon");
-                        iconButton.setIcon(new ThemeResource(
-                                "../runo/icons/16/ok.png"));
+                        iconButton.setIcon(
+                                new ThemeResource("../runo/icons/16/ok.png"));
                         layout.addComponent(iconButton);
 
                         event.getButton().getUI().addWindow(w);
@@ -118,10 +118,10 @@ public class ExtraWindowShownWaiAria extends AbstractTestUI {
                         }
 
                         w.setTabStopEnabled(tabStop.getValue());
-                        w.setTabStopTopAssistiveText(topTabStopMessage
-                                .getValue());
-                        w.setTabStopBottomAssistiveText(bottomTabStopMessage
-                                .getValue());
+                        w.setTabStopTopAssistiveText(
+                                topTabStopMessage.getValue());
+                        w.setTabStopBottomAssistiveText(
+                                bottomTabStopMessage.getValue());
 
                         TextField name = new TextField("Name:");
                         form.addComponent(name);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
index 918a991cc1..c9da90e257 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/MaximizeRestoreWindowWithManagedLayout.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java
index 2cbd154dbf..5044691d1b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ModalWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java
index 574a2d4991..01f27dc954 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
index 3fa3730104..f07fb3d177 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java
index a5a4eb6df3..292484faaf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Window;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MoveToTop extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
index 1c82a3de02..7658fa89a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ScrollingBodyElementWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
index 403795b676..492d304d11 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 /**
- * 
+ *
  * @since 7.1.9
  * @author Vaadin Ltd
  */
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 637df36e19..b233ef0d0d 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/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 2a0f60f390..94d9d484b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
@@ -63,7 +63,8 @@ public class SubWindowFocusAndBlurListeners extends TestBase {
             }
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
                 Notification.show("Action!");
             }
         });
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..1d9861fce3 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
@@ -9,7 +9,7 @@ import com.vaadin.ui.Window;
 /**
  * Tests that the styles work correctly in tiny subwindows that have more
  * content than can fit.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TestTooSmallSubwindowSize extends AbstractTestUI {
@@ -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/ToolTipInWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java
index 144b5a0d3f..87524f4166 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2015 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.Window;
 /**
  * Test to demonstrate that tooltips are shown for both Window header and
  * content
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ToolTipInWindow extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
index 1db8e0c87b..d49a424d58 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..f7302cb2fb 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/WindowCloseShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
index d9c22a26ee..39d1ca6839 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
index 0915b93c26..db22aaa246 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.Window;
 
 /**
  * Test UI for Window attached to the UI with not content.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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 a8102a7d1a..49c4c35790 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
@@ -145,8 +145,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/WindowMoveListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java
index 63aebebdad..acc6043d5a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java
@@ -12,7 +12,7 @@ public class WindowMoveListener extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -45,7 +45,7 @@ public class WindowMoveListener extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -56,7 +56,7 @@ public class WindowMoveListener extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 ba991eebec..7782d7518c 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/components/window/WindowThemes.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
index 788adc7902..c9df098d6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.components.window;
 
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 8b8ad4cf70..7801477d3e 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -93,8 +93,9 @@ public class BeanItemContainerFilteringTest extends TestBase {
                 public void valueChange(ValueChangeEvent event) {
                     container.removeAllContainerFilters();
                     if (((CheckBox) event.getProperty()).getValue()) {
-                        container.addContainerFilter("value", filterString
-                                .getValue().toString(), false, false);
+                        container.addContainerFilter("value",
+                                filterString.getValue().toString(), false,
+                                false);
                     }
                 }
             });
@@ -111,8 +112,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);
                         }
@@ -128,13 +130,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);
@@ -150,10 +153,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..fb996bddb9 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
@@ -9,12 +9,12 @@ public class BeanItemContainerTest {
 
     /**
      * Test class for BeanItemContainer
-     * 
+     *
      * @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 a1dba3eed8..6c5c70efdb 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -60,8 +60,8 @@ public class IndexedContainerFilteringTest extends TestBase {
             public void valueChange(ValueChangeEvent event) {
                 container.removeAllContainerFilters();
                 if (((CheckBox) event.getProperty()).getValue()) {
-                    container.addContainerFilter("column1", filterString
-                            .getValue().toString(), false, false);
+                    container.addContainerFilter("column1",
+                            filterString.getValue().toString(), false, false);
                 }
             }
         });
@@ -80,8 +80,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);
@@ -104,9 +104,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);
@@ -122,16 +122,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/CheckboxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 49416a73e5..4d0155c1bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
@@ -15,8 +15,8 @@ import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
-public class CheckboxUpdateProblem extends LegacyApplication implements
-        Property.ValueChangeListener {
+public class CheckboxUpdateProblem extends LegacyApplication
+        implements Property.ValueChangeListener {
     private final DatabaseHelper databaseHelper = new DatabaseHelper();
     private Table testList;
     private final HorizontalSplitPanel horizontalSplit = new HorizontalSplitPanel();
@@ -36,14 +36,15 @@ public class CheckboxUpdateProblem extends LegacyApplication implements
         testList.setImmediate(true);
         testList.addListener(this);
 
-        databaseHelper.getTestContainer().addListener(
-                new ItemSetChangeListener() {
+        databaseHelper.getTestContainer()
+                .addListener(new ItemSetChangeListener() {
                     @Override
-                    public void containerItemSetChange(ItemSetChangeEvent event) {
+                    public void containerItemSetChange(
+                            ItemSetChangeEvent event) {
                         Object selected = testList.getValue();
                         if (selected != null) {
-                            testForm.setItemDataSource(testList
-                                    .getItem(selected));
+                            testForm.setItemDataSource(
+                                    testList.getItem(selected));
                         }
                     }
                 });
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..12528e8c90 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);
@@ -67,7 +67,7 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
 
     /**
      * (Re)creates the test table
-     * 
+     *
      * @param connectionPool
      */
     private void createTestTable(JDBCConnectionPool connectionPool) {
@@ -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();
@@ -95,7 +94,7 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
 
     /**
      * Adds test data to the test table
-     * 
+     *
      * @param connectionPool
      * @throws SQLException
      */
@@ -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..cd5c99e210 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/BrowserContextMenuInSubComponent.java b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
index d3edf0ba43..7033f93bd4 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..51d6aab92e 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..0383c34845 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..9abd22457a 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..abc924c124 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 9d0c835c68..c90bf559b0 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 23c22a7026..abaa17f661 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.data.util.converter.StringToDoubleConverter;
 
-public class StringToDoubleConverterWithThreeFractionDigits extends
-        StringToDoubleConverter {
+public class StringToDoubleConverterWithThreeFractionDigits
+        extends StringToDoubleConverter {
 
     @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/CustomDDImplementation.java b/uitest/src/main/java/com/vaadin/tests/dd/CustomDDImplementation.java
index f6e196761e..ad5d391385 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/CustomDDImplementation.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.Layout;
 /**
  * Test/Example/Draft code how to build custom DD implementation using the thing
  * framework provided by Vaadin.
- * 
+ *
  */
 public class CustomDDImplementation extends CustomComponent {
 
@@ -30,12 +30,12 @@ public class CustomDDImplementation extends CustomComponent {
     /**
      * Server side component that accepts drags must implement HasDropHandler
      * that have one method to get reference of DropHandler.
-     * 
+     *
      * DropHandler may be implemented directly or probably most commonly using a
      * half baked implementation {@link AbstractDropHandler}.
-     * 
+     *
      * Check the @ClientWidget
-     * 
+     *
      */
     class MyDropTarget extends AbstractComponent implements DropTarget {
         @Override
@@ -71,12 +71,12 @@ public class CustomDDImplementation extends CustomComponent {
     /**
      * Server side implementation of source does not necessary need to contain
      * anything.
-     * 
+     *
      * Check the @ClientWidget
-     * 
+     *
      * However component might have different modes to support starting drag
      * operations that are controlled via server side api.
-     * 
+     *
      */
     public class MyDragSource extends AbstractComponent implements Component {
 
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..ef64fb44d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
@@ -18,7 +18,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test for interrupting drag-and-drop.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Widgetset(TestingWidgetSet.NAME)
@@ -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..4aed1bf196 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,10 +55,11 @@ 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() {
             /**
-             * 
+             *
              */
             private static final long serialVersionUID = 1L;
 
@@ -120,7 +121,7 @@ public class DDTest1 extends TestBase {
         /*
          * Moves items in tree (and could work in Table too). Also supports
          * "building" tree.
-         * 
+         *
          * TODO fix algorithm, broken in some cases.
          */
         DropHandler itemSorter = new DropHandler() {
@@ -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..ebc09a7685 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
@@ -73,7 +73,7 @@ public class DDTest2 extends TestBase {
         /*
          * An example of lazy initializing drop criterion with component
          * specific api for easy rule writing.
-         * 
+         *
          * Example is pretty stupid (accepts drop on all nodes, but by
          * explicitly defining them here), but demonstrates lazy initialization
          * option if rules are heavy.
@@ -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..45adff78cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
@@ -51,9 +51,9 @@ public class DDTest8 extends AbstractTestUI {
     /**
      * Moves items in tree (and could work in Table too). Also supports
      * "building" tree.
-     * 
+     *
      * TODO fix algorithm, broken in some cases.
-     * 
+     *
      * @param tree
      * @param container
      * @return drop handler
@@ -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..79b21fffbc 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
@@ -38,7 +38,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler {
     }
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
 
@@ -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..7d09e96d00 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -22,8 +22,8 @@ import com.vaadin.ui.Window;
 /**
  * Same as with css layout but tests size change propagation on emphasis +
  * rules.
- * 
- * 
+ *
+ *
  */
 public class HorizontalLayoutSortableWithWrappers extends Window {
 
@@ -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..3aeae77dec 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..a8fb07ea2b 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 b86cb361c0..ae92e32460 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -81,8 +81,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
@@ -259,20 +259,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),
@@ -308,8 +305,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/debug/HierarchyAfterAnalyzeLayouts.java b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
index 88b0386c97..89ce67cda7 100644
--- a/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
index 0ac2e87510..5c6d587884 100644
--- a/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java
index 7daf38a0e5..04a16589ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java
index d8c23a390f..183ae96436 100644
--- a/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test UI for PUSH version string in debug window.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PushVersionInfo extends AbstractTestUI {
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..eec5a0c289 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/declarative/Potus.java b/uitest/src/main/java/com/vaadin/tests/declarative/Potus.java
index 23448a9b7f..a203a7464a 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/Potus.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/Potus.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,7 +18,7 @@ package com.vaadin.tests.declarative;
 import java.util.Date;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
index 70ad956045..cc5a5748f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java
index f1d94f7f16..cffa7924cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.UI;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
index 506a25f663..8fec33ac33 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/BasicExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java
index a9615ff5d7..5ea476bfe3 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java
index c56cfb10ab..a019cc5b8a 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
index 732b1aca74..ff3ab1767b 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java
index 34711a4b92..ffb10801bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index 021d2dfa30..f90ab259ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/JavascriptManagerTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java
index f2a8b24cb1..f7f829aefc 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java b/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
index f61d3b8bdd..201ca0d4a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,11 +21,11 @@ import com.vaadin.ui.UI;
 /**
  * Test extension for finding out the size of the measuredSizes map of
  * LayoutManagerIE8.
- * 
+ *
  * This UI extension uses JSNI to register a JavaScript method
  * window.vaadin.getMeasuredSizesCount() that can be used to query the size of
  * the internal map of the layout manager. It should only be used on IE8.
- * 
+ *
  * @since 7.1.13
  * @author Vaadin Ltd
  */
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/ResponsiveWithCrossDomainStyles.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
index 9f9453d505..129ede05a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..1d0418d671 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..a095276355 100644
--- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 0405ea2e10..5c7a83385e 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,7 +64,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -134,7 +134,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
             /*
              * Currently only sets the initial state because of
              * https://dev.vaadin.com/ticket/17847
-             * 
+             *
              * Must set lastName state initially as BeanFieldGroup can't tell it
              * should be read-only before setting an item data source
              */
@@ -264,8 +264,8 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
 
         public AutoGeneratedForm(Class<? extends Field> class1) {
             for (String p : columns) {
-                Field f = fieldGroup.getFieldFactory().createField(
-                        container.getType(p), class1);
+                Field f = fieldGroup.getFieldFactory()
+                        .createField(container.getType(p), class1);
                 f.setCaption(SharedUtil.propertyIdToHumanFriendly(p));
                 fieldGroup.bind(f, p);
                 addComponent(f);
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..4db138281b 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/BasicCrudGridEditorRow.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
index 0fc0669288..20719214d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,21 +44,17 @@ public class BasicCrudGridEditorRow extends AbstractBasicCrud {
         grid.addSelectionListener(new SelectionListener() {
             @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);
             }
         });
         grid.setEditorEnabled(true);
         grid.setSizeFull();
-        grid.getColumn("age")
-                .getEditorField()
-                .addValidator(
-                        new IntegerRangeValidator("Must be between 0 and 100",
-                                0, 100));
-        grid.getColumn("birthDate").setRenderer(
-                new DateRenderer(DateFormat.getDateInstance(DateFormat.MEDIUM,
-                        Locale.US)));
+        grid.getColumn("age").getEditorField().addValidator(
+                new IntegerRangeValidator("Must be between 0 and 100", 0, 100));
+        grid.getColumn("birthDate").setRenderer(new DateRenderer(
+                DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
         addComponent(grid);
         getLayout().setExpandRatio(grid, 1);
     }
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..664299451a 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/BasicPersonForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index 52d3e60af5..5feda6c261 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
@@ -71,8 +71,8 @@ public class BasicPersonForm extends AbstractTestUIWithLog {
             confFieldGroup.setBuffered(false);
 
             for (Object propertyId : bi.getItemPropertyIds()) {
-                ((ComponentContainer) getContent()).addComponent(confFieldGroup
-                        .buildAndBind(propertyId));
+                ((ComponentContainer) getContent())
+                        .addComponent(confFieldGroup.buildAndBind(propertyId));
             }
 
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java
index d6d657379a..6444af1bf7 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/Country.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Country.java
index 2c2ffd7160..11ff8f1cdd 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/Country.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Country.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
index 6080f18391..8bea8a0bdf 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
@@ -127,8 +127,8 @@ public class DateForm extends AbstractTestUIWithLog {
         addComponent(discardButton);
         addComponent(showBean);
 
-        DateObject d = new DateObject(new Date(443457289789L), new Date(
-                443457289789L), new Date(443457289789L),
+        DateObject d = new DateObject(new Date(443457289789L),
+                new Date(443457289789L), new Date(443457289789L),
                 new Date(443457289789L));
         fieldGroup.setItemDataSource(new BeanItem<DateObject>(d));
     }
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 2c202af02b..e5ad382dfe 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 5f25070f2e..eb3aadea92 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 6caa8f3e26..71c310d764 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
@@ -45,10 +45,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/fieldgroup/Gender.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Gender.java
index dcc6687c17..706e4c2d2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/Gender.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Gender.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
index 58f2292f84..c2d1b67e8b 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
@@ -39,8 +39,8 @@ public class MultipleValidationErrors extends AbstractTestUI {
                 try {
                     fieldGroup.commit();
                 } catch (FieldGroup.CommitException e) {
-                    if (e.getCause() != null
-                            && e.getCause() instanceof Validator.InvalidValueException) {
+                    if (e.getCause() != null && e
+                            .getCause() instanceof Validator.InvalidValueException) {
                         validationErrors.setValue(StringEscapeUtils
                                 .unescapeHtml(AbstractErrorMessage
                                         .getErrorMessageForException(
diff --git a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
index e9d2b91e95..37f0fa6452 100644
--- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -71,13 +71,13 @@ public class FontIcons extends AbstractTestUI {
 
         layout.setIcon(icon);
 
-        layout.addComponent(new Button("Switch icon type",
-                new Button.ClickListener() {
+        layout.addComponent(
+                new Button("Switch icon type", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        buildUI(icon instanceof FontIcon ? new ThemeResource(
-                                "../runo/icons/16/user.png")
+                        buildUI(icon instanceof FontIcon
+                                ? new ThemeResource("../runo/icons/16/user.png")
                                 : FontAwesome.ANDROID);
                     }
                 }));
@@ -86,7 +86,8 @@ public class FontIcons extends AbstractTestUI {
             Action[] actions = { new Action("Do it!", icon) };
 
             @Override
-            public void handleAction(Action action, Object sender, Object target) {
+            public void handleAction(Action action, Object sender,
+                    Object target) {
 
             }
 
@@ -109,10 +110,9 @@ public class FontIcons extends AbstractTestUI {
         layout.addComponent(gl);
 
         // Basic components, caption icon only
-        Class<?>[] components = { Button.class, CheckBox.class,
-                DateField.class, NativeButton.class, Link.class, Label.class,
-                Panel.class, Slider.class, TextArea.class, TextField.class,
-                Upload.class };
+        Class<?>[] components = { Button.class, CheckBox.class, DateField.class,
+                NativeButton.class, Link.class, Label.class, Panel.class,
+                Slider.class, TextArea.class, TextField.class, Upload.class };
         for (Class<?> clazz : components) {
             Component c;
             try {
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 800a056041..78b51c7ecd 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/LiferayThemeDemo.java b/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
index 8a8df93742..9f89938ae8 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
@@ -80,10 +80,8 @@ public class LiferayThemeDemo extends LegacyApplication {
 
         @Override
         public Action[] getActions(Object target, Object sender) {
-            return new Action[] {
-                    new Action("Open"),
-                    new Action("Delete", new ThemeResource(
-                            "../runo/icons/16/trash.png")) };
+            return new Action[] { new Action("Open"), new Action("Delete",
+                    new ThemeResource("../runo/icons/16/trash.png")) };
         }
     };
 
@@ -153,10 +151,10 @@ public class LiferayThemeDemo extends LegacyApplication {
         l.addComponent(b);
 
         b = new NativeButton("Native Button");
-        b.setDescription("<h2><img src=\"/html/VAADIN/themes/runo/icons/16/globe.png\"/>A richtext tooltip</h2>"
-                + "<ul>"
-                + "<li>HTML formatting</li><li>Images<br/>"
-                + "</li><li>etc...</li></ul>");
+        b.setDescription(
+                "<h2><img src=\"/html/VAADIN/themes/runo/icons/16/globe.png\"/>A richtext tooltip</h2>"
+                        + "<ul>" + "<li>HTML formatting</li><li>Images<br/>"
+                        + "</li><li>etc...</li></ul>");
         l.addComponent(b);
 
         b = new CheckBox("Checkbox");
@@ -353,9 +351,9 @@ public class LiferayThemeDemo extends LegacyApplication {
         pl.addComponent(new Label("Panel content"));
         l.addComponent(p);
 
-        l.addComponent(new Label(
-                "Light Style (<code>LiferayTheme.PANEL_LIGHT</code>)",
-                ContentMode.HTML));
+        l.addComponent(
+                new Label("Light Style (<code>LiferayTheme.PANEL_LIGHT</code>)",
+                        ContentMode.HTML));
 
         VerticalLayout p2l = new VerticalLayout();
         p2l.setMargin(true);
@@ -381,8 +379,8 @@ public class LiferayThemeDemo extends LegacyApplication {
         t.setColumnReorderingAllowed(true);
         t.addActionHandler(handler);
 
-        t.addContainerProperty("First", String.class, null, "First",
-                ICON_GLOBE, Table.ALIGN_RIGHT);
+        t.addContainerProperty("First", String.class, null, "First", ICON_GLOBE,
+                Table.ALIGN_RIGHT);
         t.addContainerProperty("Second", String.class, null);
         t.addContainerProperty("Third", String.class, null);
         t.addContainerProperty("Fourth", TextField.class, null);
@@ -624,8 +622,8 @@ public class LiferayThemeDemo extends LegacyApplication {
             @Override
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_WARNING_MESSAGE, true).show(Page
-                        .getCurrent());
+                        Notification.TYPE_WARNING_MESSAGE, true)
+                                .show(Page.getCurrent());
 
             }
         });
@@ -636,8 +634,8 @@ public class LiferayThemeDemo extends LegacyApplication {
             @Override
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_ERROR_MESSAGE, true).show(Page
-                        .getCurrent());
+                        Notification.TYPE_ERROR_MESSAGE, true)
+                                .show(Page.getCurrent());
 
             }
         });
@@ -648,8 +646,8 @@ public class LiferayThemeDemo extends LegacyApplication {
             @Override
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_TRAY_NOTIFICATION, true).show(Page
-                        .getCurrent());
+                        Notification.TYPE_TRAY_NOTIFICATION, true)
+                                .show(Page.getCurrent());
 
             }
         });
@@ -683,8 +681,8 @@ public class LiferayThemeDemo extends LegacyApplication {
         menubar.setWidth("100%");
         final MenuBar.MenuItem file = menubar.addItem("File", null);
         final MenuBar.MenuItem newItem = file.addItem("New", null);
-        file.addItem("Open file...", new ThemeResource(
-                "../runo/icons/16/folder.png"), null);
+        file.addItem("Open file...",
+                new ThemeResource("../runo/icons/16/folder.png"), null);
         file.addSeparator();
 
         newItem.addItem("File", null);
@@ -714,8 +712,8 @@ public class LiferayThemeDemo extends LegacyApplication {
         find.addItem("Google Search", new Command() {
             @Override
             public void menuSelected(MenuItem selectedItem) {
-                getMainWindow().open(
-                        new ExternalResource("http://www.google.com"));
+                getMainWindow()
+                        .open(new ExternalResource("http://www.google.com"));
             }
         });
         find.addSeparator();
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..667365e9ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -8,11 +8,11 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * On Liferay in a freeform layout, this application should get its height from
  * the height of the portlet container in the Liferay layout.
- * 
+ *
  * 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..99831fb6a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/integration/ServletIntegrationDefaultPushUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
index 4c3e1beaa5..83733b1854 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,7 +19,7 @@ import com.vaadin.annotations.Push;
 
 /**
  * Server test which uses the default push mechanisms
- * 
+ *
  * @since 7.1.12
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
index 0bcac5575d..752d07a545 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.shared.ui.ui.Transport;
 
 /**
  * Server test which uses long polling
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
index 5d5801f0db..3a190005c0 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.shared.ui.ui.Transport;
 
 /**
  * Server test which uses streaming
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
index 18e275618a..f3abd99304 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
 /**
  * Server test which uses websockets
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -31,7 +31,7 @@ public class ServletIntegrationWebsocketUI extends ServletIntegrationUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.tests.integration.IntegrationTestUI#init(com.vaadin.server
      * .VaadinRequest)
diff --git a/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
index cfebfef004..3ac5f17e4c 100644
--- a/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 74cfe12ad7..d2017c6f40 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -245,8 +245,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);
             }
@@ -260,10 +260,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/CaptionsInLayoutsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
index ec323f2db2..afeb53f633 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
@@ -337,8 +337,8 @@ public class CaptionsInLayoutsWaiAria extends TestBase {
             for (String width : new String[] { "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);
             }
@@ -352,10 +352,11 @@ public class CaptionsInLayoutsWaiAria extends TestBase {
             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/CssLayoutAbsoluteUrl.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
index e5430a09af..86aeb4f687 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 923f91f246..de35ef6fc9 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
@@ -42,21 +42,24 @@ public class GridLayoutCaptions extends TestBase {
                 } else if (propertyId.equals(DataPOJO.Fields.hp.name())) {
                     Field<?> f = DefaultFieldFactory.get().createField(item,
                             propertyId, uiContext);
-                    f.setCaption("This is a long caption for the HP field, but it has a VL as a wrapper");
+                    f.setCaption(
+                            "This is a long caption for the HP field, but it has a VL as a wrapper");
 
                     return f;
 
                 } else if (propertyId.equals(DataPOJO.Fields.place.name())) {
                     Field<?> f = DefaultFieldFactory.get().createField(item,
                             propertyId, uiContext);
-                    f.setCaption("This is a long caption for the Place field, but it has a CSSLo as a wrapper");
+                    f.setCaption(
+                            "This is a long caption for the Place field, but it has a CSSLo as a wrapper");
 
                     return f;
 
                 } else if (propertyId.equals(DataPOJO.Fields.price.name())) {
                     Field<?> f = DefaultFieldFactory.get().createField(item,
                             propertyId, uiContext);
-                    f.setCaption("With size undefined the caption behaves like this...");
+                    f.setCaption(
+                            "With size undefined the caption behaves like this...");
                     f.setSizeFull();
 
                     return f;
@@ -98,9 +101,8 @@ public class GridLayoutCaptions extends TestBase {
                     "Ipsum lipsum laarum lop... ");
 
             for (Object propIDs : getItemDataSource().getItemPropertyIds()) {
-                ((TextField) getField(propIDs))
-                        .setComponentError(AbstractErrorMessage
-                                .getErrorMessageForException(ive));
+                ((TextField) getField(propIDs)).setComponentError(
+                        AbstractErrorMessage.getErrorMessageForException(ive));
 
             }
 
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 4bf33903a1..5eb1f81e99 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.LegacyWindow;
 import com.vaadin.ui.TextField;
 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/HorizontalLayoutAndCaretPosition.java b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
index a8a25d03ce..455a22ff4f 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,13 +24,13 @@ import com.vaadin.ui.TextField;
 
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
index 9381f2caeb..4bb3c50415 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
index 830b96b3d7..e03e346dee 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java b/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
index 504ee8b41b..e4085f6854 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -55,7 +55,7 @@ public class IE8MeasuredSizeMemoryLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -91,7 +91,7 @@ public class IE8MeasuredSizeMemoryLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -101,7 +101,7 @@ public class IE8MeasuredSizeMemoryLeak extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 4e50f0d83b..6034eea5c1 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/MarginWithExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java
index 3697ab1c26..fd6654bfc3 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 364a0e267a..aa9d9dd0f1 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/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 3d4b20d5d9..2f1df7152e 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) {
@@ -364,9 +394,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 +435,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 +476,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 +514,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 +759,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 +1078,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/RelativeSizeInUndefinedCssLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
index a139c7f67a..a28ba9960d 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 5abe915307..eb95e84adb 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java
@@ -50,8 +50,8 @@ public class TestAbsoluteLayout extends TestBase {
                 s.setNullSelectionAllowed(false);
                 for (int i = 0; i < Layout.Unit.values().length; i++) {
                     Item unitItem = s.addItem(i);
-                    unitItem.getItemProperty("caption").setValue(
-                            Layout.Unit.values()[i]);
+                    unitItem.getItemProperty("caption")
+                            .setValue(Layout.Unit.values()[i]);
                 }
                 return s;
             }
@@ -173,8 +173,8 @@ public class TestAbsoluteLayout extends TestBase {
                     select.addListener(new ValueChangeListener() {
                         @Override
                         public void valueChange(ValueChangeEvent event) {
-                            editcomponent((Component) event.getProperty()
-                                    .getValue());
+                            editcomponent(
+                                    (Component) event.getProperty().getValue());
                             getMainWindow().removeWindow(chooser);
                         }
 
@@ -217,9 +217,8 @@ public class TestAbsoluteLayout extends TestBase {
                             // we are only interested in .class files
                             if (files[j].endsWith(".class")) {
                                 // removes the .class extension
-                                String p = resource.toString()
-                                        + files[j].substring(0,
-                                                files[j].length() - 6);
+                                String p = resource.toString() + files[j]
+                                        .substring(0, files[j].length() - 6);
                                 p = p.replaceAll(".*classes/", "");
                                 p = p.replaceAll("/", ".");
                                 Class<?> c;
@@ -227,10 +226,10 @@ public class TestAbsoluteLayout extends TestBase {
                                     c = Class.forName(p);
                                     if (AbstractComponent.class
                                             .isAssignableFrom(c)
-                                            && !p.toLowerCase().contains(
-                                                    "layout")
-                                            && !p.toLowerCase().contains(
-                                                    "abstract")) {
+                                            && !p.toLowerCase()
+                                                    .contains("layout")
+                                            && !p.toLowerCase()
+                                                    .contains("abstract")) {
                                         container.addItem(c);
                                     }
                                 } catch (ClassNotFoundException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 22a37022c2..ae007794e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -36,10 +36,12 @@ public class TestLayoutClickListeners extends AbstractTestUIWithLog {
         al.setStyleName("borders");
         al.setWidth("300px");
         al.setHeight("500px");
-        al.addComponent(new TextField("This is its caption",
-                "This is a textfield"), "top: 60px; left: 0px; width: 100px;");
-        al.addComponent(new TextField("Another textfield caption",
-                "This is another textfield"),
+        al.addComponent(
+                new TextField("This is its caption", "This is a textfield"),
+                "top: 60px; left: 0px; width: 100px;");
+        al.addComponent(
+                new TextField("Another textfield caption",
+                        "This is another textfield"),
                 "top: 120px; left: 20px; width: 100px;");
 
         al.addComponent(new Button("A button with its own click listener",
@@ -71,8 +73,8 @@ public class TestLayoutClickListeners extends AbstractTestUIWithLog {
         cl.setStyleName("borders");
         cl.setWidth("300px");
         cl.setHeight("500px");
-        cl.addComponent(new TextField("This is its caption",
-                "This is a textfield"));
+        cl.addComponent(
+                new TextField("This is its caption", "This is a textfield"));
         cl.addComponent(new TextField("Another textfield caption",
                 "This is another textfield"));
 
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 bc7268356d..19629437cb 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.LegacyWindow;
 import com.vaadin.ui.TextField;
 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/customlayout/DefaultLocationInCustomLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
index 18ec491c0b..58743e9168 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 cd86fbcf3c..a90dfa583c 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/gridlayout/GridSpanEmptyColumns.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
index fc37455752..83f31e83aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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 7ea8739cf4..ead8138beb 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/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
index 02fcb677cd..73176f46fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
@@ -229,7 +229,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -242,7 +242,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -276,7 +276,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 84254b4935..69f1942d9e 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
@@ -36,7 +36,7 @@ public class GridAddReplaceMove extends GridBaseLayoutTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -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/minitutorials/broadcastingmessages/Broadcaster.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
index e268aed7b6..cd73f87523 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 dbe1cbb717..7b7ba1e792 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/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index 3ff1c2df40..89d0e43753 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
@@ -14,8 +14,8 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class SimpleLoginView extends CustomComponent implements View,
-        Button.ClickListener {
+public class SimpleLoginView extends CustomComponent
+        implements View, Button.ClickListener {
 
     public static final String NAME = "login";
 
@@ -33,8 +33,8 @@ public class SimpleLoginView extends CustomComponent implements View,
         user.setWidth("300px");
         user.setRequired(true);
         user.setInputPrompt("Your username (eg. joe@email.com)");
-        user.addValidator(new EmailValidator(
-                "Username must be an email address"));
+        user.addValidator(
+                new EmailValidator("Username must be an email address"));
         user.setInvalidAllowed(false);
 
         // Create the password input field
@@ -50,7 +50,8 @@ public class SimpleLoginView extends CustomComponent implements View,
 
         // Add both to a panel
         VerticalLayout fields = new VerticalLayout(user, password, loginButton);
-        fields.setCaption("Please login to access the application. (test@test.com/passw0rd)");
+        fields.setCaption(
+                "Please login to access the application. (test@test.com/passw0rd)");
         fields.setSpacing(true);
         fields.setMargin(new MarginInfo(true, true, true, false));
         fields.setSizeUndefined();
@@ -72,8 +73,8 @@ public class SimpleLoginView extends CustomComponent implements View,
     /*
      * Validator for validating the passwords
      */
-    private static final class PasswordValidator extends
-            AbstractValidator<String> {
+    private static final class PasswordValidator
+            extends AbstractValidator<String> {
 
         public PasswordValidator() {
             super("The password provided is not valid");
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..9c38102840 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);
@@ -57,7 +58,7 @@ public class CSSInjectWithColorpicker extends UI {
 
     /**
      * Creates a text editor for visually editing text
-     * 
+     *
      * @param text
      *            The text editor
      * @return
@@ -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_3/ThemeChangeUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
index c0082edcca..93f9fb59ab 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
index 3204ebd11c..582ff1e927 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
index 57e807a224..64357f2b67 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 3fd9c87262..f47202ff37 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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";
                     }
                 }
@@ -62,8 +63,8 @@ public class FormattingDataInGrid extends UI {
             public String convertToPresentation(Integer value,
                     Class<? extends String> targetType, Locale locale)
                     throws Converter.ConversionException {
-                String stringRepresentation = super.convertToPresentation(
-                        value, targetType, locale);
+                String stringRepresentation = super.convertToPresentation(value,
+                        targetType, locale);
                 if (value.intValue() % 2 == 0) {
                     return "<strong>" + stringRepresentation + "</strong>";
                 } else {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
index c39f458a6b..d64c45e5c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
index 539d3431e8..8cd4b78ede 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
index 72f101ab7a..2d76054e91 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
index 4cf3f14c2b..f4fbadade0 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..449dc637b7 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..b35926be9a 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.VerticalLayout;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Auto%20generating%20
  * a%20form%20based%20on%20a%20bean%20-%20Vaadin%206%20style%20Form
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -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/BasicApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
index a0e4a5851b..af8beb5c97 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Creating%20a%20basic%20application
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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 952cf8c681..989fea3fb9 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.ui.UI;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Creating%20an%20application
  * %20that%20preserves%20state%20on%20refresh
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -48,7 +48,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/DefineUITheme.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
index 408995867c..da8a845f3e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Defining%20the%20theme%20for%20a%20Root
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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..bbab0df296 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.UI;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Creating%20an%20application
  * %20with%20different%20features%20for%20different%20clients
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -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/FindCurrentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index b744a8de5c..0b8585dd79 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.UI;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Finding%20the%20current
  * %20Root%20and%20Application
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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 84f6ec26ff..26176ea858 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/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index 9a9bc8fae0..fd0dc07a1e 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 TextField textField = new TextField("Text field", integerProperty);
+        final TextField textField = new TextField("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..346abd5d5d 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Creating%20multi%20tab%20applications
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -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/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 8197cd82ae..df81050a07 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
@@ -59,8 +59,8 @@ class StringToNameConverter implements Converter<String, Name> {
         }
         String[] parts = text.split(" ");
         if (parts.length != 2) {
-            throw new ConversionException("Can not convert text to a name: "
-                    + text);
+            throw new ConversionException(
+                    "Can not convert text to a name: " + text);
         }
         return new Name(parts[0], parts[1]);
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index 39aef56a1e..77491f792d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.ui.UI;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Using%20Bean%20Validation
  * %20to%20validate%20input
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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..363df23a4d 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Using%20URI%20fragments
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -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..2e3d7d3581 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Using%20URI%20or%20
  * parameters%20or%20screen%20size%20when%20initializing%20an%20application
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -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/ComponentInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
index 18a27b85b2..a217d519d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
index 986811e0f4..43308ced30 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.VerticalLayout;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Using%20Components%
  * 20in%20the%20shared%20state
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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..75b06e02ef 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/MyComponentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
index f291dfe1a9..9f49b1f61d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.ui.UI;
  * 20events%20from%20the%20client%20to%20the%20server%20using%20RPC,
  * https://vaadin
  * .com/wiki/-/wiki/Main/Using%20RPC%20to%20send%20events%20to%20the%20client
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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..544e7c3b59 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,12 +28,12 @@ import com.vaadin.client.ui.layout.ElementResizeListener;
  * https
  * ://vaadin.com/wiki/-/wiki/Main/Lightweight%20calculations%20of%20widget%20l
  * ayout and https://vaadin.com/wiki/-/wiki/Main/Complex%20widget%20layouts
- * 
+ *
  * @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/ResourceInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
index b22d3dfc1a..1e881d8f08 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
index 148e7f22ea..49c93aa223 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.UI;
  * Mini tutorial code for
  * https://vaadin.com/wiki/-/wiki/Main/Using%20Resources%20
  * in%20the%20shared%20state
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
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/Analytics.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java
index 338fb20893..15b7244a78 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
index b12f5829fc..a5de408474 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
index 4165e63951..eb806c61ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
index 19a7da7114..8411a857ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
index 002e3478bf..996062d93b 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
index 7b37166eab..e2da305eda 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
index 1bc282de19..76244b3216 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
index d233a54d86..c16a1b04cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..8f1df6bc5c 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/FlotHighlightRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
index 99c4fdd91b..060514ee03 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..db2eff21e9 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/v7a3/RedButton.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java
index 5c5037d5ad..fb8d9e5e1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
index fb6a4dc83a..df77b7293e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
index e9243ac0cb..ffa63975bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java
index 696137c3b1..ae05322deb 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
index 4fbe62a2ce..87ef3b529b 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..634da84963 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/v7b1/CapsLockWarningWithRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
index 280be5982e..dc36825bbf 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
index 03310ab9e8..1552d4280f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
index 4e70748985..262c14e42e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
index 0356b4c5a8..864d4c148f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 99b5973661..a923185869 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..b6a7af1038 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/v7b6/MyPopupUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
index eb9afc02cd..2d09b8f27f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
index da9c73dd94..52e14239d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 28f8443440..111c295dc3 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/minitutorials/v7b9/NavigationtestUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
index 62941443b2..e066e945c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
@@ -29,23 +29,23 @@ public class NavigationtestUI extends UI {
         /*
          * Commented away from other example // no fragment for main view
          * navigator.addView(MainView.NAME, new MainView(navigator));
-         * 
+         *
          * navigator.addView(CountView.NAME, CountView.class);
-         * 
+         *
          * // #message adds a label with whatever it receives as a parameter
          * navigator.addView(MessageView.NAME, new MessageView());
-         * 
+         *
          * // #secret works as #message, but you need to be logged in
          * navigator.addView(SecretView.NAME, new SecretView());
-         * 
+         *
          * // #login will navigate to the main view if invoked via this
          * mechanism navigator.addView(LoginView.NAME, new LoginView(navigator,
          * MainView.NAME));
-         * 
+         *
          * // we'll handle permissions with a listener here, you could also do
          * // that in the View itself. navigator.addViewChangeListener(new
          * ViewChangeListener() {
-         * 
+         *
          * @Override public boolean beforeViewChange(ViewChangeEvent event) { if
          * (((NavigationtestUI)UI.getCurrent()).getLoggedInUser() == null) { //
          * Show to LoginView instead, pass intended view String
@@ -54,11 +54,11 @@ public class NavigationtestUI extends UI {
          * fragmentAndParameters += event.getParameters(); }
          * navigator.getDisplay().showView(new LoginView(navigator,
          * fragmentAndParameters)); return false;
-         * 
+         *
          * } else { return true; } }
-         * 
+         *
          * @Override public void afterViewChange(ViewChangeEvent event) {
-         * 
+         *
          * } });
          */
         // react to initial fragment, received before we created the Navigator
diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
index ebbc684c9c..62aa8eec86 100644
--- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
@@ -37,9 +37,8 @@ public class NavigatorTest extends UI {
         @Override
         public void enter(ViewChangeEvent event) {
             String params = event.getParameters();
-            log.log("Navigated to ListView "
-                    + (params.isEmpty() ? "without params" : "with params "
-                            + params));
+            log.log("Navigated to ListView " + (params.isEmpty()
+                    ? "without params" : "with params " + params));
             removeAllItems();
             for (String arg : params.split(",")) {
                 addItem(arg.split("=|$", 2), arg);
@@ -52,9 +51,8 @@ public class NavigatorTest extends UI {
         @Override
         public void enter(ViewChangeEvent event) {
             String params = event.getParameters();
-            log.log("Navigated to EditView "
-                    + (params.isEmpty() ? "without params" : "with params "
-                            + params));
+            log.log("Navigated to EditView " + (params.isEmpty()
+                    ? "without params" : "with params " + params));
             setValue("Displaying edit view with parameters " + params);
         }
     }
@@ -75,9 +73,8 @@ public class NavigatorTest extends UI {
         @Override
         public void enter(ViewChangeEvent event) {
             String params = event.getParameters();
-            log.log("Navigated to DefaultView "
-                    + (params.isEmpty() ? "without params" : "with params "
-                            + params));
+            log.log("Navigated to DefaultView " + (params.isEmpty()
+                    ? "without params" : "with params " + params));
             setValue("Default view: " + event.getParameters());
         }
     }
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/BarInUIDL.java b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java
index a5d23dcd1f..75d9e71494 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ public class BarInUIDL extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -46,7 +46,7 @@ public class BarInUIDL extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -56,7 +56,7 @@ public class BarInUIDL extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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..4b0fa9219b 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/BasicPushLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushLongPolling.java
index 8b6f634aae..ae1f1ee86d 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPushLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushLongPolling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java
index c906c5f6e1..5316c29d69 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java
index 84c0b19ce8..386ff700dc 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java
index e31eb2a369..82996e1820 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/ExtremelyLongPushTime.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTime.java
index 815b85ecc4..816f4d2e47 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTime.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTime.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ public abstract class ExtremelyLongPushTime extends PushLargeData {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
diff --git a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
index 3080b96ec4..a4864238b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
index 04a9c68e32..ad23afd857 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
index f73e7b728c..a276bd23bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java b/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java
index 190f6daa24..5917c9fec9 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
index 5e56a5f361..850282cfd1 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 7da58af1da..bb57e1fbaf 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.push;
 
@@ -40,7 +40,7 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -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/PushFromInit.java b/uitest/src/main/java/com/vaadin/tests/push/PushFromInit.java
index 63af3d9ec7..941ce3bed0 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushFromInit.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 f9625b80be..bce96e8d25 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.push;
 
@@ -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/PushLargeDataLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataLongPolling.java
index c2fdb5ae95..f7165a1dfc 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataLongPolling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java
index ef300ab222..3798fb221a 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java
index a893d7f1ef..92c032aae1 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java
index 93e9d392ee..182c388bdc 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java b/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java
index 4d02c4e62e..b992928d88 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 4e192db7f8..2faaead8ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
index 74d089374c..3fc7f0c428 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
index 04aad63813..4904c52a53 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.push;
 
@@ -29,7 +29,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -40,7 +40,7 @@ public class TablePushStreaming extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -105,7 +105,7 @@ public class TablePushStreaming extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -115,7 +115,7 @@ public class TablePushStreaming extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 e662545134..5413ae471b 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,13 +38,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(new ValueChangeListener() {
             @Override
@@ -58,8 +57,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();
@@ -86,8 +85,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..c51987f9a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/requesthandlers/CommunicationError.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java
index 26f3dff1a2..3655e056f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java
+++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.ui.UI;
 
 /**
  * Test UI provider to check communication error json object null values.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CommunicationError extends UIProvider {
diff --git a/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java
index b6e409d4ba..08bcde60fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/DownloadWithPush.java b/uitest/src/main/java/com/vaadin/tests/resources/DownloadWithPush.java
index 9cbd8ed823..6f2e39d2ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/DownloadWithPush.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/DownloadWithPush.java
@@ -85,7 +85,6 @@ public class DownloadWithPush extends AbstractTestUIWithLog {
         return hugeFileResource;
     }
 
-
     @Override
     protected Integer getTicketNumber() {
         return 19709;
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/PublishedFileHandlerCaching.java b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
index a2828032c7..768b556e8e 100644
--- a/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 
 /**
  * This class tests the caching behavior of PublishedFileHandler.
- * 
+ *
  * Previously PublishedFileHandler did not include cache headers in it's
  * responses. Unfortunately there isn't a good way to automate this test, so
  * manual testing is required at this time. To test the caching behavior run
@@ -28,11 +28,11 @@ import com.vaadin.tests.components.AbstractTestUI;
  * configuration, and access it through the url
  * http://localhost:8888/run/com.vaadin
  * .tests.resources.PublishedFileHandlerCaching?restartApplication
- * 
+ *
  * On loading the page you'll need to examine the network traffic (e.g. with
  * FireBug), keeping an eye on the GET requests for cachingtest.js and it's
  * cache headers.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -45,7 +45,7 @@ public class PublishedFileHandlerCaching extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -56,7 +56,7 @@ public class PublishedFileHandlerCaching extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -66,7 +66,7 @@ public class PublishedFileHandlerCaching extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/LoggingServerRpcHandler.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
index 1cb66972ef..2eabe13b5b 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
index 5eff9b56d9..4c2bbaf5fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java
index a70a51b603..54bc97ea32 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
index adb4302ba3..26f949591c 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..2c971c1561 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ChangeStateWhenReattaching.java b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
index 814d52048f..37b5c2bb89 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java
index 96f003d6c5..6e11e92887 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
index b01a6b243a..d85446d84e 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..2620091269 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GenericWidgetHandling.java b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java
index 7f599f2c0a..9b4a1df94e 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..675fd3d998 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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 8ce8c437a4..abf403b7d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -48,8 +48,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/SerializerNamespaceTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java
index fa3578c41d..f4a29d4d79 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..da6915cf7c 100644
--- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ThemeChangeFavicon.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java
index 8995583975..798d40c294 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/AlignTopIconInButton.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
index eb4be8e0d8..674919eb89 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Test UI for image icon in button with 'icon-align-top' style.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
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..52b97fab94 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,14 +28,14 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
 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/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index e18665f2fa..7bc1626537 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
@@ -247,7 +247,8 @@ public class CalendarTest extends GridLayout implements View {
         event = getNewEvent("Appointment", start, end);
         event.setWhere("Office");
         event.setStyleName("color1");
-        event.setDescription("A longer description, which should display correctly.");
+        event.setDescription(
+                "A longer description, which should display correctly.");
         dataSource.addEvent(event);
 
         calendar.add(GregorianCalendar.DATE, 1);
@@ -353,9 +354,9 @@ public class CalendarTest extends GridLayout implements View {
                 // simulate week click
                 WeekClickHandler handler = (WeekClickHandler) calendarComponent
                         .getHandler(WeekClick.EVENT_ID);
-                handler.weekClick(new WeekClick(calendarComponent, calendar
-                        .get(GregorianCalendar.WEEK_OF_YEAR), calendar
-                        .get(GregorianCalendar.YEAR)));
+                handler.weekClick(new WeekClick(calendarComponent,
+                        calendar.get(GregorianCalendar.WEEK_OF_YEAR),
+                        calendar.get(GregorianCalendar.YEAR)));
             }
         });
 
@@ -409,8 +410,8 @@ public class CalendarTest extends GridLayout implements View {
 
     private void setWeekendsHidden(boolean weekendsHidden) {
         if (weekendsHidden) {
-            int firstToShow = (GregorianCalendar.MONDAY - calendar
-                    .getFirstDayOfWeek()) % 7;
+            int firstToShow = (GregorianCalendar.MONDAY
+                    - calendar.getFirstDayOfWeek()) % 7;
             calendarComponent.setFirstVisibleDayOfWeek(firstToShow + 1);
             calendarComponent.setLastVisibleDayOfWeek(firstToShow + 5);
         } else {
@@ -430,7 +431,8 @@ public class CalendarTest extends GridLayout implements View {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        calendarComponent.setReadOnly(readOnlyButton.getValue());
+                        calendarComponent
+                                .setReadOnly(readOnlyButton.getValue());
                     }
                 });
     }
@@ -445,7 +447,8 @@ public class CalendarTest extends GridLayout implements View {
 
                     @Override
                     public void valueChange(ValueChangeEvent event) {
-                        calendarComponent.setEnabled(!disabledButton.getValue());
+                        calendarComponent
+                                .setEnabled(!disabledButton.getValue());
                     }
                 });
     }
@@ -695,8 +698,8 @@ public class CalendarTest extends GridLayout implements View {
         s.setFilteringMode(FilteringMode.CONTAINS);
 
         Item i = s.addItem(DEFAULT_ITEMID);
-        i.getItemProperty("caption").setValue(
-                "Default (" + TimeZone.getDefault().getID() + ")");
+        i.getItemProperty("caption")
+                .setValue("Default (" + TimeZone.getDefault().getID() + ")");
         for (String id : TimeZone.getAvailableIDs()) {
             if (!s.containsId(id)) {
                 i = s.addItem(id);
@@ -1115,12 +1118,14 @@ public class CalendarTest extends GridLayout implements View {
 
     private void updateCaptionLabel() {
         DateFormatSymbols s = new DateFormatSymbols(getLocale());
-        String month = s.getShortMonths()[calendar.get(GregorianCalendar.MONTH)];
-        captionLabel.setValue(month + " "
-                + calendar.get(GregorianCalendar.YEAR));
+        String month = s.getShortMonths()[calendar
+                .get(GregorianCalendar.MONTH)];
+        captionLabel
+                .setValue(month + " " + calendar.get(GregorianCalendar.YEAR));
     }
 
-    private CalendarTestEvent getNewEvent(String caption, Date start, Date end) {
+    private CalendarTestEvent getNewEvent(String caption, Date start,
+            Date end) {
         CalendarTestEvent event = new CalendarTestEvent();
         event.setCaption(caption);
         event.setStart(start);
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..270966141d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/CollapsibleTableColumn.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
index f18b1e578e..7b566ea29d 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Test UI for non-collapsible column distinction in the table.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
index 8e32b07ebd..b3bba48cf4 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
index 4a88d87cd2..8e803f8b6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 ea7c42ba2e..952a7215d8 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ContrastFontColor.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java
index ad73302a31..5f2ab78593 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Test UI for default contrast color value.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("tests-valo-contrast")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
index 9c95b7400c..07cf951e45 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -201,14 +201,15 @@ public class DateFields extends VerticalLayout implements View {
         row.addComponent(date);
 
         PropertysetItem item = new PropertysetItem();
-        item.addItemProperty("date", new ObjectProperty<Date>(getDefaultDate()));
+        item.addItemProperty("date",
+                new ObjectProperty<Date>(getDefaultDate()));
 
         FormLayout form = new FormLayout();
         form.setMargin(false);
 
         FieldGroup binder = new FieldGroup(item);
-        form.addComponent(binder.buildAndBind(
-                "Picker in read-only field group", "date"));
+        form.addComponent(
+                binder.buildAndBind("Picker in read-only field group", "date"));
         binder.setReadOnly(true);
 
         row.addComponent(form);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java
index ce199992f2..745508cb56 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Test UI for disbaled label.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
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..4f7c6683d8 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,7 +49,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -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/Forms.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
index 32aef68520..b38f0861d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,7 +39,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -91,8 +91,8 @@ public class Forms extends VerticalLayout implements View {
         form.addComponent(section);
 
         TextField email = new TextField("Email");
-        email.setValue(sg.nextString(false) + "@" + sg.nextString(false)
-                + ".com");
+        email.setValue(
+                sg.nextString(false) + "@" + sg.nextString(false) + ".com");
         email.setWidth("50%");
         email.setRequired(true);
         form.addComponent(email);
@@ -137,14 +137,16 @@ public class Forms extends VerticalLayout implements View {
         form.addComponent(website);
 
         TextArea shortbio = new TextArea("Short Bio");
-        shortbio.setValue("Quis aute iure reprehenderit in voluptate velit esse. Cras mattis iudicium purus sit amet fermentum.");
+        shortbio.setValue(
+                "Quis aute iure reprehenderit in voluptate velit esse. Cras mattis iudicium purus sit amet fermentum.");
         shortbio.setWidth("100%");
         shortbio.setRows(2);
         form.addComponent(shortbio);
 
         final RichTextArea bio = new RichTextArea("Bio");
         bio.setWidth("100%");
-        bio.setValue("<div><p><span>Integer legentibus erat a ante historiarum dapibus.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>A communi observantia non est recedendum.</span> <span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Ab illo tempore, ab est sed immemorabili.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span></p><p><span>Morbi odio eros, volutpat ut pharetra vitae, lobortis sed nibh.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Cum sociis natoque penatibus et magnis dis parturient.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Tityre, tu patulae recubans sub tegmine fagi  dolor.</span></p><p><span>Curabitur blandit tempus ardua ridiculus sed magna.</span> <span>Phasellus laoreet lorem vel dolor tempus vehicula.</span> <span>Etiam habebis sem dicantur magna mollis euismod.</span> <span>Hi omnes lingua, institutis, legibus inter se differunt.</span></p></div>");
+        bio.setValue(
+                "<div><p><span>Integer legentibus erat a ante historiarum dapibus.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>A communi observantia non est recedendum.</span> <span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Ab illo tempore, ab est sed immemorabili.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span></p><p><span>Morbi odio eros, volutpat ut pharetra vitae, lobortis sed nibh.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Cum sociis natoque penatibus et magnis dis parturient.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Tityre, tu patulae recubans sub tegmine fagi  dolor.</span></p><p><span>Curabitur blandit tempus ardua ridiculus sed magna.</span> <span>Phasellus laoreet lorem vel dolor tempus vehicula.</span> <span>Etiam habebis sem dicantur magna mollis euismod.</span> <span>Hi omnes lingua, institutis, legibus inter se differunt.</span></p></div>");
         form.addComponent(bio);
 
         form.setReadOnly(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
index 87f24d98d4..77031af552 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Upload;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -30,7 +30,7 @@ public class ImmediateUpload extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -50,7 +50,7 @@ public class ImmediateUpload extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -60,7 +60,7 @@ public class ImmediateUpload extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java
index 9954979d50..ef394353af 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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..01af286e67 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
index e9c1c78049..5bb7720307 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java
index e918bb64d0..f5a0307e1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.ui.Notification;
 
 /**
  * Test UI for H1 and P elements styles.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
index d98daf7b05..c8a75c17b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..242d1c5db4 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ResponsiveStyles.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java
index b1a4b2e30b..f8474ef9c2 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
index a975c76e1c..f7ee5068f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
index 9642cb5ccf..b369731642 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java
index 4983bc5813..6f4e4ded3d 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java
index bffd94137c..16c0796ec4 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
index a3a81b3798..96c9b3679b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 421da5ffe7..c3b40ea241 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -148,8 +148,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();
@@ -157,8 +157,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/TextFieldBevel.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFieldBevel.java
index 4e1debc5b6..0bc42154a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFieldBevel.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFieldBevel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Test UI for $v-textfield-bevel value in TextField component.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("tests-valo-textfield-bevel")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
index be6e430b23..886b4d3a77 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
index 02846d8921..b26beccb53 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
index 6ef585cc12..4616c3123f 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.colorpicker.DefaultCaptionWidth;
 
 /**
  * Test for color picker with default caption.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Theme("valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java
index 0e62f983a6..76ac2bd9a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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/Ticket1245.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1245.java
index 082363a1e5..79c87c810a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1245.java
@@ -67,7 +67,7 @@ class TreeExample extends CustomComponent {
 
     /**
      * Helper to add an item with specified caption and (optional) parent.
-     * 
+     *
      * @param caption
      *            The item caption
      * @param parent
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java
index 04c1645d98..a191b8bb28 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1365 extends com.vaadin.server.LegacyApplication implements
-        Handler {
+public class Ticket1365 extends com.vaadin.server.LegacyApplication
+        implements Handler {
 
     TextField f = new TextField();
 
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 40ffd78740..0e59ecea68 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
@@ -143,9 +143,9 @@ public class Ticket1397 extends LegacyApplication {
 
                 TextField tf = new TextField("Editor for line " + lineNum,
 
-                "Try to edit the contents for this textfield on line "
-                        + lineNum
-                        + " and see how the overview-version changes.");
+                        "Try to edit the contents for this textfield on line "
+                                + lineNum
+                                + " and see how the overview-version changes.");
 
                 @Override
                 public String getMinimizedValueAsHTML() {
@@ -159,8 +159,8 @@ public class Ticket1397 extends LegacyApplication {
                 }
 
             });
-            table.addItem(new Object[] { "1 " + i, "2 " + i, "3 " + i,
-                    "4 " + i, "5 " + i, pp, pp2 }, new Integer(i));
+            table.addItem(new Object[] { "1 " + i, "2 " + i, "3 " + i, "4 " + i,
+                    "5 " + i, pp, pp2 }, new Integer(i));
         }
 
         main.addComponent(table);
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..e03a104a21 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
@@ -38,7 +38,7 @@ public class Ticket1435 extends LegacyApplication {
     /**
      * A ButtonPanel is a Panel, which has context specific Buttons in its
      * header.
-     * 
+     *
      * ButtonPanel also provides buttons for controlling its visibility
      * (collapse/expand).
      */
@@ -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/Ticket1589.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1589.java
index 45ff15e456..85bc24af26 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1589.java
@@ -47,7 +47,7 @@ class MyDynamicResource implements RequestHandler {
     /**
      * Provides the dynamic resource if the URI matches the resource URI. The
      * matching URI is "/myresource" under the application URI context.
-     * 
+     *
      * Returns null if the URI does not match. Otherwise returns a download
      * stream that contains the response from the server.
      */
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 684e14ed2a..e23199e876 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);
 
         TextField tf = new TextField("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/Ticket1710.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java
index 3dda830607..770549e3d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java
@@ -60,8 +60,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
         // GridLayout
         GridLayout grid = new GridLayout(1, 1);
         Panel g1tp = new LayoutTestingPanel("Gridlayout with 1 column", grid);
-        cb = new CheckBox("GridLayout (1col)", new MethodProperty<Boolean>(
-                g1tp, "visible"));
+        cb = new CheckBox("GridLayout (1col)",
+                new MethodProperty<Boolean>(g1tp, "visible"));
         cb.setImmediate(true);
         hidingControls.addComponent(cb);
         g1tp.setVisible(false);
@@ -70,8 +70,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
         addFields(grid);
         GridLayout grid2 = new GridLayout(2, 1);
         Panel g2tp = new LayoutTestingPanel("Gridlayout with 2 columns", grid2);
-        cb = new CheckBox("GridLayout (2cols)", new MethodProperty<Boolean>(
-                g2tp, "visible"));
+        cb = new CheckBox("GridLayout (2cols)",
+                new MethodProperty<Boolean>(g2tp, "visible"));
         cb.setImmediate(true);
         hidingControls.addComponent(cb);
         g2tp.setVisible(false);
@@ -113,8 +113,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
         // CustomLayout
         VerticalLayout cl = new VerticalLayout();
         Panel clp = new LayoutTestingPanel("CustomLayout", cl);
-        cb = new CheckBox("CustomLayout", new MethodProperty<Boolean>(clp,
-                "visible"));
+        cb = new CheckBox("CustomLayout",
+                new MethodProperty<Boolean>(clp, "visible"));
         cb.setImmediate(true);
         hidingControls.addComponent(cb);
         clp.setVisible(false);
@@ -125,8 +125,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
         VerticalLayout formPanelLayout = new VerticalLayout();
         formPanelLayout.setMargin(true);
         Panel formPanel = new Panel("Form", formPanelLayout);
-        cb = new CheckBox("Form", new MethodProperty<Boolean>(formPanel,
-                "visible"));
+        cb = new CheckBox("Form",
+                new MethodProperty<Boolean>(formPanel, "visible"));
         cb.setImmediate(true);
         hidingControls.addComponent(cb);
         formPanel.setVisible(false);
@@ -185,7 +185,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
 
         lo.addComponent(new TextField("Textfield with no error in it"));
 
-        TextField tt1 = new TextField("100% wide Textfield with no error in it");
+        TextField tt1 = new TextField(
+                "100% wide Textfield with no error in it");
         tt1.setWidth("100%");
         lo.addComponent(tt1);
 
@@ -268,15 +269,15 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
             controls.setSpacing(true);
             controls.setMargin(false);
             controls.addComponent(new Label("width"));
-            controls.addComponent(new TextField(new MethodProperty<Float>(
-                    testedLayout, "width")));
+            controls.addComponent(new TextField(
+                    new MethodProperty<Float>(testedLayout, "width")));
             CheckBox widthPercentsCheckBox = new CheckBox("%",
                     new MethodProperty<Boolean>(this, "widthPercents"));
             widthPercentsCheckBox.setImmediate(true);
             controls.addComponent(widthPercentsCheckBox);
             controls.addComponent(new Label("height"));
-            controls.addComponent(new TextField(new MethodProperty<Float>(
-                    testedLayout, "height")));
+            controls.addComponent(new TextField(
+                    new MethodProperty<Float>(testedLayout, "height")));
             CheckBox heightPercentsCheckBox = new CheckBox("%",
                     new MethodProperty<Boolean>(this, "heightPercents"));
             heightPercentsCheckBox.setImmediate(true);
@@ -341,8 +342,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
             hAlign.addItem(new Integer(Bits.ALIGNMENT_LEFT));
             hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_LEFT), "left");
             hAlign.addItem(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER));
-            hAlign.setItemCaption(
-                    new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), "center");
+            hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER),
+                    "center");
             hAlign.addItem(new Integer(Bits.ALIGNMENT_RIGHT));
             hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_RIGHT), "right");
 
@@ -369,18 +370,18 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
             lAlign.addItem(new Integer(Bits.ALIGNMENT_LEFT));
             lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_LEFT), "left");
             lAlign.addItem(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER));
-            lAlign.setItemCaption(
-                    new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), "center");
+            lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER),
+                    "center");
             lAlign.addItem(new Integer(Bits.ALIGNMENT_RIGHT));
             lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_RIGHT), "right");
 
             lAlign.addListener(new Property.ValueChangeListener() {
                 @Override
                 public void valueChange(ValueChangeEvent event) {
-                    testPanelLayout.setComponentAlignment(
-                            testedLayout,
-                            new Alignment(((Integer) lAlign.getValue())
-                                    .intValue() + Bits.ALIGNMENT_TOP));
+                    testPanelLayout.setComponentAlignment(testedLayout,
+                            new Alignment(
+                                    ((Integer) lAlign.getValue()).intValue()
+                                            + Bits.ALIGNMENT_TOP));
                 }
             });
         }
@@ -388,22 +389,22 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication {
         private void updateAlignments(Alignment a) {
             for (Iterator<Component> i = testedLayout.getComponentIterator(); i
                     .hasNext();) {
-                ((Layout.AlignmentHandler) testedLayout).setComponentAlignment(
-                        i.next(), a);
+                ((Layout.AlignmentHandler) testedLayout)
+                        .setComponentAlignment(i.next(), a);
             }
         }
 
         private void updateMarginsAndSpacing() {
             if (testedLayout instanceof Layout.MarginHandler) {
-                ((Layout.MarginHandler) testedLayout).setMargin(new MarginInfo(
-                        marginTop.getValue().booleanValue(), marginRight
-                                .getValue().booleanValue(), marginBottom
-                                .getValue().booleanValue(), marginLeft
-                                .getValue().booleanValue()));
+                ((Layout.MarginHandler) testedLayout).setMargin(
+                        new MarginInfo(marginTop.getValue().booleanValue(),
+                                marginRight.getValue().booleanValue(),
+                                marginBottom.getValue().booleanValue(),
+                                marginLeft.getValue().booleanValue()));
             }
             if (testedLayout instanceof Layout.SpacingHandler) {
-                ((Layout.SpacingHandler) testedLayout).setSpacing(spacing
-                        .getValue().booleanValue());
+                ((Layout.SpacingHandler) testedLayout)
+                        .setSpacing(spacing.getValue().booleanValue());
             }
         }
 
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/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
index bf648b0d92..17e12b1f83 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/Ticket1806.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
index 60ea9528d3..9317fa9b1a 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 5c6f45de87..51fcbb2346 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
@@ -61,14 +61,15 @@ 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/Ticket1878.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1878.java
index 6078320b61..092f81636b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1878.java
@@ -185,7 +185,8 @@ public class Ticket1878 extends LegacyApplication {
         form = createForm(l1, "200px", "500px");
         BeanItem<FormObject> item = new BeanItem<FormObject>(new FormObject());
         form.setItemDataSource(item);
-        for (Iterator<?> i = item.getItemPropertyIds().iterator(); i.hasNext();) {
+        for (Iterator<?> i = item.getItemPropertyIds().iterator(); i
+                .hasNext();) {
             Object property = i.next();
             Field<?> f = form.getField(property);
 
@@ -277,8 +278,9 @@ public class Ticket1878 extends LegacyApplication {
         }
         String alignText = align ? "-A" : "";
         String cWidth = componentWidth == null ? "" : " - " + componentWidth;
-        Panel p = new Panel(type + "/" + dirText + alignText + " " + w + "x"
-                + h + cWidth, newLayout);
+        Panel p = new Panel(
+                type + "/" + dirText + alignText + " " + w + "x" + h + cWidth,
+                newLayout);
 
         p.setWidth(w);
         p.setHeight(h);
@@ -310,8 +312,8 @@ public class Ticket1878 extends LegacyApplication {
                     newLayout.addComponent(tf);
 
                     if (align) {
-                        ((AlignmentHandler) newLayout).setComponentAlignment(
-                                tf, Alignment.BOTTOM_RIGHT);
+                        ((AlignmentHandler) newLayout).setComponentAlignment(tf,
+                                Alignment.BOTTOM_RIGHT);
                     }
                 }
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
index 35b7adc7b3..2109b1729a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
@@ -37,18 +37,22 @@ public class Ticket1900 extends LegacyApplication {
 
         f[0].setDescription("Field is empty, requiredError(null): *");
 
-        f[1].setDescription("Field is empty, requiredError(\"foo\"): * (popup shows the validation error)");
+        f[1].setDescription(
+                "Field is empty, requiredError(\"foo\"): * (popup shows the validation error)");
         f[1].setRequiredError("The field must not be empty");
 
-        f[2].setDescription("Field is non-empty, validators do not give validation error: *");
+        f[2].setDescription(
+                "Field is non-empty, validators do not give validation error: *");
         f[2].setValue("valid 12");
 
-        f[3].setDescription("Field is non-empty, requiredError(null), validators "
-                + "give validation error: * ! (popup shows the validation error)");
+        f[3].setDescription(
+                "Field is non-empty, requiredError(null), validators "
+                        + "give validation error: * ! (popup shows the validation error)");
         f[3].setValue("invalid");
 
-        f[4].setDescription("Field is non-empty, requiredError(\"foo\"), validators "
-                + "give validation error: * ! (popup shows the validation error)");
+        f[4].setDescription(
+                "Field is non-empty, requiredError(\"foo\"), validators "
+                        + "give validation error: * ! (popup shows the validation error)");
         f[4].setValue("invalid");
         f[4].setRequiredError("The field must not be empty");
 
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 9b360d1da7..277188fc7c 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/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 789e8c3a45..e9bda8e259 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
@@ -52,25 +52,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");
             }
@@ -94,14 +86,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;
@@ -121,7 +109,8 @@ public class Ticket1983 extends LegacyApplication {
                 @Override
                 public void valueChange(ValueChangeEvent event) {
                     if ((Boolean) event.getProperty().getValue()) {
-                        table.setVisibleColumns(new Object[] { propId, propId2 });
+                        table.setVisibleColumns(
+                                new Object[] { propId, propId2 });
                     } else {
                         table.setVisibleColumns(new Object[] { propId });
                     }
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/Ticket20.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
index 5f6305bcb0..30d647ad63 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
@@ -41,19 +41,21 @@ public class Ticket20 extends LegacyApplication {
             @Override
             public void validate(Object value) throws InvalidValueException {
                 if (!isValid(value)) {
-                    throw new InvalidValueException(value
-                            + " is not a non-negative number");
+                    throw new InvalidValueException(
+                            value + " is not a non-negative number");
                 }
             }
         });
-        CompositeValidator v2 = new CompositeValidator(CombinationMode.OR, null);
+        CompositeValidator v2 = new CompositeValidator(CombinationMode.OR,
+                null);
         v2.addValidator(v);
         v2.addValidator(new Validator() {
 
             @Override
             public void validate(Object value) throws InvalidValueException {
                 if (!"".equals("" + value)) {
-                    throw new InvalidValueException("Value is not empty string");
+                    throw new InvalidValueException(
+                            "Value is not empty string");
                 }
             }
         });
@@ -69,8 +71,8 @@ public class Ticket20 extends LegacyApplication {
             mainWin.addComponent(b);
         }
 
-        mainWin.addComponent(new Button("Validate integer",
-                new Button.ClickListener() {
+        mainWin.addComponent(
+                new Button("Validate integer", new Button.ClickListener() {
                     @Override
                     public void buttonClick(
                             com.vaadin.ui.Button.ClickEvent event) {
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 64881c046a..cd91ee83c5 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/Ticket2021.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2021.java
index c6cbdbfa94..8cca619082 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2021.java
@@ -47,7 +47,7 @@ public class Ticket2021 extends LegacyApplication {
         layout.addComponent(tf1);
 
         /*
-         * 
+         *
          * OrderedLayout
          */
 
@@ -68,7 +68,7 @@ public class Ticket2021 extends LegacyApplication {
         layout2.addComponent(tf2);
 
         /*
-         * 
+         *
          * GridLayout
          */
 
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 2861c9beca..1374a89b3c 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 TextField("This should not get stuck either..."));
+        layout.addComponent(
+                new Label("This should NOT get stuck when scrolling down"));
+        layout.addComponent(
+                new TextField("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 12866da570..abf56528f8 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);
             }
         });
@@ -38,8 +39,8 @@ public class Ticket2038 extends LegacyApplication {
         b.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                tf.setRequiredError(b.getValue() ? "Field must not be empty"
-                        : null);
+                tf.setRequiredError(
+                        b.getValue() ? "Field must not be empty" : null);
             }
         });
     }
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 14c8273c0d..59c940b8e1 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) {
@@ -38,14 +39,14 @@ public class Ticket2053 extends LegacyApplication {
                 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 +54,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 +63,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 22c7471282..83fa259ff8 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.TextField;
 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 da9f7fecc8..47ded4838e 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
@@ -33,20 +33,20 @@ public class Ticket2104 extends LegacyApplication {
 
         HorizontalLayout ol = new HorizontalLayout();
         main.addComponent(ol);
-        CheckBox cb = new CheckBox("immediate", new MethodProperty<Boolean>(
-                tree, "immediate"));
+        CheckBox cb = new CheckBox("immediate",
+                new MethodProperty<Boolean>(tree, "immediate"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("selectable", new MethodProperty<Boolean>(tree,
-                "selectable"));
+        cb = new CheckBox("selectable",
+                new MethodProperty<Boolean>(tree, "selectable"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("nullsel", new MethodProperty<Boolean>(tree,
-                "nullSelectionAllowed"));
+        cb = new CheckBox("nullsel",
+                new MethodProperty<Boolean>(tree, "nullSelectionAllowed"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("multi", new MethodProperty<Boolean>(tree,
-                "multiSelect"));
+        cb = new CheckBox("multi",
+                new MethodProperty<Boolean>(tree, "multiSelect"));
         cb.setImmediate(true);
         ol.addComponent(cb);
         cb = new CheckBox("icon");
@@ -85,29 +85,28 @@ 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()));
 
             }
         });
 
         ol = new HorizontalLayout();
         main.addComponent(ol);
-        cb = new CheckBox("immediate", new MethodProperty<Boolean>(table,
-                "immediate"));
+        cb = new CheckBox("immediate",
+                new MethodProperty<Boolean>(table, "immediate"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("selectable", new MethodProperty<Boolean>(table,
-                "selectable"));
+        cb = new CheckBox("selectable",
+                new MethodProperty<Boolean>(table, "selectable"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("nullsel", new MethodProperty<Boolean>(table,
-                "nullSelectionAllowed"));
+        cb = new CheckBox("nullsel",
+                new MethodProperty<Boolean>(table, "nullSelectionAllowed"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("multi", new MethodProperty<Boolean>(table,
-                "multiSelect"));
+        cb = new CheckBox("multi",
+                new MethodProperty<Boolean>(table, "multiSelect"));
         cb.setImmediate(true);
         ol.addComponent(cb);
         main.addComponent(table);
@@ -121,9 +120,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/Ticket2107.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
index 7de0e2da24..bd4e2a6bdf 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
@@ -18,15 +18,17 @@ public class Ticket2107 extends LegacyApplication {
 
         final TextField tf = new TextField(
                 "Required field that validated the input");
-        tf.setDescription("Enter someting and click outside the field to activate");
+        tf.setDescription(
+                "Enter someting and click outside the field to activate");
         tf.setRequired(true);
         tf.setImmediate(true);
         tf.addListener(new Property.ValueChangeListener() {
 
             @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);
             }
         });
@@ -50,8 +52,8 @@ public class Ticket2107 extends LegacyApplication {
         b.addListener(new Property.ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                tf.setRequiredError(b.getValue() ? "Field must not be empty"
-                        : null);
+                tf.setRequiredError(
+                        b.getValue() ? "Field must not be empty" : null);
             }
         });
     }
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 ba94bd394d..21c3142679 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
@@ -55,8 +55,8 @@ public class Ticket2125 extends LegacyApplication {
                 }
 
             });
-            CheckBox b = new CheckBox("editmode", new MethodProperty<Boolean>(
-                    table, "editable"));
+            CheckBox b = new CheckBox("editmode",
+                    new MethodProperty<Boolean>(table, "editable"));
             b.setImmediate(true);
             addComponent(b);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java
index bc182181e4..2653a4e837 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java
@@ -9,10 +9,10 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
 /**
- * 
+ *
  * Toggling container with an empty one may result duplicate header cell in
  * client.
- * 
+ *
  */
 public class Ticket2126 extends com.vaadin.server.LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
index 06fb162f59..aacada21ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
@@ -27,8 +27,8 @@ public class Ticket2179 extends LegacyApplication {
 
             @Override
             public void valueChange(ValueChangeEvent event) {
-                main.showNotification("Test field is "
-                        + (f.isValid() ? "valid" : "invalid"));
+                main.showNotification(
+                        "Test field is " + (f.isValid() ? "valid" : "invalid"));
             }
         });
 
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 beefb9b719..f3fdf96acf 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
@@ -16,8 +16,8 @@ import com.vaadin.ui.OptionGroup;
 import com.vaadin.ui.TextField;
 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();
@@ -93,8 +93,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/Ticket2244.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2244.java
index fcb1c55f33..ee9ab08bb5 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2244.java
@@ -40,19 +40,19 @@ public class Ticket2244 extends LegacyApplication {
             }
 
         }));
-        w.addComponent(new Button("new bigger item",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("new bigger item", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        form.setItemDataSource(new BeanItem<MyBean>(
-                                new MyBiggerBean()));
+                        form.setItemDataSource(
+                                new BeanItem<MyBean>(new MyBiggerBean()));
 
                     }
 
                 }));
-        w.addComponent(new Button("new grid layout",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("new grid layout", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
@@ -61,8 +61,8 @@ public class Ticket2244 extends LegacyApplication {
                     }
 
                 }));
-        w.addComponent(new Button("new form layout",
-                new Button.ClickListener() {
+        w.addComponent(
+                new Button("new form layout", new Button.ClickListener() {
 
                     @Override
                     public void buttonClick(ClickEvent event) {
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/Ticket2742.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2742.java
index de3659540e..a00c1eb5ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2742.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.vaadin.tests.tickets;
 
@@ -10,13 +10,13 @@ import com.vaadin.ui.NativeSelect;
 
 /**
  * @author Risto Yrjänä / Vaadin Ltd.
- * 
+ *
  */
 public class Ticket2742 extends LegacyApplication {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.Application#init()
      */
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
index 818a70318e..01d6199dce 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
@@ -33,9 +33,9 @@ import com.vaadin.ui.themes.Reindeer;
 /**
  * Table layout is very slow in Firefox 3.0.10 when the table contains
  * components.
- * 
+ *
  * This is adapted from the HbnContainer example application WorkoutLog.
- * 
+ *
  * Other browsers are much faster.
  */
 public class Ticket2998 extends LegacyApplication {
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 d095889d6d..11a5900957 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 abb72e158c..1109cc402c 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/Ticket677.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket677.java
index 44ec3d10da..d1d7f1bd0c 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket677.java
@@ -50,22 +50,22 @@ public class Ticket677 extends LegacyApplication {
         HorizontalLayout l = new HorizontalLayout();
         main.addComponent(l);
 
-        l.addComponent(new Button("Toggle root panel",
-                new Button.ClickListener() {
+        l.addComponent(
+                new Button("Toggle root panel", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         toggle(root);
                     }
                 }));
-        l.addComponent(new Button("Toggle panel one",
-                new Button.ClickListener() {
+        l.addComponent(
+                new Button("Toggle panel one", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         toggle(one);
                     }
                 }));
-        l.addComponent(new Button("Toggle panel two",
-                new Button.ClickListener() {
+        l.addComponent(
+                new Button("Toggle panel two", new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         toggle(two);
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/tickets/Ticket736.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
index 6acd43c312..f0fde192dc 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
@@ -64,11 +64,11 @@ public class Ticket736 extends LegacyApplication {
         f.setFooter(ol);
 
         // Add some validators for the form
-        f.getField("zip").addValidator(
-                new IntegerValidator("'{0}' is not a number"));
+        f.getField("zip")
+                .addValidator(new IntegerValidator("'{0}' is not a number"));
         ((AbstractComponent) f.getField("zip")).setDescription("Jepjep");
-        ((AbstractComponent) f.getField("zip")).setIcon(new ThemeResource(
-                "../runo/icons/16/folder.png"));
+        ((AbstractComponent) f.getField("zip"))
+                .setIcon(new ThemeResource("../runo/icons/16/folder.png"));
         f.getField("state").addValidator(new IsValidState());
         f.getField("name").setRequired(true);
         f.getField("street").setRequired(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
index adc5663a8a..f3d69136d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
@@ -33,8 +33,8 @@ public class Ticket846 extends LegacyApplication {
 
         // tx.setIcon(new ThemeResource("icons/16/folder.png"));
 
-        mainWin.addComponent(new Button("Validate integer",
-                new Button.ClickListener() {
+        mainWin.addComponent(
+                new Button("Validate integer", new Button.ClickListener() {
                     @Override
                     public void buttonClick(
                             com.vaadin.ui.Button.ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
index 60167e43b4..11e26cb6f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.TooltipConfiguration;
 /**
  * When moving between adjacent elements, the tooltip replace should obey
  * quickOpenDelay
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AdjacentElementsWithTooltips extends AbstractTestUI {
@@ -34,7 +34,7 @@ public class AdjacentElementsWithTooltips extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -61,7 +61,7 @@ public class AdjacentElementsWithTooltips extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -71,7 +71,7 @@ public class AdjacentElementsWithTooltips extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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/SliderTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java
index 8cf7232fab..3930bde757 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java
@@ -8,7 +8,7 @@ public class SliderTooltip extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
      * VaadinRequest)
      */
@@ -21,7 +21,7 @@ public class SliderTooltip extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
      */
     @Override
@@ -31,7 +31,7 @@ public class SliderTooltip extends AbstractTestUI {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
      */
     @Override
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 f67db4219f..3d45e4efdf 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());
                         }
                     }
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 c5e49d1af3..3c189204ab 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.VerticalLayout;
 /**
  * Test to see if the width of the tooltip element is updated if a narrower
  * tooltip is opened to replace a tooltip with wider content.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TooltipWidthUpdating extends AbstractTestUI {
@@ -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/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/LogPrintWriter.java b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
index 1ec6f02ac9..2d11a94598 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
@@ -5,7 +5,7 @@ import java.io.Writer;
 
 /**
  * Use for collecting HTTP response.
- * 
+ *
  */
 public class LogPrintWriter extends PrintWriter {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/util/Person.java b/uitest/src/main/java/com/vaadin/tests/util/Person.java
index eca7b0bed8..0f57b3375e 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/Person.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Person.java
@@ -86,7 +86,7 @@ public class Person implements Serializable {
 
     /**
      * Returns the address where the person lives.
-     * 
+     *
      * @return address (not null)
      */
     public Address getAddress() {
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..965390d93e 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/Role.java b/uitest/src/main/java/com/vaadin/tests/util/Role.java
index 83f63db4ab..5f7d7680fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/Role.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Role.java
@@ -27,7 +27,7 @@ public class Role implements Serializable {
      * In this direction, the users for a role can be queried and the returned
      * collection modified, but the whole collection of users cannot be set
      * directly.
-     * 
+     *
      * @return set of users having the role (not null)
      */
     public Set<User> getUsers() {
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..0d482c35d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,19 +31,20 @@ import com.vaadin.ui.VerticalLayout;
  * Provides sample directory based on application directory. If this fails then
  * sampleDirectory property is read. If no sample directory is resolved, then a
  * panel displaying error message is added to main window.
- * 
+ *
  * @author Vaadin Ltd.
- * 
+ *
  */
 public class SampleDirectory {
 
     /**
      * Get sample directory.
-     * 
+     *
      * @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..81ba2e3be1 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..86a7c4d852 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,24 +89,23 @@ 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
      * keep tests css in source files.
-     * 
+     *
      * @param cssString
      */
     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/util/User.java b/uitest/src/main/java/com/vaadin/tests/util/User.java
index 003f485017..c5de9a3e46 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/User.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/User.java
@@ -27,7 +27,7 @@ public class User implements Serializable {
     /**
      * Returns an unmodifiable set of roles. To modify the roles a user has,
      * replace the whole set using {@link #setRoles(Set)}.
-     * 
+     *
      * @return set of roles (unmodifiable, not null)
      */
     public Set<Role> getRoles() {
@@ -37,7 +37,7 @@ public class User implements Serializable {
     /**
      * Replaces the set of roles with another collection. User references in
      * roles are automatically updated when setting the roles of a user.
-     * 
+     *
      * @param roles
      *            non-null set of roles
      */
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..0e5d1c7d40 100644
--- a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/validation/EmptyFieldErrorIndicators.java b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index 11f98eb888..9aaf534833 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
@@ -35,8 +35,8 @@ public class EmptyFieldErrorIndicators extends TestBase {
         part1.setId("emptyFieldPart");
         hl.addComponent(part1);
 
-        Panel part2 = createPart(
-                "Empty required fields with failing validator", true, true);
+        Panel part2 = createPart("Empty required fields with failing validator",
+                true, true);
         part1.setId("validatedFieldPart");
         hl.addComponent(part2);
 
@@ -75,7 +75,8 @@ public class EmptyFieldErrorIndicators extends TestBase {
         return panel;
     }
 
-    private Form createForm(final boolean required, final boolean failValidator) {
+    private Form createForm(final boolean required,
+            final boolean failValidator) {
         // hand-crafted form, not using form field factory
         final Form form = new Form() {
             @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
index 3135ce0592..99a95c407f 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
index 746a460da8..65a6ed20df 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
@@ -37,7 +37,8 @@ public class TestValidators extends TestBase {
         // simple validators
 
         TextField tf = new TextField("A field, must contain 1-2 chars");
-        tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false));
+        tf.addValidator(
+                new StringLengthValidator("Invalid length", 1, 2, false));
         tf.setRequired(true);
         tf.setValue("ab");
         form.addField("a", tf);
@@ -67,7 +68,8 @@ public class TestValidators extends TestBase {
 
         // regular expressions
 
-        tf = new TextField("A field, must match the regular expression a.*b.*c");
+        tf = new TextField(
+                "A field, must match the regular expression a.*b.*c");
         tf.addValidator(new RegexpValidator("a.*b.*c",
                 "{0} does not match the regular expression"));
         tf.setValue("aagsabeqgc");
@@ -100,9 +102,10 @@ public class TestValidators extends TestBase {
         CompositeValidator cv = new CompositeValidator(CombinationMode.AND,
                 "The field must contain a floating point number with 4-5 characters");
         cv.addValidator(new StringLengthValidator(
-                "String length of '{0}' should be 4-5 characters", 4, 5, false));
-        cv.addValidator(new DoubleValidator(
-                "{0} must be a floating point number"));
+                "String length of '{0}' should be 4-5 characters", 4, 5,
+                false));
+        cv.addValidator(
+                new DoubleValidator("{0} must be a floating point number"));
         tf.addValidator(cv);
         tf.setValue("12.34");
         form.addField("j", tf);
@@ -112,9 +115,10 @@ public class TestValidators extends TestBase {
         cv = new CompositeValidator(CombinationMode.OR,
                 "The field must contain a floating point  or with 4-5 characters");
         cv.addValidator(new StringLengthValidator(
-                "String length of '{0}' should be 4-5 characters", 4, 5, false));
-        cv.addValidator(new DoubleValidator(
-                "{0} must be a floating point number"));
+                "String length of '{0}' should be 4-5 characters", 4, 5,
+                false));
+        cv.addValidator(
+                new DoubleValidator("{0} must be a floating point number"));
         tf.addValidator(cv);
         tf.setValue("12.34g");
         form.addField("jb", tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java b/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java
index 1c04c57526..2019d66f02 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
index 0ea19bd965..bfffeab3c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
index 86c918536f..26d8310dae 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
index a3530f19e9..82448bcb1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
index f4d226bb03..d8d6fd0126 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
index c922259fae..1d2c394c99 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..9895cc1e7d 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/CustomUIConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnector.java
index 7a93f5e360..63ff05ef4e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
index d905daeea6..907e58de27 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java
index f25a33225c..aca8c5acef 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java
index c188e655ba..2116f95cc6 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java
index 498180cb96..02a23a90b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
index 0808abf09a..f893f57541 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
index 43400ada60..f6ff113b91 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.widgetset.server.DummyLabel;
 
 /**
  * Dummy connector just to cause {@link LabelState} to be used to test #8683
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
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..d7e7a6c605 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/GenericWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidget.java
index 142fdd2e52..c038864a2a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidget.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
index 35d071a6df..34948dbdf2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java
index 4b1f6c4c7a..914e374cdd 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
index 5683ef03c6..7a165d2dfa 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
@@ -6,7 +6,7 @@ import com.vaadin.shared.ui.Connect;
 /**
  * Connects server-side <code>IdTestLabel</code> component to client-side
  * {@link VIdTestLabel} component (#10179).
- * 
+ *
  */
 @Connect(com.vaadin.tests.widgetset.server.IdTestLabel.class)
 public class IdTestLabelConnector extends LabelConnector {
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..bd02595ee5 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/LabelState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java
index 7f8468b215..e961968d40 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.shared.AbstractComponentState;
 /**
  * State class with the same simple name as
  * {@link com.vaadin.shared.ui.label.LabelState} to test #8683
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
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..23c6588803 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..601339d6db 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..408c14b9cc 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/LegacySerializerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
index 9c261b9505..64c9bc9dd2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..a13c91f93d 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..ad9ae61e8c 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -20,7 +20,7 @@ import com.vaadin.tests.widgetset.server.csrf.ui.CsrfTokenDisabled;
 
 /**
  * Mock ApplicationConnection for several issues where we need to hack it.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -41,14 +41,13 @@ public class MockApplicationConnection extends ApplicationConnection {
 
     @Override
     public MockServerCommunicationHandler getMessageSender() {
-        return (MockServerCommunicationHandler) super
-                .getMessageSender();
+        return (MockServerCommunicationHandler) super.getMessageSender();
     }
 
     /**
      * Provide the last token received from the server. <br/>
      * We added this to test the change done on CSRF token.
-     * 
+     *
      * @see CsrfTokenDisabled
      */
     public String getLastCsrfTokenReceiver() {
@@ -58,7 +57,7 @@ public class MockApplicationConnection extends ApplicationConnection {
     /**
      * Provide the last token sent to the server. <br/>
      * We added this to test the change done on CSRF token.
-     * 
+     *
      * @see CsrfTokenDisabled
      */
     public String getLastCsrfTokenSent() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
index 14b5671181..b0b7f712af 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
index 39b89b55ca..9a0f86e444 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
index 7c2693db1d..328d59e019 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
index d5ab1da2f9..fc78ae5438 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java
index 7f116e4803..852358fcb0 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java
index 03e50aab16..0efdfcdfa4 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..a50a7a09b2 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/RoundTripTesterConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
index b22b3fc4b8..29a2357759 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
index e71f9f1230..d657760bbe 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..4b317b4874 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..15428a32d7 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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: "
@@ -364,41 +373,41 @@ public class SerializerTestConnector extends AbstractExtensionConnector {
         /*
          * TODO public double doubleValue; public Double DoubleValue; public
          * double[] doubleArray; ;
-         * 
+         *
          * public String string;
-         * 
+         *
          * public String nullString;
-         * 
+         *
          * public Connector connector;
-         * 
+         *
          * public ComplexTestBean complexTestBean; public SimpleTestBean
          * simpleTestBean; public SimpleTestBean[] simpleTestBeanArray; public
          * int[][] nestedIntArray; public SimpleTestBean[][] nestedBeanArray;
-         * 
+         *
          * public List<Integer> intList; public List<Connector> connectorList;
          * public List<SimpleTestBean> simpleTestBeanList;
-         * 
+         *
          * public List<int[]> primitiveArrayList; public List<Integer[]>
          * objectArrayList; public List<SimpleTestBean[]> beanArrayList;
-         * 
+         *
          * public List<Integer>[] objectListArray; public List<SimpleTestBean>[]
          * beanListArray;
-         * 
+         *
          * public Set<Integer> intSet; public Set<Connector> connectorSet;
          * public Set<SimpleTestBean> beanSet;
-         * 
+         *
          * public Map<String, SimpleTestBean> stringMap; public Map<Connector,
          * SimpleTestBean> connectorMap; public Map<Integer, Connector> intMap;
          * public Map<SimpleTestBean, SimpleTestBean> beanMap;
-         * 
+         *
          * public Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>
          * generics;
-         * 
+         *
          * public ContentMode contentMode; public ContentMode[] array; public
          * List<ContentMode> list;
-         * 
+         *
          * public SimpleTestBean bean;
-         * 
+         *
          * public Date date1; public Date date2;
          */
     }
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..5fae2392fc 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/SerializerTestState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestState.java
index 5610ad7bfb..0590746ade 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestState.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License; Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing; software
  * distributed under the License is distributed on an "AS IS" BASIS; WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND; either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java
index 51d172ee21..eb9524189a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..90f6a55cfd 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/TestingWidgetsetEntryPoint.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
index 7268d02993..77fb4a182f 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..bd82b9986b 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..59cf0a02de 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/VExtendedTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
index dce7fc04cf..285caadea2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
index 52610e2a47..9271f562b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
@@ -4,7 +4,7 @@ import com.vaadin.client.ui.VLabel;
 
 /**
  * Client-side implementation for IdTestLabel (#10179).
- * 
+ *
  */
 public class VIdTestLabel extends VLabel {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
index 2776f698fe..5e853a7abd 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
index 6ff0f2433e..abe253536e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..8fb78b1c7e 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..c4421dff5b 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..f0c503a4d5 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
@@ -92,12 +92,12 @@ import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data
 
 /**
  * Grid basic client features test application.
- * 
+ *
  * @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 {
@@ -259,7 +260,7 @@ public class GridBasicClientFeaturesWidget extends
     /**
      * Convenience method for creating a list of Data objects to be used as a
      * Row in the data source
-     * 
+     *
      * @param cols
      *            number of columns (items) to include in the row
      * @return
@@ -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..1d71de65fe 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..ac139438a9 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..2eded12d20 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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);
@@ -37,13 +37,13 @@ public class GridClientDataSourcesWidget extends
      * constantly. The back-end is unable to actively push data to Grid.
      * Instead, with each row request, in addition to its row payload it tells
      * how many rows it contains in total.
-     * 
+     *
      * A plausible response from this REST-like api would be:
-     * 
+     *
      * <pre>
      * <code>
      * GET /foos/4..8
-     * 
+     *
      * {
      *     "resultsize": 4,
      *     "data": [
@@ -56,10 +56,10 @@ public class GridClientDataSourcesWidget extends
      * }
      * </code>
      * </pre>
-     * 
+     *
      * In this case, the size of Grid needs to be updated to be able to show 100
      * rows in total (no more, no less).
-     * 
+     *
      * This class
      * <ol>
      * <li>gets initialized
@@ -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..cfcf722cfb 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..a3b54f2548 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..f589dc51f2 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..f52629fbbc 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..e546f14e7d 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/MySelectionModelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
index 81a9ab5bf1..97c5023151 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..a7f88de0a0 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/PureGWTTestApplication.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
index bda1a0c33e..dcd0fac845 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
@@ -30,7 +30,7 @@ import com.vaadin.client.ui.SubPartAware;
 /**
  * Pure GWT Test Application base for testing features of a single widget;
  * provides a menu system and convenience method for adding items to it.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -47,7 +47,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Creates a Command object, which is used as an action entry in the
          * Menu
-         * 
+         *
          * @param t
          *            a title string
          * @param cmd
@@ -61,7 +61,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
         /**
          * Returns the title of this command item
-         * 
+         *
          * @return a title string
          */
         public final String getTitle() {
@@ -70,7 +70,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
         /**
          * Returns the actual scheduled command of this command item
-         * 
+         *
          * @return a scheduled command
          */
         public final ScheduledCommand getCommand() {
@@ -105,7 +105,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
         /**
          * Create a sub-menu, with a title.
-         * 
+         *
          * @param title
          */
         public Menu(String title) {
@@ -118,7 +118,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Return the GWT {@link MenuBar} object that provides the widget for
          * this Menu
-         * 
+         *
          * @return a menubar object
          */
         public MenuBar getMenuBar() {
@@ -127,7 +127,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
         /**
          * Returns the title of this menu entry
-         * 
+         *
          * @return a title string
          */
         public String getTitle() {
@@ -137,7 +137,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Adds a child menu entry to this menu. The title for this entry is
          * taken from the Menu object argument.
-         * 
+         *
          * @param m
          *            another Menu object
          */
@@ -149,7 +149,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Tests for the existence of a child menu by title at this level of the
          * menu hierarchy
-         * 
+         *
          * @param title
          *            a title string
          * @return true, if this menu has a direct child menu with the specified
@@ -162,7 +162,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Gets a reference to a child menu with a certain title, that is a
          * direct child of this menu level.
-         * 
+         *
          * @param title
          *            a title string
          * @return a Menu object with the specified title string, or null, if
@@ -181,7 +181,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Adds a command item to the menu. When the entry is clicked, the
          * command is executed.
-         * 
+         *
          * @param cmd
          *            a command object.
          */
@@ -193,7 +193,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Tests for the existence of a {@link Command} that is the direct child
          * of this level of menu.
-         * 
+         *
          * @param title
          *            the command's title
          * @return true, if this menu level includes a command item with the
@@ -206,7 +206,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
         /**
          * Gets a reference to a {@link Command} item that is the direct child
          * of this level of menu.
-         * 
+         *
          * @param title
          *            the command's title
          * @return a command, if found in this menu level, otherwise null.
@@ -242,7 +242,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
     /**
      * Connect an item to the menu structure
-     * 
+     *
      * @param cmd
      *            a scheduled command; see google's docs
      * @param menupath
@@ -258,7 +258,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
     /**
      * Create a menu path, if one doesn't already exist, and return the last
      * menu in the series.
-     * 
+     *
      * @param path
      *            a varargs list or array of strings describing a menu path,
      *            e.g. "File", "Recent", "User Files", which would result in the
@@ -300,7 +300,7 @@ public abstract class PureGWTTestApplication<T> extends DockLayoutPanel
 
     /**
      * Gets the tested widget.
-     * 
+     *
      * @return tested widget
      */
     public T getTestedWidget() {
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..ae9aeba95f 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/helloworldfeature/GreetAgainRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
index 95e286e4de..8d00ad7626 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
index f825115ec8..8627979d3e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
index eb869dedbc..5feea8da6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
index dca007c2ee..61080685d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
index c1b6aef830..63a7fdfb31 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..f20a8191d3 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
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/MyComponentWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
index ba27fee6a3..67b1032018 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
index df3dd5b753..2e44c4ed79 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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/v7a3/ClientSideModule.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
index 48bd8a76fb..cbe12b57a2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
index cf73f2a00d..2fd0ffc3e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..6dd98a47b1 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/ClientRpcClass.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java
index b5136b926e..36405f256d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
index 5b03634755..af9058cf97 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
index 808b3bb9b7..224462b60a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
index 2af7efa8a4..3190aff42e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java
index 881cbcc7c5..638c7d4630 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,7 +21,7 @@ import com.vaadin.ui.AbstractComponent;
 
 /**
  * Dummy component to cause {@link LabelState} to be used to test #8683
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
index 32320f0158..335121bf2a 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java
index c505151341..2c1afd3cd3 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Label;
 /**
  * Label that has a default id <code>default10179</code> for the use of
  * IdOverrideTest (#10179).
- * 
+ *
  */
 public class IdTestLabel extends Label {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java
index 4b1aea67ea..a49b0d260b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
index 37a33cc693..ee4bb64858 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java
index 81c8af95a6..6a9529fc1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
index 1f83cb0d48..8b501fa48f 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java
index ab123be70d..1b9003315c 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
index 6958172aa8..a155216d02 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
index 5fc5c19497..c8a1420008 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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..322becaab5 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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..7403732643 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -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/WidgetUtilUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
index 0489a8676f..ece5bca937 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
index f8f1754385..de2cf313d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Abstract UI to test the CSRF token issue as reported in (#14111)
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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) {
diff --git a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
index 656b269c06..7eb8087041 100644
--- a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to check high resolution time availability in browser (depending on
  * browser).
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CurrentTimeMillisTest extends MultiBrowserTest {
@@ -56,12 +56,14 @@ public class CurrentTimeMillisTest extends MultiBrowserTest {
             if (BrowserUtil.isChrome(getDesiredCapabilities())) {
                 // Chrome (version 33 at least) sometimes doesn't use high res
                 // time if number of ms is less then 1
-                Assert.assertTrue("High resolution time is not used in "
-                        + "JSON parsing mesurement. Time=" + time,
+                Assert.assertTrue(
+                        "High resolution time is not used in "
+                                + "JSON parsing mesurement. Time=" + time,
                         time.equals("0") || time.indexOf('.') > 0);
             } else {
-                Assert.assertTrue("High resolution time is not used in "
-                        + "JSON parsing mesurement. Time=" + time,
+                Assert.assertTrue(
+                        "High resolution time is not used in "
+                                + "JSON parsing mesurement. Time=" + time,
                         time.indexOf('.') > 0);
             }
         } else {
@@ -78,8 +80,8 @@ public class CurrentTimeMillisTest extends MultiBrowserTest {
         actions.sendKeys(Keys.SPACE).perform();
         findElement(By.className("v-debugwindow-tab")).click();
 
-        List<WebElement> messages = findElements(By
-                .className("v-debugwindow-message"));
+        List<WebElement> messages = findElements(
+                By.className("v-debugwindow-message"));
         for (WebElement message : messages) {
             if (message.getAttribute("innerHTML").startsWith("JSON parsing")) {
                 String text = message.getAttribute("innerHTML");
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 70accdd0d0..e6fd33149d 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -39,8 +39,8 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
         if (BrowserUtil.isChrome(getDesiredCapabilities())) {
             // Chrome version does not necessarily match the desired version
             // because of auto updates...
-            browserIdentifier = getExpectedUserAgentString(getDesiredCapabilities())
-                    + "52";
+            browserIdentifier = getExpectedUserAgentString(
+                    getDesiredCapabilities()) + "52";
         } else {
             browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
                     + desiredCapabilities.getVersion();
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
index b78a4ad314..6e20747e8c 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
index e1d0452708..d5056b2334 100644
--- a/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
@@ -35,8 +35,9 @@ public class WindowWaiAriaRolesTest extends MultiBrowserTest {
 
         $(ButtonElement.class).caption("Regular").first().click();
         String role = getWindowRole();
-        Assert.assertTrue("Dialog has incorrect role '" + role
-                + "', expected 'dialog'", "dialog".equals(role));
+        Assert.assertTrue(
+                "Dialog has incorrect role '" + role + "', expected 'dialog'",
+                "dialog".equals(role));
     }
 
     @Test
@@ -44,8 +45,10 @@ public class WindowWaiAriaRolesTest extends MultiBrowserTest {
         openTestURL();
         $(ButtonElement.class).caption("Alert").first().click();
         String role = getWindowRole();
-        Assert.assertTrue("Dialog has incorrect role '" + role
-                + "', expected 'alertdialog'", "alertdialog".equals(role));
+        Assert.assertTrue(
+                "Dialog has incorrect role '" + role
+                        + "', expected 'alertdialog'",
+                "alertdialog".equals(role));
     }
 
     public String getWindowRole() {
diff --git a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
index 51fe3dfd06..f8efe5beb7 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
index 9a51980c9e..1cc028e153 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
index 1e156c3e46..868b38b9ad 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,8 +38,8 @@ public class DetachOldUIOnReloadTest extends MultiBrowserTest {
         assertEquals("initial label incorrect", "This is UI 0",
                 lastLabelText(labels));
 
-        assertFalse("reloading button not found", $(ButtonElement.class)
-                .caption(RELOAD).all().isEmpty());
+        assertFalse("reloading button not found",
+                $(ButtonElement.class).caption(RELOAD).all().isEmpty());
 
         openTestURL();
         click(READ_LOG);
@@ -68,9 +68,12 @@ public class DetachOldUIOnReloadTest extends MultiBrowserTest {
                 String.format("label incorrect after %s reload", descriptor),
                 String.format("This is UI %s", index), lastLabelText(labels));
         if (!"final".equals(descriptor)) {
-            assertEquals(String.format("log message incorrect after %s reload",
-                    descriptor), String.format("%s. UI %s has been detached",
-                    index, index - 1), labels.get(0).getText());
+            assertEquals(
+                    String.format("log message incorrect after %s reload",
+                            descriptor),
+                    String.format("%s. UI %s has been detached", index,
+                            index - 1),
+                    labels.get(0).getText());
         }
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java b/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java
index fa316c6749..12a5b1c67c 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
index 3d43b8f885..ad44fe6f89 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@ public class MissingHierarchyDetectionTest extends SingleBrowserTest {
 
         Assert.assertTrue(isElementPresent(By.id("label")));
 
-        ButtonElement toggleProperly = $(ButtonElement.class).caption(
-                "Toggle properly").first();
+        ButtonElement toggleProperly = $(ButtonElement.class)
+                .caption("Toggle properly").first();
 
         toggleProperly.click();
         assertNoSystemNotifications();
@@ -41,8 +41,8 @@ public class MissingHierarchyDetectionTest extends SingleBrowserTest {
         assertNoSystemNotifications();
         Assert.assertTrue(isElementPresent(LabelElement.class));
 
-        ButtonElement toggleInproperly = $(ButtonElement.class).caption(
-                "Toggle improperly").first();
+        ButtonElement toggleInproperly = $(ButtonElement.class)
+                .caption("Toggle improperly").first();
         toggleInproperly.click();
 
         assertSystemNotification();
diff --git a/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
index 04dbdca31e..19c8d96593 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,8 @@ public class PreserveWithExpiredHeartbeatTest extends SingleBrowserTest {
 
         long startTime = System.currentTimeMillis();
 
-        while (System.currentTimeMillis() - startTime < heartbeatInterval * 3.1) {
+        while (System.currentTimeMillis() - startTime < heartbeatInterval
+                * 3.1) {
             // "Close" the tab
             driver.get("about:blank");
 
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
index eb55a7fb5e..7fe3dd7c6b 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -70,8 +70,8 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy {
         // Show spinner and make sure it is shown by comparing to the screenshot
         // without a spinner
         executeScript("arguments[0].style.visibility='visible';", spinner);
-        BufferedImage fullScreen = ImageIO.read(new ByteArrayInputStream(
-                ((TakesScreenshot) getDriver())
+        BufferedImage fullScreen = ImageIO
+                .read(new ByteArrayInputStream(((TakesScreenshot) getDriver())
                         .getScreenshotAs(OutputType.BYTES)));
         BufferedImage spinnerImage = CustomTestBenchCommandExecutor
                 .cropToElement(spinner, fullScreen,
@@ -109,7 +109,8 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy {
             @Override
             public Boolean apply(WebDriver input) {
                 try {
-                    final WebElement reconnectDialog = findElement(ReconnectDialogThemeTest.reconnectDialogBy);
+                    final WebElement reconnectDialog = findElement(
+                            ReconnectDialogThemeTest.reconnectDialogBy);
                     return reconnectDialog.findElement(By.className("text"))
                             .getText().equals(text);
                 } catch (Exception e) {
@@ -120,11 +121,13 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy {
 
     }
 
-    private void assertHasManyColors(String message, BufferedImage spinnerImage) {
+    private void assertHasManyColors(String message,
+            BufferedImage spinnerImage) {
         int backgroundColor = spinnerImage.getRGB(0, 0);
         for (int x = 0; x < spinnerImage.getWidth(); x++) {
             for (int y = 0; y < spinnerImage.getHeight(); y++) {
-                if (Math.abs(spinnerImage.getRGB(x, y) - backgroundColor) > 50) {
+                if (Math.abs(
+                        spinnerImage.getRGB(x, y) - backgroundColor) > 50) {
                     return;
                 }
             }
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java
index b07124c216..26440fe18f 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -54,7 +54,8 @@ public class ReconnectDialogUITest extends MultiBrowserTestWithProxy {
         Assert.assertEquals("1. Hello from the server", getLogRow(0));
         disconnectProxy();
         getButton().click();
-        waitForReconnectDialogWithText("Server connection lost, trying to reconnect...");
+        waitForReconnectDialogWithText(
+                "Server connection lost, trying to reconnect...");
         connectProxy();
         waitForReconnectDialogToDisappear();
         Assert.assertEquals("2. Hello from the server", getLogRow(0));
@@ -62,7 +63,8 @@ public class ReconnectDialogUITest extends MultiBrowserTestWithProxy {
 
     private void waitForReconnectDialogWithText(final String text) {
         waitForReconnectDialogPresent();
-        final WebElement reconnectDialog = findElement(ReconnectDialogThemeTest.reconnectDialogBy);
+        final WebElement reconnectDialog = findElement(
+                ReconnectDialogThemeTest.reconnectDialogBy);
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
diff --git a/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java
index a54d8b4ce9..3257e3429f 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java
@@ -24,6 +24,7 @@ public class RefreshStatePreserveTest extends MultiBrowserTest {
     private void assertCorrectState() {
         waitForElementPresent(By.className("v-label"));
         LabelElement uiIdLabel = $(LabelElement.class).get(7);
-        Assert.assertEquals("Incorrect UI id,", UI_ID_TEXT, uiIdLabel.getText());
+        Assert.assertEquals("Incorrect UI id,", UI_ID_TEXT,
+                uiIdLabel.getText());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
index 7f2dabe9f1..b1be11d933 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java
index 726616d7b8..eabb0b2ee1 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,8 +36,8 @@ public class ResynchronizeUITest extends SingleBrowserTest {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         // PhantomJS does not send onload events for styles
-        return Collections.singletonList(Browser.FIREFOX
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.FIREFOX.getDesiredCapabilities());
     }
 
     @Test
@@ -51,7 +51,8 @@ public class ResynchronizeUITest extends SingleBrowserTest {
         waitForThemeToChange("runo");
         try {
             button.click();
-            Assert.fail("The old button element should have been removed by the click and replaced by a new one.");
+            Assert.fail(
+                    "The old button element should have been removed by the click and replaced by a new one.");
         } catch (StaleElementReferenceException e) {
             // This is what should happen
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java b/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java
index 0b9ab77d81..35b38a8bd0 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
index 47e86d9039..11dc4ff0ab 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
index 404e05eefc..d20c407af6 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ public class CleanupBrokenUITest extends SingleBrowserTest {
         // UI 1 has not yet been added in UI.init where logging takes place
         Assert.assertEquals("1. UIs in session: 0", getLogRow(0));
 
-        String url = getTestURL(getUIClass())
-                .replace("restartApplication", "1");
+        String url = getTestURL(getUIClass()).replace("restartApplication",
+                "1");
         driver.get(url);
         // UI 1 remains in session during UI2 init where logging takes place
         Assert.assertEquals("1. UIs in session: 1", getLogRow(0));
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
index 1d6bf3f9bf..5d0ef4e1a8 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
@@ -45,8 +45,8 @@ public class CloseSessionTest extends MultiBrowserTest {
     public void testCloseVaadinServiceAndRedirect() {
         clickButton("Close VaadinServiceSession and redirect elsewhere");
         Assert.assertEquals("Unexpected page contents,",
-                "This is a static file", findElement(By.xpath("//h1"))
-                        .getText());
+                "This is a static file",
+                findElement(By.xpath("//h1")).getText());
     }
 
     /**
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
index bb9d2a9294..d2818205df 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
@@ -21,8 +21,8 @@ public class RpcForClosedUITest extends MultiBrowserTest {
         clickButton("Log 'hello'");
         /* Ensure 'hello' was not logged */
         checkLogMatches("2. Current WrappedSession id: .*");
-        Assert.assertFalse("Page contains word 'Hello'", driver.getPageSource()
-                .contains("Hello"));
+        Assert.assertFalse("Page contains word 'Hello'",
+                driver.getPageSource().contains("Hello"));
     }
 
     private void clickButton(String caption) {
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
index e74eea6c55..ece07b9512 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
index f10f281646..d59db5a6ab 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
index 39e8d04ffc..9ee118bae2 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
@@ -15,11 +15,14 @@ public class MultipleServletConfigurationTest extends MultiBrowserTest {
     @Test
     public void testMultipleServletConfiguration() throws Exception {
         getDriver().get(getBaseURL() + "/embed1");
-        assertLabelText("A generic test for Buttons in different configurations");
+        assertLabelText(
+                "A generic test for Buttons in different configurations");
         getDriver().get(getBaseURL() + "/embed2");
-        assertLabelText("Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label.");
+        assertLabelText(
+                "Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label.");
         getDriver().get(getBaseURL() + "/embed1");
-        assertLabelText("A generic test for Buttons in different configurations");
+        assertLabelText(
+                "A generic test for Buttons in different configurations");
     }
 
     private void assertLabelText(String expected) {
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
index 3faf5bde72..f8e897db3c 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class NoApplicationClassTest extends SingleBrowserTest {
         Assert.assertTrue(
                 String.format(
                         "Unexpected error message.\n expected to contain: '%s'\n was: %s",
-                        expected, exceptionMessage), exceptionMessage
-                        .contains(expected));
+                        expected, exceptionMessage),
+                exceptionMessage.contains(expected));
     }
 
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
index bbbb49b39c..dd5248ce76 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
@@ -29,6 +29,7 @@ public class SystemMessagesTest extends MultiBrowserTest {
         Assert.assertEquals("Incorrect notification caption,",
                 notification.getCaption(), "Internal error");
         Assert.assertEquals("Incorrect notification description,",
-                notification.getDescription(), "MessagesInfo locale: " + locale);
+                notification.getDescription(),
+                "MessagesInfo locale: " + locale);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
index 7f9a375440..e80e609ffa 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
index 69e4aaa06c..ca9c21d226 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to see if AbstractOrderedLayout displays captions correctly with
  * expanding ratios.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbstractOrderedLayoutWithCaptionsTest extends MultiBrowserTest {
@@ -40,13 +40,13 @@ public class AbstractOrderedLayoutWithCaptionsTest extends MultiBrowserTest {
     public void CaptionHeightMeasuredCorrectly() {
         openTestURL();
 
-        WebElement div = getDriver().findElement(
-                By.cssSelector(".v-panel-content > div > div"));
+        WebElement div = getDriver()
+                .findElement(By.cssSelector(".v-panel-content > div > div"));
         String paddingTop = div.getCssValue("padding-top");
-        Integer paddingHeight = Integer.parseInt(paddingTop.substring(0,
-                paddingTop.length() - 2));
-        List<WebElement> children = getDriver().findElements(
-                By.cssSelector(".v-panel-content .v-slot"));
+        Integer paddingHeight = Integer
+                .parseInt(paddingTop.substring(0, paddingTop.length() - 2));
+        List<WebElement> children = getDriver()
+                .findElements(By.cssSelector(".v-panel-content .v-slot"));
         assertThat(children.size(), is(3));
 
         Integer neededHeight = children.get(0).getSize().getHeight()
diff --git a/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java b/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java
index 73d1ba6f52..d5ec33e6ba 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
index bc12919ccd..a465284eee 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java
index c6bab3c9b9..e2b49aefc7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java
index a43db58fd0..4b8e231a28 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ public class SaneErrorsTest extends MultiBrowserTest {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.tb3.MultiBrowserTest#getBrowsersToTest()
      */
     @Override
@@ -41,8 +41,8 @@ public class SaneErrorsTest extends MultiBrowserTest {
     @Test
     public void test() {
         openTestURL();
-        List<WebElement> elements = getDriver().findElements(
-                By.xpath("//*[text() = 'Show me my NPE!']"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.xpath("//*[text() = 'Show me my NPE!']"));
         for (WebElement webElement : elements) {
             webElement.click();
         }
@@ -50,8 +50,8 @@ public class SaneErrorsTest extends MultiBrowserTest {
         getDriver().findElement(By.xpath("//*[text() = 'Collect exceptions']"))
                 .click();
 
-        List<WebElement> errorMessages = getDriver().findElements(
-                By.className("v-label"));
+        List<WebElement> errorMessages = getDriver()
+                .findElements(By.className("v-label"));
         for (WebElement webElement : errorMessages) {
             String text = webElement.getText();
             Assert.assertEquals("java.lang.NullPointerException", text);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java
index 8e1df42f50..b8276974ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that the tooltip is positioned so that it fits in the displayed area.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TooltipPositionTest extends MultiBrowserTest {
@@ -164,10 +164,10 @@ public class TooltipPositionTest extends MultiBrowserTest {
         int yTop = topLeft.getY();
         int xRight = xLeft + tooltipSize.getWidth() - 1;
         int yBottom = yTop + tooltipSize.getHeight() - 1;
-        boolean overlapHorizontally = !(xRight < 0 || xLeft >= windowSize
-                .getWidth());
-        boolean overlapVertically = !(yBottom < 0 || yTop >= windowSize
-                .getHeight());
+        boolean overlapHorizontally = !(xRight < 0
+                || xLeft >= windowSize.getWidth());
+        boolean overlapVertically = !(yBottom < 0
+                || yTop >= windowSize.getHeight());
         return !(overlapHorizontally && overlapVertically);
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
index 49539fcae1..c734463180 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,11 +31,9 @@ public class UnknownComponentConnectorTest extends MultiBrowserTest {
     public void testConnectorNotFoundInWidgetset() throws Exception {
         openTestURL();
         WebElement component = vaadinElementById("no-connector-component");
-        assertTrue(component
-                .getText()
-                .startsWith(
-                        "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain "
-                                + "implementation for com.vaadin.tests.components.UnknownComponentConnector."
-                                + "ComponentWithoutConnector."));
+        assertTrue(component.getText().startsWith(
+                "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain "
+                        + "implementation for com.vaadin.tests.components.UnknownComponentConnector."
+                        + "ComponentWithoutConnector."));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
index 6cb8c476c9..c225c87405 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests how AbsoluteLayout handles relative sized contents.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbsoluteLayoutRelativeSizeContentTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
index 485e218a68..6190d65e11 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
index 4b975dbecc..7dbb8af52e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -61,7 +61,7 @@ public class ContextClickUITest extends MultiBrowserTest {
                 .moveToElement($(UIElement.class).first(), 10, 10).click()
                 .perform();
 
-        assertTrue("Context click should not be handled.", getLogRow(0).trim()
-                .isEmpty());
+        assertTrue("Context click should not be handled.",
+                getLogRow(0).trim().isEmpty());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
index 8500fbe18d..3a1e105e14 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,16 +35,16 @@ public class PrimaryStyleTest extends MultiBrowserTest {
         openTestURL();
 
         // Verify the initial class names for all three components.
-        List<WebElement> initialElements = driver.findElements(By
-                .className("initial-state"));
+        List<WebElement> initialElements = driver
+                .findElements(By.className("initial-state"));
         assertThat(initialElements, hasSize(3));
 
         // Click on a button that updates the styles.
         $(ButtonElement.class).id("update-button").click();
 
         // Verify that the class names where updated as expected.
-        List<WebElement> updatedElements = driver.findElements(By
-                .className("updated-correctly"));
+        List<WebElement> updatedElements = driver
+                .findElements(By.className("updated-correctly"));
         assertThat(updatedElements, hasSize(initialElements.size()));
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
index 7b939a5627..79d08ec896 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
index 649ee42986..c97c997231 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
index 41ba5571ad..6c6c2e2775 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
index edae0a24c2..716ff60a2d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
index 2d9c9a494b..9df68e5c80 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
index 95b7a9c416..6df76978bb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for Accordion : replace widget in tab should remove old widget.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -41,8 +41,10 @@ public class AccordionAddTabTest extends MultiBrowserTest {
 
         List<WebElement> panels = driver.findElements(By.className("v-panel"));
 
-        Assert.assertEquals("Found two widgets inside one tab after "
-                + "subsequent tab removal and addition", 1, panels.size());
+        Assert.assertEquals(
+                "Found two widgets inside one tab after "
+                        + "subsequent tab removal and addition",
+                1, panels.size());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
index 785acddcb7..fa82a1f2ab 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for removing component from Accordion
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AccordionRemoveComponentTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
index 1047c070c8..836b9ddc57 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for Accordion: tabs should stay selectable after remove tab.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -48,18 +48,18 @@ public class AccordionRemoveTabTest extends MultiBrowserTest {
     public void testConsoleErrorOnSwitch() {
         setDebug(true);
         openTestURL();
-        WebElement firstItem = driver.findElement(By
-                .className("v-accordion-item-first"));
-        WebElement caption = firstItem.findElement(By
-                .className("v-accordion-item-caption"));
+        WebElement firstItem = driver
+                .findElement(By.className("v-accordion-item-first"));
+        WebElement caption = firstItem
+                .findElement(By.className("v-accordion-item-caption"));
         caption.click();
         Assert.assertEquals("Errors present in console", 0,
                 findElements(By.className("SEVERE")).size());
     }
 
     private void checkFirstItemHeight(String text) {
-        WebElement firstItem = driver.findElement(By
-                .className("v-accordion-item-first"));
+        WebElement firstItem = driver
+                .findElement(By.className("v-accordion-item-first"));
         WebElement label = firstItem.findElement(By.className("v-label"));
         Assert.assertEquals("Unexpected text in first item", text,
                 label.getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
index 17c7fe6804..35a04c220f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for Accordion: Tab.setId should be propagated to client side tabs.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java
index 4ea02b20d0..a9e750141f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,8 +29,10 @@ public class ButtonClickTest extends MultiBrowserTest {
     public void buttonMouseDownOutOverUp() {
         openTestURL();
 
-        WebElement clickedButton = vaadinElement("/VVerticalLayout[0]/VButton[0]");
-        WebElement visitedButton = vaadinElement("/VVerticalLayout[0]/VButton[1]");
+        WebElement clickedButton = vaadinElement(
+                "/VVerticalLayout[0]/VButton[0]");
+        WebElement visitedButton = vaadinElement(
+                "/VVerticalLayout[0]/VButton[1]");
 
         new Actions(driver).moveToElement(clickedButton).clickAndHold()
                 .moveToElement(visitedButton).moveToElement(clickedButton)
diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
index 110d729a36..717b69ce0e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for availability (x,y) coordinates for button activated via keyboard.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ButtonKeyboardClickTest extends MultiBrowserTest {
@@ -72,37 +72,45 @@ public class ButtonKeyboardClickTest extends MultiBrowserTest {
                 getValue("x") > button.getLocation().getX());
         Assert.assertTrue(
                 "Client X click cooridnate is greater than right button "
-                        + "border coordinate", getValue("x") < button
-                        .getLocation().getX() + button.getSize().getWidth());
+                        + "border coordinate",
+                getValue("x") < button.getLocation().getX()
+                        + button.getSize().getWidth());
 
         Assert.assertTrue(
                 "Client Y click cooridnate is lower than Y button coordinate",
                 getValue("y") > button.getLocation().getY());
         Assert.assertTrue(
                 "Client Y click cooridnate is greater than bottom button "
-                        + "border coordinate", getValue("y") < button
-                        .getLocation().getY() + button.getSize().getHeight());
+                        + "border coordinate",
+                getValue("y") < button.getLocation().getY()
+                        + button.getSize().getHeight());
 
         Assert.assertTrue(
                 "Client X click cooridnate is greater than X middle button "
-                        + "coordinate", button.getLocation().getX()
+                        + "coordinate",
+                button.getLocation().getX()
                         + button.getSize().getWidth() / 2 >= getValue("x") - 1);
         Assert.assertTrue(
                 "Client Y click cooridnate is greater than Y middle button coordinate",
-                button.getLocation().getY() + button.getSize().getHeight() / 2 >= getValue("y") - 1);
+                button.getLocation().getY()
+                        + button.getSize().getHeight() / 2 >= getValue("y")
+                                - 1);
 
         Assert.assertTrue(
                 "Client X click cooridnate is lower than X middle button "
-                        + "coordinate", button.getLocation().getX()
+                        + "coordinate",
+                button.getLocation().getX()
                         + button.getSize().getWidth() / 2 <= getValue("x") + 1);
         Assert.assertTrue(
                 "Client Y click cooridnate is lower than Y middle button coordinate",
-                button.getLocation().getY() + button.getSize().getHeight() / 2 <= getValue("y") + 1);
+                button.getLocation().getY()
+                        + button.getSize().getHeight() / 2 <= getValue("y")
+                                + 1);
     }
 
     private int getValue(String style) {
-        return Integer.parseInt(getDriver().findElement(
-                By.className("v-label-" + style)).getText());
+        return Integer.parseInt(getDriver()
+                .findElement(By.className("v-label-" + style)).getText());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
index 850dd1229c..08fddc4b8d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Validates button Widths for Buttons or Native Buttons, inside or outside
  * tables.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -55,8 +55,8 @@ public class ButtonUndefinedWidthTest extends MultiBrowserTest {
         getDriver().findElement(By.className("v-app")).click();
 
         // check button widths in VerticalLayout
-        VerticalLayoutElement vLayout = $(VerticalLayoutElement.class).$(
-                VerticalLayoutElement.class).first();
+        VerticalLayoutElement vLayout = $(VerticalLayoutElement.class)
+                .$(VerticalLayoutElement.class).first();
         int containerWidth = vLayout.getSize().getWidth();
 
         NativeButtonElement nativeButton = vLayout.$(NativeButtonElement.class)
@@ -71,12 +71,12 @@ public class ButtonUndefinedWidthTest extends MultiBrowserTest {
 
         // check button widths in table, also make sure that there is some
         // spacing between the table edges and buttons
-        List<WebElement> rows = findElements(By
-                .className("v-table-cell-content"));
+        List<WebElement> rows = findElements(
+                By.className("v-table-cell-content"));
         int rowWidth = rows.get(0).getSize().getWidth();
 
-        List<WebElement> rowWrappers = findElements(By
-                .className("v-table-cell-wrapper"));
+        List<WebElement> rowWrappers = findElements(
+                By.className("v-table-cell-wrapper"));
         WebElement row = rowWrappers.get(0);
 
         containerWidth = row.getSize().getWidth();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
index 740d451b0f..3e692d8cb3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class BeanItemContainerLongEventTest extends MultiBrowserTest {
     @Test
     public void testEventDisplayedInWeekView() {
         openTestURL();
-        WebElement target = driver.findElements(
-                By.className("v-calendar-week-number")).get(1);
+        WebElement target = driver
+                .findElements(By.className("v-calendar-week-number")).get(1);
         target.click();
         target = driver.findElement(By.className("v-calendar-event"));
         Assert.assertEquals("Wrong event name", "Long event", target.getText());
@@ -50,8 +50,8 @@ public class BeanItemContainerLongEventTest extends MultiBrowserTest {
     @Test
     public void testEventDisplayedInDayView() {
         openTestURL();
-        WebElement target = driver.findElements(
-                By.className("v-calendar-day-number")).get(5);
+        WebElement target = driver
+                .findElements(By.className("v-calendar-day-number")).get(5);
         target.click();
         target = driver.findElement(By.className("v-calendar-event"));
         Assert.assertEquals("Wrong event name", "Long event", target.getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
index 161f927681..d7c0789989 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,10 +26,10 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration;
 /**
  * Test that calendar action event source is the calendar, not a private nested
  * class in it.
- * 
+ *
  * The related code is not browser dependent so only running on a single
  * browser.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarActionEventSourceTest extends PrivateTB3Configuration {
@@ -38,8 +38,8 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration {
         openTestURL();
 
         // perform action on empty cell
-        WebElement element = getDriver().findElement(
-                By.className("v-calendar-spacer"));
+        WebElement element = getDriver()
+                .findElement(By.className("v-calendar-spacer"));
         performAction(element);
 
         checkEventSourceIsCalendar();
@@ -50,8 +50,8 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration {
         openTestURL();
 
         // perform action on calendar event
-        WebElement element = getDriver().findElement(
-                By.className("v-calendar-event"));
+        WebElement element = getDriver()
+                .findElement(By.className("v-calendar-event"));
         performAction(element);
 
         checkEventSourceIsCalendar();
@@ -60,16 +60,16 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration {
     private void performAction(WebElement element) {
         // right click
         new Actions(getDriver()).contextClick(element).perform();
-        WebElement menuItem = getDriver().findElement(
-                By.className("gwt-MenuItem"));
+        WebElement menuItem = getDriver()
+                .findElement(By.className("gwt-MenuItem"));
         menuItem.click();
     }
 
     private void checkEventSourceIsCalendar() {
         String calendarObject = getDriver().findElement(By.id("calendarlabel"))
                 .getText();
-        String actionSourceObject = getDriver().findElement(
-                By.id("senderlabel")).getText();
+        String actionSourceObject = getDriver()
+                .findElement(By.id("senderlabel")).getText();
         Assert.assertEquals(
                 "Calendar action event source must be the calendar itself",
                 calendarObject, actionSourceObject);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
index 98773f475b..c7091759bb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests: Vaadin Calendar: Navigation to invisible days of week (#12243)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarBackwardForwardTest extends MultiBrowserTest {
@@ -41,26 +41,26 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest {
         openDayView();
         clickCalendarNext();
 
-        WebElement headerDayElement = getDriver().findElement(
-                By.className("v-calendar-header-day"));
+        WebElement headerDayElement = getDriver()
+                .findElement(By.className("v-calendar-header-day"));
 
-        assertThat("This day should be Monday 9/9/13", headerDayElement
-                .getText().equals("Monday 9/9/13"));
+        assertThat("This day should be Monday 9/9/13",
+                headerDayElement.getText().equals("Monday 9/9/13"));
 
         for (int i = 0; i < 6; i++) {
             clickCalendarBack();
         }
 
-        headerDayElement = getDriver().findElement(
-                By.className("v-calendar-header-day"));
+        headerDayElement = getDriver()
+                .findElement(By.className("v-calendar-header-day"));
 
-        assertThat("This day should be Friday 8/30/13", headerDayElement
-                .getText().equals("Friday 8/30/13"));
+        assertThat("This day should be Friday 8/30/13",
+                headerDayElement.getText().equals("Friday 8/30/13"));
     }
 
     private void openWeekView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-week-number"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-week-number"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().equals("36")) {
@@ -71,8 +71,8 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest {
     }
 
     private void openDayView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-header-day"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-header-day"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().contains("Friday 9/6/13")) {
@@ -83,15 +83,15 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest {
     }
 
     private void clickCalendarNext() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-next"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-next"));
 
         elements.get(0).click();
     }
 
     private void clickCalendarBack() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-back"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-back"));
 
         elements.get(0).click();
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
index 8b8122dcf9..fb8d03d613 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
@@ -46,7 +46,7 @@ public class CalendarDisabledTest extends MultiBrowserTest {
     }
 
     private void assertCalendarInMonthView() {
-        assertTrue("Calendar wasn't in month view.", getCalendar()
-                .hasMonthView());
+        assertTrue("Calendar wasn't in month view.",
+                getCalendar().hasMonthView());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
index 077ab7f7ec..2a73052e0b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,7 +49,8 @@ public class CalendarHtmlInEventsTest extends SingleBrowserTest {
         click(htmlAllowed);
         Assert.assertEquals("1. HTML in event caption: true", getLogRow(0));
 
-        Assert.assertEquals(getMonthEvent(0).getText(), "12:00 AM Hello world!");
+        Assert.assertEquals(getMonthEvent(0).getText(),
+                "12:00 AM Hello world!");
     }
 
     @Test
@@ -78,22 +79,22 @@ public class CalendarHtmlInEventsTest extends SingleBrowserTest {
     }
 
     private WebElement getMonthEvent(int dayInCalendar) {
-        return getMonthDay(dayInCalendar).findElement(
-                By.className("v-calendar-event"));
+        return getMonthDay(dayInCalendar)
+                .findElement(By.className("v-calendar-event"));
     }
 
     private WebElement getWeekEvent(int dayInCalendar) {
-        return getWeekDay(dayInCalendar).findElement(
-                By.className("v-calendar-event"));
+        return getWeekDay(dayInCalendar)
+                .findElement(By.className("v-calendar-event"));
     }
 
     private WebElement getMonthDay(int i) {
-        return calendar.findElements(By.className("v-calendar-month-day")).get(
-                i);
+        return calendar.findElements(By.className("v-calendar-month-day"))
+                .get(i);
     }
 
     private WebElement getWeekDay(int i) {
-        return calendar.findElements(By.className("v-calendar-day-times")).get(
-                i);
+        return calendar.findElements(By.className("v-calendar-day-times"))
+                .get(i);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
index 3248804eed..ee8d62671b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.DndActionsTest;
 /**
  * Test to check how DnD works for regular (not all day event) in calendar month
  * view.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarMonthViewDndEventTest extends DndActionsTest {
@@ -44,8 +44,8 @@ public class CalendarMonthViewDndEventTest extends DndActionsTest {
 
         // does calendar have space on the right for one more event (i.e. day
         // cell on the right).
-        boolean moveRight = event.getLocation().getX() + 2
-                * event.getSize().getWidth() <= calendarRight;
+        boolean moveRight = event.getLocation().getX()
+                + 2 * event.getSize().getWidth() <= calendarRight;
 
         WebElement cell = getParentCell(event, "v-calendar-month-day");
 
@@ -67,9 +67,9 @@ public class CalendarMonthViewDndEventTest extends DndActionsTest {
 
         Assert.assertTrue(
                 "Moved event has wrong Y position (not the same row), new Y position="
-                        + newY + ", cell Y position=" + cellY
-                        + ", cell height=" + cellHeight, newY >= cellY
-                        && newY < cellY + cellHeight);
+                        + newY + ", cell Y position=" + cellY + ", cell height="
+                        + cellHeight,
+                newY >= cellY && newY < cellY + cellHeight);
         if (moveRight) {
             Assert.assertTrue(
                     "Moved event has wrong X position (not after original event)",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
index 2431b2f4d0..1dbeb8e1f0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests opening and closing of calendar notifications.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
index 62223ccc25..517ebefb0a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests opening and closing of calendar notifications.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -62,15 +62,15 @@ public class CalendarNotificationsTestIE extends MultiBrowserTest {
         WebElement day = findElements(By.className("v-calendar-day-number"))
                 .get(2);
         // IE8 requires you to click on the text part to fire the event
-        new Actions(getDriver())
-                .moveToElement(day, day.getSize().getWidth() - 3,
-                        day.getSize().getHeight() / 2).click().perform();
+        new Actions(getDriver()).moveToElement(day,
+                day.getSize().getWidth() - 3, day.getSize().getHeight() / 2)
+                .click().perform();
 
         // check that a notification was opened, this is done with a log instead
         // of a screenshot or element presence check due to problems with IE
         // webdriver
-        String text = findElement(By.id("Log")).findElement(
-                By.className("v-label")).getText();
+        String text = findElement(By.id("Log"))
+                .findElement(By.className("v-label")).getText();
         Assert.assertTrue("Notification should've opened",
                 "1. Opening a notification".equals(text));
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
index 142353f314..eef3ca5439 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
@@ -27,7 +27,8 @@ public class CalendarReadOnlyTest extends MultiBrowserTest {
     public void weekViewCanBeOpenedFromMonthView() {
         openWeekView();
 
-        assertTrue("Calendar wasn't in week view.", getCalendar().hasWeekView());
+        assertTrue("Calendar wasn't in week view.",
+                getCalendar().hasWeekView());
     }
 
     @Test
@@ -100,16 +101,16 @@ public class CalendarReadOnlyTest extends MultiBrowserTest {
     public void hiddenEventsCanBeExpanded() {
         WebElement dayWithEvents = getFirstDayWithEvents();
 
-        assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents)
-                .size(), is(2));
+        assertThat("Incorrect event count.",
+                getVisibleEvents(dayWithEvents).size(), is(2));
 
         toggleExpandEvents(dayWithEvents).click();
-        assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents)
-                .size(), is(4));
+        assertThat("Incorrect event count.",
+                getVisibleEvents(dayWithEvents).size(), is(4));
 
         toggleExpandEvents(dayWithEvents).click();
-        assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents)
-                .size(), is(2));
+        assertThat("Incorrect event count.",
+                getVisibleEvents(dayWithEvents).size(), is(2));
     }
 
     private CalendarElement getCalendar() {
@@ -139,8 +140,8 @@ public class CalendarReadOnlyTest extends MultiBrowserTest {
     }
 
     private WebElement toggleExpandEvents(WebElement dayWithEvents) {
-        return dayWithEvents.findElement(By
-                .className("v-calendar-bottom-spacer"));
+        return dayWithEvents
+                .findElement(By.className("v-calendar-bottom-spacer"));
     }
 
     private List<WebElement> getVisibleEvents(WebElement dayWithEvents) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
index fb8cce7d53..900c0b53a4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.DndActionsTest;
 
 /**
  * Test to check ability to reschedule events unlimited times.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarRescheduleEventTest extends DndActionsTest {
@@ -69,13 +69,13 @@ public class CalendarRescheduleEventTest extends DndActionsTest {
      * DnD event by Y axis
      */
     private int rescheduleEvent(int yOffset) {
-        WebElement eventCaption = getDriver().findElement(
-                By.className("v-calendar-event-caption"));
+        WebElement eventCaption = getDriver()
+                .findElement(By.className("v-calendar-event-caption"));
 
         dragAndDrop(eventCaption, 0, yOffset);
 
-        eventCaption = getDriver().findElement(
-                By.className("v-calendar-event-caption"));
+        eventCaption = getDriver()
+                .findElement(By.className("v-calendar-event-caption"));
         return eventCaption.getLocation().getY();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
index e3e5606089..2fd5550485 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.tests.tb3.DndActionsTest;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CalendarResizeOverlappingEventsTest extends DndActionsTest {
@@ -76,20 +76,23 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest {
 
         int actualWidth = firstEvent.getSize().getWidth();
         int expectedWidth = firstEventExpectedWidth;
-        Assert.assertTrue(String.format(errorMessage, expectedWidth,
-                widthTolerance, actualWidth),
+        Assert.assertTrue(
+                String.format(errorMessage, expectedWidth, widthTolerance,
+                        actualWidth),
                 isAproximateWidth(actualWidth, expectedWidth, widthTolerance));
 
         actualWidth = secondEvent.getSize().getWidth();
         expectedWidth = secondEventExpectedWidth;
-        Assert.assertTrue(String.format(errorMessage, expectedWidth,
-                widthTolerance, actualWidth),
+        Assert.assertTrue(
+                String.format(errorMessage, expectedWidth, widthTolerance,
+                        actualWidth),
                 isAproximateWidth(actualWidth, expectedWidth, widthTolerance));
 
         actualWidth = thirdEvent.getSize().getWidth();
         expectedWidth = thirdEventExpectedWidth;
-        Assert.assertTrue(String.format(errorMessage, expectedWidth,
-                widthTolerance, actualWidth),
+        Assert.assertTrue(
+                String.format(errorMessage, expectedWidth, widthTolerance,
+                        actualWidth),
                 isAproximateWidth(actualWidth, expectedWidth, widthTolerance));
     }
 
@@ -103,8 +106,8 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest {
     }
 
     private void initParams() {
-        WebElement dateSlot = getDriver().findElement(
-                By.className("v-datecellslot"));
+        WebElement dateSlot = getDriver()
+                .findElement(By.className("v-datecellslot"));
         int dateSlotWidth = dateSlot.getSize().getWidth();
         noOverlapWidth = dateSlotWidth;
         oneOverlapWidth = dateSlotWidth / 2;
@@ -119,15 +122,15 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest {
             }
         };
 
-        List<WebElement> eventElements = getDriver().findElements(
-                By.className("v-calendar-event-content"));
+        List<WebElement> eventElements = getDriver()
+                .findElements(By.className("v-calendar-event-content"));
         Collections.sort(eventElements, startTimeComparator);
         firstEvent = eventElements.get(0);
         secondEvent = eventElements.get(1);
         thirdEvent = eventElements.get(2);
 
-        List<WebElement> resizeBottomElements = getDriver().findElements(
-                By.className("v-calendar-event-resizebottom"));
+        List<WebElement> resizeBottomElements = getDriver()
+                .findElements(By.className("v-calendar-event-resizebottom"));
         Collections.sort(resizeBottomElements, startTimeComparator);
         firstEventBottomResize = resizeBottomElements.get(0);
         secondEventBottomResize = resizeBottomElements.get(1);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
index 9db65c89c6..c8afd3c00a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Tests calendar via prepared screenshots 'Calendar event not shown correctly
  * when partially out of view' (#7261)
  */
-public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends
-        MultiBrowserTest {
+public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest
+        extends MultiBrowserTest {
 
     @Test
     public void testCalendar() throws InterruptedException, IOException {
@@ -43,8 +43,8 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends
     }
 
     private void openWeekView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-week-number"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-week-number"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().equals("36")) {
@@ -55,8 +55,8 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends
     }
 
     private void openDayView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-header-day"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-header-day"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().contains("Thursday 9/5/13")) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
index 5306ee3909..9877f9545f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -43,8 +43,8 @@ public class CalendarVisibleHoursTest extends MultiBrowserTest {
     }
 
     private void openWeekView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-week-number"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-week-number"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().equals("36")) {
@@ -55,8 +55,8 @@ public class CalendarVisibleHoursTest extends MultiBrowserTest {
     }
 
     private void openDayView() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-calendar-header-day"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-calendar-header-day"));
 
         for (WebElement webElement : elements) {
             if (webElement.getText().contains("Thursday 9/5/13")) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
index 83f41994ae..facf44775b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
@@ -31,7 +31,8 @@ public class CalendarWeekSelectionTest extends MultiBrowserTest {
     }
 
     private void clickOnWeek(String week) {
-        for (WebElement e : findElements(By.className("v-calendar-week-number"))) {
+        for (WebElement e : findElements(
+                By.className("v-calendar-week-number"))) {
             if (e.getText().equals(week)) {
                 e.click();
                 break;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
index c90d541226..3ac6a2b0c3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.components.table.DndTableTargetDetailsTest;
 /**
  * Test for mouse details in CalendarTargetDetails class when DnD target is a
  * calendar.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndCalendarTargetDetailsTest extends DndTableTargetDetailsTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
index a41fb8360a..c1f186f628 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -48,15 +48,15 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest {
         // first of all check if event is present in calendar view
         waitForElementPresent(By.className("v-calendar-event-content"));
 
-        WebElement event = getDriver().findElement(
-                By.className("v-calendar-event-content"));
-        WebElement dateSlot = getDriver().findElement(
-                By.className("v-datecellslot"));
+        WebElement event = getDriver()
+                .findElement(By.className("v-calendar-event-content"));
+        WebElement dateSlot = getDriver()
+                .findElement(By.className("v-datecellslot"));
 
         Assert.assertEquals(
                 "The height of shown part of calendar event should be equal to 12 datecell slots",
-                dateSlot.getSize().getHeight() * 12, event.getSize()
-                        .getHeight());
+                dateSlot.getSize().getHeight() * 12,
+                event.getSize().getHeight());
     }
 
     @Test
@@ -70,15 +70,15 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest {
         // first of all check if event is present in calendar view
         waitForElementPresent(By.className("v-calendar-event-content"));
 
-        WebElement event = getDriver().findElement(
-                By.className("v-calendar-event-content"));
-        WebElement dateSlot = getDriver().findElement(
-                By.className("v-datecellslot"));
+        WebElement event = getDriver()
+                .findElement(By.className("v-calendar-event-content"));
+        WebElement dateSlot = getDriver()
+                .findElement(By.className("v-datecellslot"));
 
         Assert.assertEquals(
                 "The height of shown part of calendar event should be equal to 12 datecell slots",
-                dateSlot.getSize().getHeight() * 12, event.getSize()
-                        .getHeight());
+                dateSlot.getSize().getHeight() * 12,
+                event.getSize().getHeight());
     }
 
     private void clickElement(String className, String text) {
@@ -93,8 +93,8 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest {
                         // sometimes the element only gets focus from click and
                         // we need to click the text, which is in the right edge
                         // of the element
-                        testBenchElement(webElement).click(
-                                webElement.getSize().getWidth() - 5, 9);
+                        testBenchElement(webElement)
+                                .click(webElement.getSize().getWidth() - 5, 9);
                     } catch (StaleElementReferenceException e) {
                         // the first click succeeded after all
                     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
index 826b43b9cc..8f77c86e9e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
index 12ed650c19..f9b46db0ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
@@ -16,8 +16,8 @@ public class CheckBoxNullValueTest extends MultiBrowserTest {
     public void testValidation() throws Exception {
         openTestURL();
         CheckBoxElement checkbox = $(CheckBoxElement.class).first();
-        CheckBoxElement requiredCheckbox = $(CheckBoxElement.class).caption(
-                "A required checkbox").first();
+        CheckBoxElement requiredCheckbox = $(CheckBoxElement.class)
+                .caption("A required checkbox").first();
 
         assertValid(checkbox, true);
         assertValid(requiredCheckbox, true);
@@ -45,14 +45,15 @@ public class CheckBoxNullValueTest extends MultiBrowserTest {
 
     private void assertValid(CheckBoxElement checkbox, boolean valid) {
         boolean hasIndicator = false;
-        List<WebElement> e = checkbox.findElements(By
-                .className("v-errorindicator"));
+        List<WebElement> e = checkbox
+                .findElements(By.className("v-errorindicator"));
         if (e.size() != 0) {
             hasIndicator = e.get(0).isDisplayed();
         }
 
-        Assert.assertEquals("Checkbox state should be "
-                + (valid ? "valid" : "invalid"), valid, !hasIndicator);
+        Assert.assertEquals(
+                "Checkbox state should be " + (valid ? "valid" : "invalid"),
+                valid, !hasIndicator);
 
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
index 69a919497b..c11f797463 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
index 1903687527..7b5973e93c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
index 096b07546a..cc3c9ccd19 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -77,8 +77,8 @@ public class ColorPickerInputFormatsTest extends MultiBrowserTest {
         getDriver().findElement(By.id("colorpicker1")).click();
 
         // Add RGB value
-        WebElement field = getDriver().findElement(
-                By.className("v-colorpicker-preview-textfield"));
+        WebElement field = getDriver()
+                .findElement(By.className("v-colorpicker-preview-textfield"));
 
         // Select all text
         field.sendKeys(Keys.chord(Keys.CONTROL, "a"));
@@ -91,8 +91,8 @@ public class ColorPickerInputFormatsTest extends MultiBrowserTest {
     }
 
     private String getColorpickerValue() {
-        WebElement field = getDriver().findElement(
-                By.className("v-colorpicker-preview-textfield"));
+        WebElement field = getDriver()
+                .findElement(By.className("v-colorpicker-preview-textfield"));
         return field.getAttribute("value");
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
index 78b7120b4e..e0b1974ff6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for default caption behavior in color picker.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DefaultCaptionWidthTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
index 4d40e455a6..64b0549e12 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
index 949fcdb882..29b58705e5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to check whether combobox is expanded when icon is clicked.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxClickIconTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
index 921c1b40e4..ace99cb926 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
index ebf6ba4773..187d6d40f4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
@@ -13,8 +13,8 @@ import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
 import com.vaadin.tests.tb3.newelements.ComboBoxElement;
 
-public class ComboBoxEmptyItemsKeyboardNavigationTest extends
-        SingleBrowserTestPhantomJS2 {
+public class ComboBoxEmptyItemsKeyboardNavigationTest
+        extends SingleBrowserTestPhantomJS2 {
 
     @Test
     public void navigatingUpOnAnEmptyMenuDoesntThrowErrors() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
index 709d3d9a60..08152d1b4b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.newelements.ComboBoxElement;
 
 /**
  * Test for identical item captions in ComboBox.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxIdenticalItemsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
index 1e6f7e4170..3216811caf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
index 66173db554..76758eecdd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,13 +35,13 @@ public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest {
         cBox.openPopup();
         int i = 0;
         while (i < 3) {
-            assertTrue("No item added on focus", cBox.getPopupSuggestions()
-                    .contains("Focus" + i++));
+            assertTrue("No item added on focus",
+                    cBox.getPopupSuggestions().contains("Focus" + i++));
             focusTarget.focus();
             ((TestBenchElement) cBox.findElement(By.vaadin("#textbox")))
                     .focus();
         }
-        assertTrue("No item added on focus", cBox.getPopupSuggestions()
-                .contains("Focus" + i));
+        assertTrue("No item added on focus",
+                cBox.getPopupSuggestions().contains("Focus" + i));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
index 20c460e342..8faedffedd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,8 +37,8 @@ public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest {
 
         comboBox.openPopup();
 
-        List<WebElement> boldItems = findElements(By
-                .className("v-filterselect-item-bold"));
+        List<WebElement> boldItems = findElements(
+                By.className("v-filterselect-item-bold"));
 
         Assert.assertEquals(1, boldItems.size());
         Assert.assertEquals("Item 5", boldItems.get(0).getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
index 407ab7aa04..f2dcdee4ef 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
@@ -21,8 +21,8 @@ public class ComboBoxLargeIconsTest extends MultiBrowserTest {
         NativeSelectElement iconSelect = $(NativeSelectElement.class).first();
         iconSelect.selectByText("16x16");
 
-        ComboBoxElement cb = $(ComboBoxElement.class).caption(
-                "Undefined wide select with 50 items").first();
+        ComboBoxElement cb = $(ComboBoxElement.class)
+                .caption("Undefined wide select with 50 items").first();
         cb.openPopup();
         compareScreen("icons-16x16-page1");
         cb.openNextPage();
@@ -39,18 +39,18 @@ public class ComboBoxLargeIconsTest extends MultiBrowserTest {
 
         iconSelect.selectByText("64x64");
 
-        ComboBoxElement pageLength0cb = $(ComboBoxElement.class).caption(
-                "Pagelength 0").first();
+        ComboBoxElement pageLength0cb = $(ComboBoxElement.class)
+                .caption("Pagelength 0").first();
         pageLength0cb.openPopup();
         pageLength0cb.findElement(By.vaadin("#popup/item1")).click();
 
-        ComboBoxElement cb200px = $(ComboBoxElement.class).caption(
-                "200px wide select with 50 items").first();
+        ComboBoxElement cb200px = $(ComboBoxElement.class)
+                .caption("200px wide select with 50 items").first();
         cb200px.openPopup();
         cb200px.findElement(By.vaadin("#popup/item1")).click();
 
-        ComboBoxElement cb150px = $(ComboBoxElement.class).caption(
-                "150px wide select with 5 items").first();
+        ComboBoxElement cb150px = $(ComboBoxElement.class)
+                .caption("150px wide select with 5 items").first();
         new Actions(driver).sendKeys(cb150px, Keys.DOWN).perform();
 
         compareScreen("icons-64x64-page1-highlight-first");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
index d3ba37682d..8d1e517f2f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
index cb4cd54559..a6677181d1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
@@ -42,7 +42,8 @@ public class ComboBoxNoTextInputTest extends MultiBrowserTest {
     }
 
     @Test
-    public void testComboBoxWithTextInputNoPopupOpensOnClick() throws Exception {
+    public void testComboBoxWithTextInputNoPopupOpensOnClick()
+            throws Exception {
         openTestURL();
 
         // click and check that no popup appears
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
index f48f2bbdeb..ce7dbd5a48 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * ComboBox suggestion popup should not obscure the text input box.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxOnSmallScreenTest extends MultiBrowserTest {
@@ -73,8 +73,8 @@ public class ComboBoxOnSmallScreenTest extends MultiBrowserTest {
         final int popupBottom = popupTop + popup.getSize().getHeight();
         final int rootHeight = findElement(By.tagName("body")).getSize().height;
 
-        assertThat("Popup overlay out of the screen", popupTop < 0
-                || popupBottom > rootHeight, is(false));
+        assertThat("Popup overlay out of the screen",
+                popupTop < 0 || popupBottom > rootHeight, is(false));
     }
 
     private Window getWindow() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
index 0b1568b9b1..c680d2790d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
index 0295f4ba41..f54244ee12 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,14 +37,14 @@ public class ComboBoxResetValueTest extends MultiBrowserTest {
 
         openTestURL();
 
-        comboBoxWithNullSelectionItemId = $(ComboBoxElement.class).id(
-                ComboBoxResetValue.WITH_SET_NULL_SELECTION_ITEM_ID);
+        comboBoxWithNullSelectionItemId = $(ComboBoxElement.class)
+                .id(ComboBoxResetValue.WITH_SET_NULL_SELECTION_ITEM_ID);
 
-        comboBoxWithoutNullSelectionItemId = $(ComboBoxElement.class).id(
-                ComboBoxResetValue.WITHOUT_NULL_SELECTION_ITEM_ID);
+        comboBoxWithoutNullSelectionItemId = $(ComboBoxElement.class)
+                .id(ComboBoxResetValue.WITHOUT_NULL_SELECTION_ITEM_ID);
 
-        comboBoxWithNullNotAllowed = $(ComboBoxElement.class).id(
-                ComboBoxResetValue.NULL_SELECTION_NOT_ALLOWED);
+        comboBoxWithNullNotAllowed = $(ComboBoxElement.class)
+                .id(ComboBoxResetValue.NULL_SELECTION_NOT_ALLOWED);
 
         clickResetButton();
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
index a95301acc7..12e0e4640a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
@@ -72,8 +72,8 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest {
     }
 
     private String getSelectedItemText() {
-        List<WebElement> items = driver.findElements(By
-                .className("gwt-MenuItem-selected"));
+        List<WebElement> items = driver
+                .findElements(By.className("gwt-MenuItem-selected"));
         return items.get(0).getText();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
index c0a67514bb..9d5d307e10 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
index ce8e614e10..489a60e9cc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,8 +39,8 @@ public class ComboBoxSetNullWhenNewItemsAllowedTest extends MultiBrowserTest {
         setDebug(true);
         openTestURL();
 
-        WebElement element = $(ComboBoxElement.class).first().findElement(
-                By.vaadin("#textbox"));
+        WebElement element = $(ComboBoxElement.class).first()
+                .findElement(By.vaadin("#textbox"));
         ((TestBenchElementCommands) element).click(8, 7);
         element.clear();
         element.sendKeys("New value");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
index e547e68fc1..f80cb1d63b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Verifies SlowComboBox filtering works when user inputs text. Also verifies
  * pagination works when the matching results number more than those that can be
  * displayed.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -60,15 +60,15 @@ public class ComboBoxSlowTest extends MultiBrowserTest {
         sleep(250);
         typeString("Item 12");
 
-        final WebElement popup = driver.findElement(By
-                .className("v-filterselect-suggestpopup"));
+        final WebElement popup = driver
+                .findElement(By.className("v-filterselect-suggestpopup"));
         List<WebElement> filteredItems = getFilteredItems(popup);
-        assertEquals("unexpected amount of suggestions found on first page",
-                10, filteredItems.size());
-        assertEquals("wrong filtering result", "Item 12", filteredItems.get(0)
-                .getText());
-        assertEquals("wrong filtering result", "Item 128", filteredItems.get(9)
-                .getText());
+        assertEquals("unexpected amount of suggestions found on first page", 10,
+                filteredItems.size());
+        assertEquals("wrong filtering result", "Item 12",
+                filteredItems.get(0).getText());
+        assertEquals("wrong filtering result", "Item 128",
+                filteredItems.get(9).getText());
 
         assertTrue(isPagingActive());
         goToNextPage();
@@ -89,20 +89,20 @@ public class ComboBoxSlowTest extends MultiBrowserTest {
         typeString("Item 100");
         assertFalse(isPagingActive());
 
-        WebElement popup = driver.findElement(By
-                .className("v-filterselect-suggestpopup"));
+        WebElement popup = driver
+                .findElement(By.className("v-filterselect-suggestpopup"));
         List<WebElement> filteredItems = getFilteredItems(popup);
         assertEquals("unexpected amount of suggestions found", 2,
                 filteredItems.size());
-        assertEquals("wrong filtering result", "Item 100", filteredItems.get(0)
-                .getText());
-        assertEquals("wrong filtering result", "Item 1000", filteredItems
-                .get(1).getText());
+        assertEquals("wrong filtering result", "Item 100",
+                filteredItems.get(0).getText());
+        assertEquals("wrong filtering result", "Item 1000",
+                filteredItems.get(1).getText());
     }
 
     private void clickComboBoxTextArea() {
-        WebElement cb = getDriver().findElement(
-                By.className("v-filterselect-input"));
+        WebElement cb = getDriver()
+                .findElement(By.className("v-filterselect-input"));
         cb.click();
     }
 
@@ -114,20 +114,20 @@ public class ComboBoxSlowTest extends MultiBrowserTest {
 
     private int getNumberOfSuggestions() {
 
-        List<WebElement> elements = getDriver().findElements(
-                By.className("gwt-MenuItem"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("gwt-MenuItem"));
         return elements.size();
     }
 
     private boolean isPagingActive() {
-        List<WebElement> elements = getDriver().findElements(
-                By.className("v-filterselect-nextpage"));
+        List<WebElement> elements = getDriver()
+                .findElements(By.className("v-filterselect-nextpage"));
         return elements.size() == 1;
     }
 
     private void goToNextPage() {
-        WebElement nextPage = getDriver().findElement(
-                By.className("v-filterselect-nextpage"));
+        WebElement nextPage = getDriver()
+                .findElement(By.className("v-filterselect-nextpage"));
         nextPage.click();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
index 7ed3268dd4..e6d42a6513 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,8 +56,8 @@ public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest {
 
     private List<String> getSuggestionsOnScreen() {
         List<WebElement> suggestionElements = getDriver()
-                .findElements(
-                        By.cssSelector(".v-filterselect-suggestpopup .gwt-MenuItem span"));
+                .findElements(By.cssSelector(
+                        ".v-filterselect-suggestpopup .gwt-MenuItem span"));
 
         List<String> suggestions = new ArrayList<String>();
         for (WebElement suggestion : suggestionElements) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
index 5e9e076cac..2a99945c98 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
@@ -40,8 +40,8 @@ public class ComboBoxSuggestionPopupCloseTest extends MultiBrowserTest {
 
         waitForElementVisible(By.className("v-filterselect"));
 
-        selectTextbox = $(ComboBoxElement.class).first().findElement(
-                By.vaadin("#textbox"));
+        selectTextbox = $(ComboBoxElement.class).first()
+                .findElement(By.vaadin("#textbox"));
         selectTextbox.click();
 
         // open popup and select first element
@@ -50,7 +50,8 @@ public class ComboBoxSuggestionPopupCloseTest extends MultiBrowserTest {
         // open popup and hit enter to close it
         sendKeys(new Keys[] { ARROW_DOWN, ENTER });
 
-        assertFalse(isElementPresent(By.className("v-filterselect-suggestmenu")));
+        assertFalse(
+                isElementPresent(By.className("v-filterselect-suggestmenu")));
 
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
index 2e5dcb380e..edc4ad489a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
@@ -27,8 +27,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * @author Vaadin Ltd
  */
-public class ComboBoxSuggestionPopupWidthPercentageTest extends
-        MultiBrowserTest {
+public class ComboBoxSuggestionPopupWidthPercentageTest
+        extends MultiBrowserTest {
 
     @Test
     public void suggestionPopupPersentageWidthTest() throws Exception {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
index 11e7629b2d..b2502a720c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
@@ -33,8 +33,7 @@ public class ComboBoxSuggestionPopupWidthTest extends MultiBrowserTest {
     public void suggestionPopupWidthTest() throws Exception {
         openTestURL();
 
-        waitForElementVisible(By
-                .className("width-as-percentage"));
+        waitForElementVisible(By.className("width-as-percentage"));
 
         WebElement selectTextbox = $(ComboBoxElement.class).first()
                 .findElement(By.vaadin("#textbox"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
index 318ffbe549..8fd2e06765 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests ComboBox inputs and selections.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboBoxValueInputTest extends MultiBrowserTest {
@@ -42,7 +42,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest {
         openTestURL();
     };
 
-    private void sendKeysToComboBox(ComboBoxElement comboBox, CharSequence keys) {
+    private void sendKeysToComboBox(ComboBoxElement comboBox,
+            CharSequence keys) {
         getComboBoxInput(comboBox).sendKeys(keys);
     }
 
@@ -77,7 +78,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest {
         assertThatComboBoxSuggestionsAreHidden(comboBox);
     }
 
-    private void assertThatComboBoxSuggestionsAreHidden(ComboBoxElement comboBox) {
+    private void assertThatComboBoxSuggestionsAreHidden(
+            ComboBoxElement comboBox) {
         assertThat(comboBox.isElementPresent(By.vaadin("#popup")), is(false));
     }
 
@@ -133,8 +135,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest {
 
         // selectByText doesn't work when filtering is off.
         comboBox.openPopup();
-        List<WebElement> filteredItems = findElements(By
-                .className("gwt-MenuItem"));
+        List<WebElement> filteredItems = findElements(
+                By.className("gwt-MenuItem"));
         filteredItems.get(1).click();
 
         sendKeysToComboBox(comboBox, "mnop");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
index 280328694c..9f7631ce77 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
 @SuppressWarnings("serial")
-public class ComboSelectedValueBeyondTheFirstDropdownPageTest extends
-        MultiBrowserTest {
+public class ComboSelectedValueBeyondTheFirstDropdownPageTest
+        extends MultiBrowserTest {
 
     @Test
     public void valueOnSecondPageIsSelected() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
index 5c8c971194..2b82acf505 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test that checks whether Combobox popup is closed on click to autoopen
  * menubar and its item.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboboxMenuBarAutoopenTest extends MultiBrowserTest {
@@ -46,8 +46,8 @@ public class ComboboxMenuBarAutoopenTest extends MultiBrowserTest {
         openPopup();
         menuBar = selectMenuBar();
 
-        WebElement menuBarItem = findElement(By
-                .className("v-menubar-menuitem-caption"));
+        WebElement menuBarItem = findElement(
+                By.className("v-menubar-menuitem-caption"));
         Actions actions = new Actions(getDriver());
         actions.moveToElement(menuBarItem).build().perform();
         menuBar.click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
index e88dd2eb85..ef3bcdf17a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test class for testing issue #13488 - changing pages with pagelength=0 breaks
  * the style.
- * 
+ *
  * @author Vaadin Ltd
  */
 
@@ -40,7 +40,8 @@ public class ComboboxPageLengthZeroScrollTest extends MultiBrowserTest {
     public void testComboboxPageLength() {
         openTestURL();
 
-        WebElement comboBox = vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox");
+        WebElement comboBox = vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox");
 
         // navigate to the next page. keyboard navigation is the preferred
         // method here since it's much easier to implement.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
index ec5bc088da..28fd9f4206 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -50,8 +50,8 @@ public class ComboboxPopupScrollingTest extends MultiBrowserTest {
             String caption = cb.getCaption();
             cb.openPopup();
             WebElement popup = cb.getSuggestionPopup();
-            WebElement scrollable = popup.findElement(By
-                    .className("v-filterselect-suggestmenu"));
+            WebElement scrollable = popup
+                    .findElement(By.className("v-filterselect-suggestmenu"));
             assertNoHorizontalScrollbar(scrollable, caption);
             assertNoVerticalScrollbar(scrollable, caption);
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
index 034319ac70..91da7a52d2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that changing a stylename will not cause the width parameter to be
  * removed from a combobox.
- * 
+ *
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
index 697d5eb932..bdcf92fd56 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
index d7f8e233ec..95c5a3c951 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
index a3f8f06976..27f3c86f3f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
index d47a100a93..e51dbad938 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
index 668d43f18f..90dc0dea92 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,13 +31,14 @@ public class CustomLayoutWithNullTemplateTest extends SingleBrowserTest {
     public void testChildComponents() {
         openTestURL();
 
-        ElementQuery<CustomLayoutElement> customLayout = $(CustomLayoutElement.class);
+        ElementQuery<CustomLayoutElement> customLayout = $(
+                CustomLayoutElement.class);
 
         // Verify the Button and Label are rendered inside the CustomLayout.
         assertTrue("Button was not rendered.",
                 customLayout.$(ButtonElement.class).exists());
-        assertTrue("Label was not rendered.", customLayout
-                .$(LabelElement.class).exists());
+        assertTrue("Label was not rendered.",
+                customLayout.$(LabelElement.class).exists());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
index 695d9cceff..981ae15efb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,13 +31,14 @@ public class CustomLayoutWithoutTemplateTest extends SingleBrowserTest {
     public void testChildComponents() {
         openTestURL();
 
-        ElementQuery<CustomLayoutElement> customLayout = $(CustomLayoutElement.class);
+        ElementQuery<CustomLayoutElement> customLayout = $(
+                CustomLayoutElement.class);
 
         // Verify the Button and Label are rendered inside the CustomLayout.
         assertTrue("Button was not rendered.",
                 customLayout.$(ButtonElement.class).exists());
-        assertTrue("Label was not rendered.", customLayout
-                .$(LabelElement.class).exists());
+        assertTrue("Label was not rendered.",
+                customLayout.$(LabelElement.class).exists());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
index d56e07f60b..20fdb5dfe3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
@@ -35,9 +35,11 @@ public class OverflowAutoFixTest extends MultiBrowserTest {
 
     private void assertElementCssValueEquals(String className,
             String propertyName, String expected) {
-        Assert.assertEquals(String.format(
-                "Unexpected value for property '%s' on element '%s',",
-                propertyName, className), expected,
+        Assert.assertEquals(
+                String.format(
+                        "Unexpected value for property '%s' on element '%s',",
+                        propertyName, className),
+                expected,
                 findElement(By.className(className)).getCssValue(propertyName));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java
index f37042396b..58a28747a7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,8 +29,9 @@ public class AriaDisabledTest extends MultiBrowserTest {
         openTestURL();
 
         // Expect aria-disabled="false" on the enabled DateField.
-        String ariaDisabled = driver.findElement(
-                By.vaadin("/VVerticalLayout[0]/VPopupCalendar[1]#popupButton"))
+        String ariaDisabled = driver
+                .findElement(By
+                        .vaadin("/VVerticalLayout[0]/VPopupCalendar[1]#popupButton"))
                 .getAttribute("aria-disabled");
         assertEquals("false", ariaDisabled);
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
index 98094515e8..d1d2cc868f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,9 @@ public class CustomDateFormatEEETest extends MultiBrowserTest {
     public void verifyDatePattern() {
         openTestURL();
 
-        String dateValue = driver.findElement(
-                By.className("v-datefield-textfield")).getAttribute("value");
+        String dateValue = driver
+                .findElement(By.className("v-datefield-textfield"))
+                .getAttribute("value");
         assertEquals("14/03/2014 Fri", dateValue);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
index e3c85224c0..9bcabdcf72 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -86,8 +86,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest {
     private void initialize() {
         openTestURL();
         WebElement dateField = driver.findElement(By.id(DATEFIELD_ID));
-        dateFieldButton = dateField.findElement(By
-                .className("v-datefield-button"));
+        dateFieldButton = dateField
+                .findElement(By.className("v-datefield-button"));
         textField = dateField
                 .findElement(By.className("v-datefield-textfield"));
         resolutionSecond = driver.findElement(By.id(BUTTON_BASE_ID + "second"));
@@ -111,7 +111,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest {
         } else {
             checkYearHeader();
         }
-        if (resolution.getCalendarField() >= Resolution.DAY.getCalendarField()) {
+        if (resolution.getCalendarField() >= Resolution.DAY
+                .getCalendarField()) {
             assertTrue(
                     "A calendar with the chosen resolution should have a body",
                     calendarHasBody());
@@ -150,37 +151,36 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest {
         if (buttonsExpected) {
             assertTrue(
                     "The calendar should have a button for switching to the previous month",
-                    isElementPresent(By
-                            .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth")));
+                    isElementPresent(By.cssSelector(
+                            ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth")));
             assertTrue(
                     "The calendar should have a button for switching to the next month",
-                    isElementPresent(By
-                            .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth")));
+                    isElementPresent(By.cssSelector(
+                            ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth")));
         } else {
             assertFalse(
                     "The calendar should not have a button for switching to the previous month",
-                    isElementPresent(By
-                            .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth")));
+                    isElementPresent(By.cssSelector(
+                            ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth")));
             assertFalse(
                     "The calendar should not have a button for switching to the next month",
-                    isElementPresent(By
-                            .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth")));
+                    isElementPresent(By.cssSelector(
+                            ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth")));
         }
     }
 
     private void checkHeaderForYear() {
         assertTrue(
                 "The calendar should have a button for switching to the previous year",
-                isElementPresent(By
-                        .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevyear .v-button-prevyear")));
-        assertTrue(
-                "The calendar header should show the selected year",
-                isElementPresent(By
-                        .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-month")));
+                isElementPresent(By.cssSelector(
+                        ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevyear .v-button-prevyear")));
+        assertTrue("The calendar header should show the selected year",
+                isElementPresent(By.cssSelector(
+                        ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-month")));
         assertTrue(
                 "The calendar should have a button for switching to the next year",
-                isElementPresent(By
-                        .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextyear .v-button-nextyear")));
+                isElementPresent(By.cssSelector(
+                        ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextyear .v-button-nextyear")));
 
     }
 
@@ -193,8 +193,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest {
     }
 
     private void closePopupDateField() {
-        WebElement element = driver.findElement(By
-                .cssSelector(".v-datefield-calendarpanel"));
+        WebElement element = driver
+                .findElement(By.cssSelector(".v-datefield-calendarpanel"));
         element.sendKeys(Keys.ESCAPE);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
index e6f7520813..8cee8fa0cf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class DateFieldCloseTest extends MultiBrowserTest {
     }
 
     private void checkForCalendarHeader(boolean headerShouldExist) {
-        boolean headerExists = isElementPresent(By
-                .className("v-datefield-calendarpanel-header"));
+        boolean headerExists = isElementPresent(
+                By.className("v-datefield-calendarpanel-header"));
         if (headerShouldExist) {
             assertTrue("The calendar should be visible", headerExists);
         } else {
@@ -50,14 +50,14 @@ public class DateFieldCloseTest extends MultiBrowserTest {
     }
 
     private void clickButton() {
-        WebElement dateFieldButton = dateField.findElement(By
-                .className("v-datefield-button"));
+        WebElement dateFieldButton = dateField
+                .findElement(By.className("v-datefield-button"));
         testBenchElement(dateFieldButton).click(5, 5);
     }
 
     private void closePopup() {
-        WebElement dateFieldButton = dateField.findElement(By
-                .className("v-datefield-button"));
+        WebElement dateFieldButton = dateField
+                .findElement(By.className("v-datefield-button"));
         // To work reliably with IE, need to click and hold instead of just
         // clicking the button.
         Actions actions = new Actions(driver);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
index 4ee9597f68..81b07e10a4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
@@ -25,8 +25,8 @@ public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest {
     }
 
     private void select2ndOfSeptember() {
-        for (WebElement e : findElements(By
-                .className("v-datefield-calendarpanel-day"))) {
+        for (WebElement e : findElements(
+                By.className("v-datefield-calendarpanel-day"))) {
             if (e.getText().equals("2")) {
                 e.click();
                 break;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDiscardValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDiscardValueTest.java
index 142730a9a3..a5bc66102f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDiscardValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDiscardValueTest.java
@@ -21,59 +21,63 @@ public class DateFieldDiscardValueTest extends SingleBrowserTest {
 
     @Test
     public void discardWhenDatasourceContentNonNullValidValue() {
-        discardWorks(DateFieldDiscardValue.PROP_NONULL, "1", "24/07/16", "25/07/16");
+        discardWorks(DateFieldDiscardValue.PROP_NONULL, "1", "24/07/16",
+                "25/07/16");
     }
 
     @Test
     public void discardWhenDatasourceContentNullInvalidValue() {
         discardWorks(DateFieldDiscardValue.PROP_NULL_VALUE, "2", "123", "");
     }
-    
+
     @Test
     public void discardWhenDatasourceContentNullValidValue() {
-        discardWorks(DateFieldDiscardValue.PROP_NULL_VALUE, "2", "24/07/16", "");
+        discardWorks(DateFieldDiscardValue.PROP_NULL_VALUE, "2", "24/07/16",
+                "");
     }
 
     @Test
     public void discardWhenDatasourceNull() {
-        //If the data source is null, discard should do nothing.
+        // If the data source is null, discard should do nothing.
         discardDoesntWork(DateFieldDiscardValue.PROP_NULL, "3", "123");
     }
 
-    private void discardWorks(String caption, String id, String dateValue, String resultValue) {
+    private void discardWorks(String caption, String id, String dateValue,
+            String resultValue) {
         openTestURL();
 
-        ButtonElement discardButton = $(ButtonElement.class).caption(
-                "Discard " + id).first();
-        DateFieldElement dateField = $(DateFieldElement.class).caption(
-                caption).first();
+        ButtonElement discardButton = $(ButtonElement.class)
+                .caption("Discard " + id).first();
+        DateFieldElement dateField = $(DateFieldElement.class).caption(caption)
+                .first();
         dateField.setValue(dateValue);
 
         discardButton.click();
 
         assertEquals(resultValue, dateField.getValue());
 
-        List<WebElement> elements = driver.findElements(By
-                .className("v-errorindicator"));
+        List<WebElement> elements = driver
+                .findElements(By.className("v-errorindicator"));
 
         assertEquals(0, elements.size());
     }
-    
-    private void discardDoesntWork(String caption, String id, String dateValue) {
+
+    private void discardDoesntWork(String caption, String id,
+            String dateValue) {
         openTestURL();
 
-        ButtonElement discardButton = $(ButtonElement.class).caption(
-                "Discard " + id).first();
-        DateFieldElement dateField = $(DateFieldElement.class).caption(
-                caption).first();
+        ButtonElement discardButton = $(ButtonElement.class)
+                .caption("Discard " + id).first();
+        DateFieldElement dateField = $(DateFieldElement.class).caption(caption)
+                .first();
         dateField.setValue(dateValue);
 
         discardButton.click();
 
         assertEquals(dateValue, dateField.getValue());
 
-        List<WebElement> elements = driver.findElements(By
-                .className("v-errorindicator"));
+        List<WebElement> elements = driver
+                .findElements(By.className("v-errorindicator"));
 
         assertEquals(1, elements.size());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
index 63d96e9bf9..9321b70ec4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class DateFieldFastForwardTest extends MultiBrowserTest {
     public void testFastForwardOnRightMouseClick() throws Exception {
         openTestURL();
         String firstMonth = getSelectedMonth();
-        WebElement nextMonthButton = driver.findElement(By
-                .className("v-button-nextmonth"));
+        WebElement nextMonthButton = driver
+                .findElement(By.className("v-button-nextmonth"));
 
         // Click and hold left mouse button to start fast forwarding.
         new Actions(driver).clickAndHold(nextMonthButton).perform();
@@ -63,8 +63,9 @@ public class DateFieldFastForwardTest extends MultiBrowserTest {
     }
 
     private String getSelectedMonth() {
-        return driver.findElement(
-                By.className("v-inline-datefield-calendarpanel-month"))
+        return driver
+                .findElement(
+                        By.className("v-inline-datefield-calendarpanel-month"))
                 .getText();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
index 3ba63d0f12..988a8d1af6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
@@ -36,8 +36,8 @@ public class DateFieldIsValidTest extends MultiBrowserTest {
 
         waitForElementVisible(By.id("Log"));
         waitForElementVisible(By.className("v-datefield"));
-        WebElement dateTextbox = $(DateFieldElement.class).first().findElement(
-                By.className("v-textfield"));
+        WebElement dateTextbox = $(DateFieldElement.class).first()
+                .findElement(By.className("v-textfield"));
         ButtonElement button = $(ButtonElement.class).first();
 
         dateTextbox.sendKeys("01/01/01", Keys.TAB);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
index 15f196a26b..7cc6ab9f80 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
index ca3d3a8748..6178bd78b6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
index 9fd6fe82e2..c0b01992d7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
@@ -30,8 +30,8 @@ public class DateFieldPopupClosingTest extends MultiBrowserTest {
     }
 
     private void assertThatPopupIsVisible() {
-        waitUntil(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-datefield-popup")));
+        waitUntil(ExpectedConditions
+                .visibilityOfElementLocated(By.className("v-datefield-popup")));
     }
 
     private void assertThatPopupIsInvisible() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
index f896519aae..e91661e5b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for date field popup calendar position.
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class DateFieldPopupPositionTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
index cfab13e205..07cd41bb46 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
@@ -13,8 +13,8 @@ import java.io.IOException;
 public class DateFieldReadOnlyTest extends MultiBrowserTest {
 
     @Test
-    public void readOnlyDateFieldPopupShouldNotOpen() throws IOException,
-            InterruptedException {
+    public void readOnlyDateFieldPopupShouldNotOpen()
+            throws IOException, InterruptedException {
         openTestURL();
 
         compareScreen("initial");
@@ -29,8 +29,8 @@ public class DateFieldReadOnlyTest extends MultiBrowserTest {
     }
 
     private void closePopup() {
-        findElement(By.className("v-datefield-calendarpanel")).sendKeys(
-                Keys.RETURN);
+        findElement(By.className("v-datefield-calendarpanel"))
+                .sendKeys(Keys.RETURN);
     }
 
     private void openPopup() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java
index 5f659d389b..e42f85df30 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
index 23f6d6f5a6..225338ce09 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,8 +24,8 @@ import com.vaadin.testbench.elements.DateFieldElement;
 import com.vaadin.testbench.elements.PopupDateFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 
-public class DateFieldWhenChangingValueAndEnablingParentTest extends
-        SingleBrowserTest {
+public class DateFieldWhenChangingValueAndEnablingParentTest
+        extends SingleBrowserTest {
 
     @Test
     public void ensureCorrectStateAfterEnabling() {
@@ -48,9 +48,8 @@ public class DateFieldWhenChangingValueAndEnablingParentTest extends
         assertState(
                 $(PopupDateFieldElement.class).id("DATEFIELD_DISABLED_ENABLED"),
                 false, false);
-        assertState(
-                $(PopupDateFieldElement.class)
-                        .id("DATEFIELD_DISABLED_DISABLED"), false, false);
+        assertState($(PopupDateFieldElement.class)
+                .id("DATEFIELD_DISABLED_DISABLED"), false, false);
 
     }
 
@@ -72,26 +71,32 @@ public class DateFieldWhenChangingValueAndEnablingParentTest extends
         boolean hasClass = hasCssClass(id, "v-disabled");
         boolean fieldEnabled = !hasClass;
         if (assertEnabled) {
-            Assert.assertTrue("Field " + id.getAttribute("id")
-                    + " should be enabled", fieldEnabled);
+            Assert.assertTrue(
+                    "Field " + id.getAttribute("id") + " should be enabled",
+                    fieldEnabled);
         } else {
-            Assert.assertFalse("Field " + id.getAttribute("id")
-                    + " should be disabled", fieldEnabled);
+            Assert.assertFalse(
+                    "Field " + id.getAttribute("id") + " should be disabled",
+                    fieldEnabled);
         }
 
     }
 
     private void assertTextInputEnabled(DateFieldElement id, boolean enabled) {
-        String disabledAttr = id.findElement(By.xpath("./input")).getAttribute(
-                "disabled");
+        String disabledAttr = id.findElement(By.xpath("./input"))
+                .getAttribute("disabled");
         boolean textinputEnabled = (disabledAttr == null);
 
         if (enabled) {
-            Assert.assertTrue("Field " + id.getAttribute("id")
-                    + " text field should be enabled", textinputEnabled);
+            Assert.assertTrue(
+                    "Field " + id.getAttribute("id")
+                            + " text field should be enabled",
+                    textinputEnabled);
         } else {
-            Assert.assertFalse("Field " + id.getAttribute("id")
-                    + " text field should be disabled", textinputEnabled);
+            Assert.assertFalse(
+                    "Field " + id.getAttribute("id")
+                            + " text field should be disabled",
+                    textinputEnabled);
         }
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
index 2352011585..dd603057a8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class DateRangeWithSqlDateTest extends MultiBrowserTest {
         openTestURL();
 
         // Get all cells of the inline datefield.
-        List<WebElement> cells = driver.findElements(By
-                .className("v-inline-datefield-calendarpanel-day"));
+        List<WebElement> cells = driver.findElements(
+                By.className("v-inline-datefield-calendarpanel-day"));
 
         // Verify the range is rendered correctly.
         assertCell(cells.get(0), "30", true);
@@ -42,7 +42,8 @@ public class DateRangeWithSqlDateTest extends MultiBrowserTest {
         assertCell(cells.get(3), "3", true);
     }
 
-    private void assertCell(WebElement cell, String text, boolean outsideRange) {
+    private void assertCell(WebElement cell, String text,
+            boolean outsideRange) {
         assertEquals(text, cell.getText());
         assertEquals(outsideRange,
                 cell.getAttribute("class").contains("outside-range"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
index 61cc876a3f..669819e393 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,13 +22,13 @@ import com.vaadin.testbench.elements.DateFieldElement;
 
 /**
  * Test for date field popup calendar position in default theme.
- * 
+ *
  * Test method is defined in super class.
- * 
+ *
  * @author Vaadin Ltd
  */
-public class DefaultDateFieldPopupPositionTest extends
-        DateFieldPopupPositionTest {
+public class DefaultDateFieldPopupPositionTest
+        extends DateFieldPopupPositionTest {
 
     @Override
     protected void checkPopupPosition() {
@@ -36,8 +36,10 @@ public class DefaultDateFieldPopupPositionTest extends
         int right = field.getLocation().getX() + field.getSize().getWidth();
         WebElement popup = getPopup();
 
-        Assert.assertTrue("Calendar popup has wrong X coordinate="
-                + popup.getLocation().getX() + " , right side of the field is "
-                + right, popup.getLocation().getX() >= right);
+        Assert.assertTrue(
+                "Calendar popup has wrong X coordinate="
+                        + popup.getLocation().getX()
+                        + " , right side of the field is " + right,
+                popup.getLocation().getX() >= right);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
index 4775441af2..5cd6cbb6e3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,8 +39,8 @@ public class DisabledDateFieldPopupTest extends MultiBrowserTest {
     public void testPopup() throws IOException {
         openTestURL();
 
-        WebElement button = driver.findElement(By
-                .className("v-datefield-button"));
+        WebElement button = driver
+                .findElement(By.className("v-datefield-button"));
         new Actions(driver).moveToElement(button).click()
                 .sendKeys(Keys.ARROW_DOWN).perform();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
index 2c50030461..dab7235306 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,8 +56,8 @@ public class DisabledInlineDateFieldTest extends MultiBrowserTest {
     private void testDaySelection(String cssClass) {
         // We know that the first day element is not selected, because of the
         // fixed date in the test.
-        WebElement nonSelectedDay = driver.findElement(By.cssSelector(cssClass
-                + " .v-inline-datefield-calendarpanel-day"));
+        WebElement nonSelectedDay = driver.findElement(By.cssSelector(
+                cssClass + " .v-inline-datefield-calendarpanel-day"));
 
         // Assert it is not selected before click.
         assertFalse(nonSelectedDay.getAttribute("class").contains("selected"));
@@ -70,8 +70,8 @@ public class DisabledInlineDateFieldTest extends MultiBrowserTest {
     }
 
     private String getSelectedMonth(String selectorPrefix) {
-        return driver.findElement(
-                By.cssSelector(selectorPrefix
+        return driver
+                .findElement(By.cssSelector(selectorPrefix
                         + " .v-inline-datefield-calendarpanel-month"))
                 .getText();
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
index 76486bf340..dc7bee2903 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DisabledParentLayoutTest extends MultiBrowserTest {
@@ -35,16 +35,16 @@ public class DisabledParentLayoutTest extends MultiBrowserTest {
         WebElement button = driver.findElement(By.className("v-button"));
         button.click();
 
-        WebElement textField = driver.findElement(By
-                .className("v-datefield-textfield"));
+        WebElement textField = driver
+                .findElement(By.className("v-datefield-textfield"));
         textField.click();
 
         Assert.assertFalse(
                 "Date input text field shoud be disabled for disabled DateField",
                 textField.isEnabled());
 
-        WebElement dataFieldButton = driver.findElement(By
-                .className("v-datefield-button"));
+        WebElement dataFieldButton = driver
+                .findElement(By.className("v-datefield-button"));
         dataFieldButton.click();
 
         Assert.assertFalse(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java
index 38e4b7e0b8..5a10a049f9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,8 +64,9 @@ public class LocaleChangeTest extends MultiBrowserTest {
         if (!BrowserUtil.isIE(getDesiredCapabilities())) {
             driver.findElement(By.className("v-datefield-button")).click();
         } else {
-            boolean popupOpen = driver.findElements(
-                    By.className("v-datefield-popup")).size() == 1;
+            boolean popupOpen = driver
+                    .findElements(By.className("v-datefield-popup"))
+                    .size() == 1;
             if (popupOpen) {
                 driver.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
index 1366d38705..d0c898a8c2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,8 +36,8 @@ public class PopupClosingWithEscTest extends MultiBrowserTest {
 
         // Send ESC to the select element to simulate user being
         // focused on the select while hitting the ESC key.
-        WebElement select = driver.findElement(By
-                .cssSelector(".v-datefield-popup select:first-child"));
+        WebElement select = driver.findElement(
+                By.cssSelector(".v-datefield-popup select:first-child"));
         select.sendKeys(Keys.ESCAPE);
         assertFalse(isPopupVisible());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
index 410b0edac6..73de10ee0d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,7 +36,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests contents and functionality of PopupDateField's popup.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
@@ -63,14 +63,11 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
 
         // verify contents
         WebElement popup = findElement(By.className("v-datefield-popup"));
-        assertEquals(
-                "unexpected month",
-                "tammikuu 2011",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        List<WebElement> headerElements = popup.findElement(
-                By.className("v-datefield-calendarpanel-weekdays"))
+        assertEquals("unexpected month", "tammikuu 2011", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        List<WebElement> headerElements = popup
+                .findElement(By.className("v-datefield-calendarpanel-weekdays"))
                 .findElements(By.tagName("td"));
         List<WebElement> weekdays = new ArrayList<WebElement>();
         for (WebElement headerElement : headerElements) {
@@ -79,28 +76,22 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
             }
         }
         assertEquals("unexpected weekday count", 7, weekdays.size());
-        assertEquals("unexpected first day of week", "MA", weekdays.get(0)
-                .getText());
-        assertEquals(
-                "unexpected weeknumber count",
-                0,
+        assertEquals("unexpected first day of week", "MA",
+                weekdays.get(0).getText());
+        assertEquals("unexpected weeknumber count", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-weeknumber"))
                         .size());
-        assertEquals(
-                "unexpected selection",
-                "1",
+        assertEquals("unexpected selection", "1",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .getText());
-        assertEquals(
-                "unexpected focus",
-                "1",
+        assertEquals("unexpected focus", "1",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
-        List<WebElement> days = popup.findElements(By
-                .className("v-datefield-calendarpanel-day"));
+        List<WebElement> days = popup
+                .findElements(By.className("v-datefield-calendarpanel-day"));
         assertEquals("unexpected day count", 42, days.size());
         assertEquals("unexpected day content", "27", days.get(0).getText());
         assertEquals("unexpected day content", "4", days.get(8).getText());
@@ -112,21 +103,14 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
                 .findElement(By.tagName("button")).click();
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "joulukuu 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        assertEquals(
-                "unexpected selection",
-                "1",
+        assertEquals("unexpected month", "joulukuu 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        assertEquals("unexpected selection", "1",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .getText());
-        assertEquals(
-                "unexpected focus",
-                0,
+        assertEquals("unexpected focus", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .size());
@@ -143,21 +127,14 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
                 .findElement(By.tagName("button")).click();
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "joulukuu 2009",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        assertEquals(
-                "unexpected selection",
-                0,
+        assertEquals("unexpected month", "joulukuu 2009", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        assertEquals("unexpected selection", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .size());
-        assertEquals(
-                "unexpected focus",
-                0,
+        assertEquals("unexpected focus", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .size());
@@ -193,14 +170,11 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
 
         // verify contents
         WebElement popup = findElement(By.className("v-datefield-popup"));
-        assertEquals(
-                "unexpected month",
-                "February 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        List<WebElement> headerElements = popup.findElement(
-                By.className("v-datefield-calendarpanel-weekdays"))
+        assertEquals("unexpected month", "February 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        List<WebElement> headerElements = popup
+                .findElement(By.className("v-datefield-calendarpanel-weekdays"))
                 .findElements(By.tagName("td"));
         List<WebElement> weekdays = new ArrayList<WebElement>();
         for (WebElement headerElement : headerElements) {
@@ -209,28 +183,22 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
             }
         }
         assertEquals("unexpected weekday count", 7, weekdays.size());
-        assertEquals("unexpected first day of week", "SUN", weekdays.get(0)
-                .getText());
-        assertEquals(
-                "unexpected weeknumber count",
-                0,
+        assertEquals("unexpected first day of week", "SUN",
+                weekdays.get(0).getText());
+        assertEquals("unexpected weeknumber count", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-weeknumber"))
                         .size());
-        assertEquals(
-                "unexpected selection",
-                "16",
+        assertEquals("unexpected selection", "16",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .getText());
-        assertEquals(
-                "unexpected focus",
-                "16",
+        assertEquals("unexpected focus", "16",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
-        List<WebElement> days = popup.findElements(By
-                .className("v-datefield-calendarpanel-day"));
+        List<WebElement> days = popup
+                .findElements(By.className("v-datefield-calendarpanel-day"));
         assertEquals("unexpected day count", 42, days.size());
         assertEquals("unexpected day content", "31", days.get(0).getText());
         assertEquals("unexpected day content", "8", days.get(8).getText());
@@ -238,14 +206,12 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         assertEquals("unexpected day content", "13", days.get(41).getText());
 
         // navigate down
-        WebElement popupBody = popup.findElement(By
-                .className("v-datefield-calendarpanel"));
+        WebElement popupBody = popup
+                .findElement(By.className("v-datefield-calendarpanel"));
         popupBody.sendKeys(Keys.ARROW_DOWN);
 
         // ensure the focus changed
-        assertEquals(
-                "unexpected focus",
-                "23",
+        assertEquals("unexpected focus", "23",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
@@ -254,21 +220,14 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         popupBody.sendKeys(Keys.ARROW_DOWN);
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "March 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        assertEquals(
-                "unexpected selection",
-                0,
+        assertEquals("unexpected month", "March 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        assertEquals("unexpected selection", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .size());
-        assertEquals(
-                "unexpected focus",
-                "2",
+        assertEquals("unexpected focus", "2",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
@@ -286,9 +245,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         popupBody.sendKeys(Keys.ARROW_LEFT);
 
         // ensure the focus changed
-        assertEquals(
-                "unexpected focus",
-                "1",
+        assertEquals("unexpected focus", "1",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
@@ -297,21 +254,14 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         popupBody.sendKeys(Keys.ARROW_LEFT);
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "February 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        assertEquals(
-                "unexpected selection",
-                "16",
+        assertEquals("unexpected month", "February 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        assertEquals("unexpected selection", "16",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .getText());
-        assertEquals(
-                "unexpected focus",
-                "28",
+        assertEquals("unexpected focus", "28",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
@@ -347,14 +297,11 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
 
         // verify contents
         WebElement popup = findElement(By.className("v-datefield-popup"));
-        assertEquals(
-                "unexpected month",
-                "helmikuu 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        List<WebElement> headerElements = popup.findElement(
-                By.className("v-datefield-calendarpanel-weekdays"))
+        assertEquals("unexpected month", "helmikuu 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        List<WebElement> headerElements = popup
+                .findElement(By.className("v-datefield-calendarpanel-weekdays"))
                 .findElements(By.tagName("td"));
         List<WebElement> weekdays = new ArrayList<WebElement>();
         for (WebElement headerElement : headerElements) {
@@ -363,29 +310,25 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
             }
         }
         assertEquals("unexpected weekday count", 7, weekdays.size());
-        assertEquals("unexpected first day of week", "MA", weekdays.get(0)
-                .getText());
-        List<WebElement> weeknumbers = popup.findElements(By
-                .className("v-datefield-calendarpanel-weeknumber"));
+        assertEquals("unexpected first day of week", "MA",
+                weekdays.get(0).getText());
+        List<WebElement> weeknumbers = popup.findElements(
+                By.className("v-datefield-calendarpanel-weeknumber"));
         assertEquals("unexpected weeknumber count", 6, weeknumbers.size());
-        assertEquals("unexpected weeknumber content", "5", weeknumbers.get(0)
-                .getText());
-        assertEquals("unexpected weeknumber content", "10", weeknumbers.get(5)
-                .getText());
-        assertEquals(
-                "unexpected selection",
-                "16",
+        assertEquals("unexpected weeknumber content", "5",
+                weeknumbers.get(0).getText());
+        assertEquals("unexpected weeknumber content", "10",
+                weeknumbers.get(5).getText());
+        assertEquals("unexpected selection", "16",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .getText());
-        assertEquals(
-                "unexpected focus",
-                "16",
+        assertEquals("unexpected focus", "16",
                 popup.findElement(
                         By.className("v-datefield-calendarpanel-day-focused"))
                         .getText());
-        List<WebElement> days = popup.findElements(By
-                .className("v-datefield-calendarpanel-day"));
+        List<WebElement> days = popup
+                .findElements(By.className("v-datefield-calendarpanel-day"));
         assertEquals("unexpected day count", 42, days.size());
         assertEquals("unexpected day content", "1", days.get(0).getText());
         assertEquals("unexpected day content", "9", days.get(8).getText());
@@ -393,8 +336,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         assertEquals("unexpected day content", "14", days.get(41).getText());
 
         // navigate to previous month
-        WebElement popupBody = popup.findElement(By
-                .className("v-datefield-calendarpanel"));
+        WebElement popupBody = popup
+                .findElement(By.className("v-datefield-calendarpanel"));
         new Actions(driver).keyDown(Keys.SHIFT).perform();
         popupBody.sendKeys(Keys.ARROW_LEFT);
         new Actions(driver).keyUp(Keys.SHIFT).perform();
@@ -408,22 +351,17 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         }
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "tammikuu 2010",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        weeknumbers = popup.findElements(By
-                .className("v-datefield-calendarpanel-weeknumber"));
+        assertEquals("unexpected month", "tammikuu 2010", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        weeknumbers = popup.findElements(
+                By.className("v-datefield-calendarpanel-weeknumber"));
         assertEquals("unexpected weeknumber count", 6, weeknumbers.size());
-        assertEquals("unexpected weeknumber content", "53", weeknumbers.get(0)
-                .getText());
-        assertEquals("unexpected weeknumber content", "5", weeknumbers.get(5)
-                .getText());
-        assertEquals(
-                "unexpected selection",
-                0,
+        assertEquals("unexpected weeknumber content", "53",
+                weeknumbers.get(0).getText());
+        assertEquals("unexpected weeknumber content", "5",
+                weeknumbers.get(5).getText());
+        assertEquals("unexpected selection", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .size());
@@ -431,11 +369,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         // button instead of navigating with arrow keys steals the focus
         if (!BrowserUtil.isIE(getDesiredCapabilities())
                 || BrowserUtil.isIE8(getDesiredCapabilities())) {
-            assertEquals(
-                    "unexpected focus",
-                    "16",
-                    popup.findElement(
-                            By.className("v-datefield-calendarpanel-day-focused"))
+            assertEquals("unexpected focus", "16",
+                    popup.findElement(By
+                            .className("v-datefield-calendarpanel-day-focused"))
                             .getText());
         }
         days = popup
@@ -456,33 +392,26 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
                 .findElement(By.tagName("button")).click();
 
         // verify contents
-        assertEquals(
-                "unexpected month",
-                "tammikuu 2009",
-                popup.findElements(
-                        By.className("v-datefield-calendarpanel-month")).get(1)
-                        .getText());
-        weeknumbers = popup.findElements(By
-                .className("v-datefield-calendarpanel-weeknumber"));
+        assertEquals("unexpected month", "tammikuu 2009", popup
+                .findElements(By.className("v-datefield-calendarpanel-month"))
+                .get(1).getText());
+        weeknumbers = popup.findElements(
+                By.className("v-datefield-calendarpanel-weeknumber"));
         assertEquals("unexpected weeknumber count", 6, weeknumbers.size());
-        assertEquals("unexpected weeknumber content", "1", weeknumbers.get(0)
-                .getText());
-        assertEquals("unexpected weeknumber content", "6", weeknumbers.get(5)
-                .getText());
-        assertEquals(
-                "unexpected selection",
-                0,
+        assertEquals("unexpected weeknumber content", "1",
+                weeknumbers.get(0).getText());
+        assertEquals("unexpected weeknumber content", "6",
+                weeknumbers.get(5).getText());
+        assertEquals("unexpected selection", 0,
                 popup.findElements(
                         By.className("v-datefield-calendarpanel-day-selected"))
                         .size());
         // TODO: remove this check once #14406 has been fixed -- clicking the
         // button instead of navigating with arrow keys steals the focus
         if (false) {
-            assertEquals(
-                    "unexpected focus",
-                    "16",
-                    popup.findElement(
-                            By.className("v-datefield-calendarpanel-day-focused"))
+            assertEquals("unexpected focus", "16",
+                    popup.findElement(By
+                            .className("v-datefield-calendarpanel-day-focused"))
                             .getText());
         }
         days = popup
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
index 4e5fa744c7..9f311f4a50 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that state change doesn't set input prompt back to PopupDateField if
  * focus is still in the input field.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupDateFieldInputPromptTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
index 8c5ba20ecc..5f82bab831 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
@@ -9,8 +9,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 public class PopupDateFieldStatesTest extends MultiBrowserTest {
 
     @Test
-    public void readOnlyDateFieldPopupShouldNotOpen() throws IOException,
-            InterruptedException {
+    public void readOnlyDateFieldPopupShouldNotOpen()
+            throws IOException, InterruptedException {
         openTestURL();
 
         compareScreen("dateFieldStates");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
index 95b8437b17..4a49339520 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,18 +64,18 @@ public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest {
     }
 
     public WebElement getHoursSelect() {
-        return findElement(By
-                .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select"));
+        return findElement(By.xpath(
+                "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select"));
     }
 
     public WebElement getMinutesSelect() {
-        return findElement(By
-                .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]"));
+        return findElement(By.xpath(
+                "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]"));
     }
 
     public WebElement getSecondsSelect() {
-        return findElement(By
-                .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]"));
+        return findElement(By.xpath(
+                "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]"));
     }
 
     public NativeSelectElement getResolutionSelect() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
index 4009b9d991..76b87db4d2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,9 +22,9 @@ import com.vaadin.testbench.elements.DateFieldElement;
 
 /**
  * Test for date field popup calendar position in Valo theme.
- * 
+ *
  * Test method is defined in super class.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ValoDateFieldPopupPositionTest extends DateFieldPopupPositionTest {
@@ -37,7 +37,9 @@ public class ValoDateFieldPopupPositionTest extends DateFieldPopupPositionTest {
         int popupRight = popup.getLocation().getX()
                 + popup.getSize().getWidth();
 
-        Assert.assertTrue("Calendar popup has wrong X coordinate=" + popupRight
-                + " , left side of the field is " + left, popupRight <= left);
+        Assert.assertTrue(
+                "Calendar popup has wrong X coordinate=" + popupRight
+                        + " , left side of the field is " + left,
+                popupRight <= left);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
index 7a2abe5efc..d0aa567e20 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.ui.DragAndDropWrapper;
 /**
  * Test for text area inside {@link DragAndDropWrapper}: text area should obtain
  * focus on click.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
index 9cb7a63046..4b0833137b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to check size of drag image element.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DragAndDropRelativeWidthTest extends MultiBrowserTest {
@@ -45,8 +45,8 @@ public class DragAndDropRelativeWidthTest extends MultiBrowserTest {
         actions.moveByOffset(100, 100);
         actions.build().perform();
 
-        WebElement dragImage = getDriver().findElement(
-                By.className("v-drag-element"));
+        WebElement dragImage = getDriver()
+                .findElement(By.className("v-drag-element"));
 
         Assert.assertEquals("Drag image element height is unexpected", height,
                 dragImage.getSize().getHeight());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
index c60eead918..349413f043 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for drag image of text area which should contain text-area text.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -37,15 +37,15 @@ public class DragAndDropTextAreaTest extends MultiBrowserTest {
     public void testTextAreaDndImage() {
         openTestURL();
 
-        WebElement wrapper = driver.findElement(By
-                .className("v-verticallayout"));
+        WebElement wrapper = driver
+                .findElement(By.className("v-verticallayout"));
         Actions actions = new Actions(driver);
         actions.clickAndHold(wrapper);
         actions.moveByOffset(50, 50);
         actions.perform();
 
-        WebElement dragElement = driver.findElement(By
-                .className("v-drag-element"));
+        WebElement dragElement = driver
+                .findElement(By.className("v-drag-element"));
         List<WebElement> children = dragElement.findElements(By.xpath(".//*"));
         boolean found = false;
         for (WebElement child : children) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
index 4e60b43ea2..d88172b9d9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,8 @@ public class DragStartModesTest extends MultiBrowserTest {
     @Test
     public void testDragStartModes() throws IOException {
         openTestURL();
-        WebElement dropTarget = vaadinElement("/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]");
+        WebElement dropTarget = vaadinElement(
+                "/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]");
         dragToTarget("COMPONENT", dropTarget);
         dragToTarget("WRAPPER", dropTarget);
         dragToTarget("COMPONENT_OTHER", dropTarget);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
index 23dcddd8d0..005551f9d2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -54,7 +54,7 @@ public class EmbeddedAltTextTest extends MultiBrowserTest {
     }
 
     private String getAltText(EmbeddedElement embedded) {
-        return embedded.findElement(By.vaadin("/domChild[0]")).getAttribute(
-                "alt");
+        return embedded.findElement(By.vaadin("/domChild[0]"))
+                .getAttribute("alt");
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
index 6bed0117f8..dcfadb0911 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,8 +25,8 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class EmbeddedClickListenerRelativeCoordinatesTest extends
-        MultiBrowserTest {
+public class EmbeddedClickListenerRelativeCoordinatesTest
+        extends MultiBrowserTest {
 
     @Before
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
index f892775ea3..9240dca56e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,7 +42,7 @@ import com.vaadin.ui.Image;
  * Tests that {@link Embedded} uses correct theme when the theme is set with
  * {@link #setTheme(String)}, and also updates correctly if theme is changed
  * later. {@link Image} is used as the baseline for correct behaviour.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class EmbeddedThemeResourceTest extends SingleBrowserTest {
@@ -51,8 +51,8 @@ public class EmbeddedThemeResourceTest extends SingleBrowserTest {
     public List<DesiredCapabilities> getBrowsersToTest() {
         // Seems like stylesheet onload is not fired on PhantomJS
         // https://github.com/ariya/phantomjs/issues/12332
-        return Collections.singletonList(Browser.FIREFOX
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.FIREFOX.getDesiredCapabilities());
     }
 
     @Before
@@ -104,8 +104,8 @@ public class EmbeddedThemeResourceTest extends SingleBrowserTest {
             }
         });
 
-        assertTrue("ThemeResource image source didn't update correctly.", image
-                .getAttribute("src").contains("/reindeer/"));
+        assertTrue("ThemeResource image source didn't update correctly.",
+                image.getAttribute("src").contains("/reindeer/"));
         assertThat(
                 "Embedded and Image aren't using the same source for the image despite sharing the ThemeResource.",
                 embedded.findElement(By.tagName("img")).getAttribute("src"),
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
index 64d70df88f..2a2a697832 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class FlashIsVisibleTest extends
-        com.vaadin.tests.components.flash.FlashIsVisibleTest {
+public class FlashIsVisibleTest
+        extends com.vaadin.tests.components.flash.FlashIsVisibleTest {
 
     @Override
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java
index cb71fef3ef..4c17edb805 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,9 +37,8 @@ public class FormTooltipsTest extends TooltipTest {
         checkTooltipNotPresent();
 
         // first name caption tooltip
-        checkTooltip(
-                $(FormElement.class).first().findElement(
-                        By.className("v-caption")), "Fields own tooltip");
+        checkTooltip($(FormElement.class).first()
+                .findElement(By.className("v-caption")), "Fields own tooltip");
 
         clearTooltip();
         checkTooltipNotPresent();
@@ -54,9 +53,8 @@ public class FormTooltipsTest extends TooltipTest {
         checkTooltip($(TextFieldElement.class).get(1), null);
 
         // last name caption should have no tooltip
-        checkTooltip(
-                $(FormElement.class).first()
-                        .findElements(By.className("v-caption")).get(1), null);
+        checkTooltip($(FormElement.class).first()
+                .findElements(By.className("v-caption")).get(1), null);
     }
 
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutClickListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutClickListenerTest.java
index d2e64c3f22..e057a6b471 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutClickListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutClickListenerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for form layout click listener.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FormLayoutClickListenerTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
index 89e7c9a06e..2c277f3efc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for H2 label inside FormLayout as first child of VerticalLayout.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FormLayoutInVerticalLayoutTest extends MultiBrowserTest {
@@ -37,8 +37,8 @@ public class FormLayoutInVerticalLayoutTest extends MultiBrowserTest {
 
         List<WebElement> labels = findElements(By.className("v-label-h2"));
         String formLabelMargin = labels.get(0).getCssValue("margin-top");
-        String verticalLayoutLabelMargin = labels.get(1).getCssValue(
-                "margin-top");
+        String verticalLayoutLabelMargin = labels.get(1)
+                .getCssValue("margin-top");
         Assert.assertNotEquals(
                 "'margin-top' values for header label in vertical layout "
                         + "and form layout are the same",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
index 3285503aeb..8af4b3930a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -58,8 +58,8 @@ public class FormLayoutResizingTest extends MultiBrowserThemeTest {
 
         int[] expandedWidths = getWidths(tables);
 
-        Assert.assertEquals("Table should have grown ",
-                originalWidths[0] + 200, expandedWidths[0]);
+        Assert.assertEquals("Table should have grown ", originalWidths[0] + 200,
+                expandedWidths[0]);
         Assert.assertEquals("Wrapped table should have grown ",
                 originalWidths[1] + 200, expandedWidths[1]);
 
@@ -79,8 +79,8 @@ public class FormLayoutResizingTest extends MultiBrowserThemeTest {
 
         expandedWidths = getWidths(tables);
 
-        Assert.assertEquals("Table should have grown ",
-                originalWidths[0] + 200, expandedWidths[0]);
+        Assert.assertEquals("Table should have grown ", originalWidths[0] + 200,
+                expandedWidths[0]);
         Assert.assertEquals("Wrapped table should have grown ",
                 originalWidths[1] + 200, expandedWidths[1]);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
index 95130e8a0c..922235f3fd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@ public class HtmlCaptionInFormLayoutTest extends SingleBrowserTest {
     public void testHtmlCaptions() {
         openTestURL();
 
-        List<WebElement> captions = getDriver().findElements(
-                By.cssSelector(".v-formlayout-captioncell span"));
+        List<WebElement> captions = getDriver()
+                .findElements(By.cssSelector(".v-formlayout-captioncell span"));
 
         Assert.assertEquals("Should be two formlayout captions", 2,
                 captions.size());
@@ -46,8 +46,8 @@ public class HtmlCaptionInFormLayoutTest extends SingleBrowserTest {
 
         $(ButtonElement.class).caption("Toggle").first().click();
 
-        List<WebElement> captions = getDriver().findElements(
-                By.cssSelector(".v-formlayout-captioncell span"));
+        List<WebElement> captions = getDriver()
+                .findElements(By.cssSelector(".v-formlayout-captioncell span"));
 
         Assert.assertEquals("Should be two formlayout captions", 2,
                 captions.size());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java
index c43dc0042e..f8cc95a5a4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for FormLayout style prefix: custom additional styles should be prefixed
  * with "v-formlayout-", not "v-layout-".
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StylePrefixTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
index cf3ff0c3ef..754059aa18 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -100,10 +100,10 @@ public abstract class AbstractGridColumnAutoWidthTest extends MultiBrowserTest {
         WebElement[] col = new WebElement[3];
         col[0] = getDriver().findElement(
                 By.xpath("//thead//th[" + (i + 1) + "]/div[1]/span"));
-        col[1] = getDriver().findElement(
-                By.xpath("//tbody//td[" + (i + 1) + "]//span"));
-        col[2] = getDriver().findElement(
-                By.xpath("//tbody//td[" + (i + 1) + "]"));
+        col[1] = getDriver()
+                .findElement(By.xpath("//tbody//td[" + (i + 1) + "]//span"));
+        col[2] = getDriver()
+                .findElement(By.xpath("//tbody//td[" + (i + 1) + "]"));
         return col;
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
index d5e01a9de8..6ea03e802c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,8 +33,8 @@ public class CustomRendererTest extends MultiBrowserTest {
         openTestURL();
 
         GridElement grid = findGrid();
-        assertEquals("1 :: 1 :: 2 :: 3 :: 5 :: 8 :: 13", grid.getCell(0, 0)
-                .getText());
+        assertEquals("1 :: 1 :: 2 :: 3 :: 5 :: 8 :: 13",
+                grid.getCell(0, 0).getText());
     }
 
     @Test
@@ -43,8 +43,8 @@ public class CustomRendererTest extends MultiBrowserTest {
 
         GridElement grid = findGrid();
         assertEquals("Click me!", grid.getCell(0, 1).getText());
-        assertEquals(CustomRenderer.INIT_DEBUG_LABEL_CAPTION, findDebugLabel()
-                .getText());
+        assertEquals(CustomRenderer.INIT_DEBUG_LABEL_CAPTION,
+                findDebugLabel().getText());
 
         grid.getCell(0, 1).click();
         assertEquals("row: 0, key: 1", grid.getCell(0, 1).getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
index 42327ebd80..d14f0e7a80 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
index 8c601db9aa..94244c1d41 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
index cccb306369..b9e782122a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,19 +41,19 @@ public class GridCellFocusOnResetSizeTest extends MultiBrowserTest {
         GridElement grid = $(MyGridElement.class).first();
         int rowIndex = 9;
         grid.getCell(rowIndex, 0).click();
-        assertTrue("Row was not focused after click.", grid.getRow(rowIndex)
-                .isFocused());
+        assertTrue("Row was not focused after click.",
+                grid.getRow(rowIndex).isFocused());
 
         // Clicking the button decreases size until it is down to 5 rows.
         while (rowIndex > 4) {
             findElement(By.tagName("button")).click();
-            assertTrue("Row focus was not moved when size decreased", grid
-                    .getRow(--rowIndex).isFocused());
+            assertTrue("Row focus was not moved when size decreased",
+                    grid.getRow(--rowIndex).isFocused());
         }
 
         // Next click increases size back to 10, this should not move focus.
         findElement(By.tagName("button")).click();
-        assertTrue("Row focus should not have moved when size increased", grid
-                .getRow(4).isFocused());
+        assertTrue("Row focus should not have moved when size increased",
+                grid.getRow(4).isFocused());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
index c430821534..7ac941ed1e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest {
 
         Assert.assertEquals("First item had wrong value", "true",
                 grid.getCell(0, 0).getText());
-        Assert.assertEquals("Second item had wrong value", "false", grid
-                .getCell(1, 0).getText());
+        Assert.assertEquals("Second item had wrong value", "false",
+                grid.getCell(1, 0).getText());
 
         // First edit false item and see that the CheckBox is unchecked
         grid.getCell(1, 0).doubleClick();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
index 02ca206b5e..2af9e7049f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
index 4139bb0c5f..a2077bb0e9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -42,7 +42,7 @@ import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers;
 
 /**
  * Tests Grid client side renderers
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -81,8 +81,8 @@ public class GridClientRenderers extends MultiBrowserTest {
         openTestURL();
 
         // Add widget renderer column
-        $(NativeSelectElement.class).first().selectByText(
-                Renderers.WIDGET_RENDERER.toString());
+        $(NativeSelectElement.class).first()
+                .selectByText(Renderers.WIDGET_RENDERER.toString());
         $(NativeButtonElement.class).caption("Add").first().click();
 
         // Click the button in cell 1,1
@@ -100,8 +100,8 @@ public class GridClientRenderers extends MultiBrowserTest {
         openTestURL();
 
         // Add widget renderer column
-        $(NativeSelectElement.class).first().selectByText(
-                Renderers.WIDGET_RENDERER.toString());
+        $(NativeSelectElement.class).first()
+                .selectByText(Renderers.WIDGET_RENDERER.toString());
         $(NativeButtonElement.class).caption("Add").first().click();
 
         // Detach and re-attach the Grid
@@ -131,8 +131,7 @@ public class GridClientRenderers extends MultiBrowserTest {
 
         TestBenchElement row = getGrid().getRow(51);
         String className = row.getAttribute("class");
-        assertFalse(
-                "Row should not yet contain style name v-grid-row-has-data",
+        assertFalse("Row should not yet contain style name v-grid-row-has-data",
                 className.contains("v-grid-row-has-data"));
 
         // Wait for data to arrive
@@ -171,7 +170,8 @@ public class GridClientRenderers extends MultiBrowserTest {
         // Test initial renderering with contentVisible = False
         TestBenchElement cell = getGrid().getCell(51, 1);
         String backgroundColor = cell.getCssValue("backgroundColor");
-        assertEquals("Background color was not red.", colorRed, backgroundColor);
+        assertEquals("Background color was not red.", colorRed,
+                backgroundColor);
 
         // data arrives...
         sleep((int) (latency * SLEEP_MULTIPLIER));
@@ -187,15 +187,15 @@ public class GridClientRenderers extends MultiBrowserTest {
         // Cell should be red (setContentVisible set cell red)
         cell = getGrid().getCell(55, 1);
         backgroundColor = cell.getCssValue("backgroundColor");
-        assertEquals("Background color was not red.", colorRed, backgroundColor);
+        assertEquals("Background color was not red.", colorRed,
+                backgroundColor);
 
         // data arrives...
         sleep((int) (latency * SLEEP_MULTIPLIER));
 
         // Cell should no longer be red
         backgroundColor = cell.getCssValue("backgroundColor");
-        assertTrue(
-                "Background color was not reset",
+        assertTrue("Background color was not reset",
                 backgroundColor.equals(colorWhite)
                         || backgroundColor.equals(colorDark));
     }
@@ -272,8 +272,8 @@ public class GridClientRenderers extends MultiBrowserTest {
         cell = getGrid().getCell(4, 1);
         cell.click();
         new Actions(getDriver()).moveToElement(cell).doubleClick().perform();
-        assertEquals("onActivate was not called on double click.",
-                "Activated!", cell.getText());
+        assertEquals("onActivate was not called on double click.", "Activated!",
+                cell.getText());
     }
 
     private GridElement getGrid() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
index d99272d506..9867cbd801 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -61,15 +61,15 @@ public class GridColspansTest extends MultiBrowserTest {
         openTestURL();
 
         GridElement grid = $(GridElement.class).first();
-        assertEquals("Failed initial condition.", "all the stuff", grid
-                .getHeaderCell(0, 1).getText().toLowerCase());
-        assertEquals("Failed initial condition.", "first name", grid
-                .getHeaderCell(2, 1).getText().toLowerCase());
+        assertEquals("Failed initial condition.", "all the stuff",
+                grid.getHeaderCell(0, 1).getText().toLowerCase());
+        assertEquals("Failed initial condition.", "first name",
+                grid.getHeaderCell(2, 1).getText().toLowerCase());
         $(ButtonElement.class).caption("Show/Hide firstName").first().click();
         assertEquals("Header text changed on column hide.", "all the stuff",
                 grid.getHeaderCell(0, 1).getText().toLowerCase());
-        assertEquals("Failed initial condition.", "last name", grid
-                .getHeaderCell(2, 1).getText().toLowerCase());
+        assertEquals("Failed initial condition.", "last name",
+                grid.getHeaderCell(2, 1).getText().toLowerCase());
     }
 
     @Test
@@ -78,10 +78,10 @@ public class GridColspansTest extends MultiBrowserTest {
 
         GridElement grid = $(GridElement.class).first();
         GridCellElement headerCell = grid.getHeaderCell(1, 1);
-        assertEquals("Failed initial condition.", "full name", headerCell
-                .getText().toLowerCase());
-        assertEquals("Failed initial condition.", "first name", grid
-                .getHeaderCell(2, 1).getText().toLowerCase());
+        assertEquals("Failed initial condition.", "full name",
+                headerCell.getText().toLowerCase());
+        assertEquals("Failed initial condition.", "first name",
+                grid.getHeaderCell(2, 1).getText().toLowerCase());
         $(ButtonElement.class).get(1).click();
         headerCell = grid.getHeaderCell(1, 1);
         assertEquals("Header text not changed on column reorder.", "address",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
index 64c56e174e..c5a8f7a0ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class GridColumnAutoExpandTest extends MultiBrowserTest {
         GridCellElement headerCell = $(GridElement.class).first()
                 .getHeaderCell(0, 1);
 
-        assertTrue("Column did not expand as expected", headerCell.getSize()
-                .getWidth() > 400);
+        assertTrue("Column did not expand as expected",
+                headerCell.getSize().getWidth() > 400);
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
index 999f72682e..a019cdb798 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.grid;
 import com.vaadin.testbench.parallel.TestCategory;
 
 @TestCategory("grid")
-public class GridColumnAutoWidthClientTest extends
-        AbstractGridColumnAutoWidthTest {
+public class GridColumnAutoWidthClientTest
+        extends AbstractGridColumnAutoWidthTest {
     @Override
     protected Class<?> getUIClass() {
         return GridColumnAutoWidthClient.class;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
index 3a4e2bfc72..e9cd18cabf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.grid;
 import com.vaadin.testbench.parallel.TestCategory;
 
 @TestCategory("grid")
-public class GridColumnAutoWidthServerTest extends
-        AbstractGridColumnAutoWidthTest {
+public class GridColumnAutoWidthServerTest
+        extends AbstractGridColumnAutoWidthTest {
     @Override
     protected Class<?> getUIClass() {
         return GridColumnAutoWidth.class;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
index 17bfcfc6c1..9a7f2dc962 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,8 +41,7 @@ public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
     public void columnWidthAfterSwap() {
         int column0Width = getColumnWidth(0);
         int column1Width = getColumnWidth(1);
-        Assert.assertTrue(
-                "Column 0 should be narrower than column 1 initially",
+        Assert.assertTrue("Column 0 should be narrower than column 1 initially",
                 column0Width < column1Width);
 
         $(ButtonElement.class).caption("Swap content").first().click();
@@ -59,8 +58,7 @@ public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
     public void columnWidthAfterSwapAndRecalculate() {
         int column0Width = getColumnWidth(0);
         int column1Width = getColumnWidth(1);
-        Assert.assertTrue(
-                "Column 0 should be narrower than column 1 initially",
+        Assert.assertTrue("Column 0 should be narrower than column 1 initially",
                 column0Width < column1Width);
 
         $(ButtonElement.class).caption("Swap content and recalculate columns")
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
index 3d88427ada..a3a665b91d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
index 976e1e78fe..c866af84e4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class GridCustomSelectionModelTest extends MultiBrowserTest {
         assertTrue("First column of Grid should not have an input element",
                 cell.findElements(By.className("input")).isEmpty());
 
-        assertFalse("Row should not be selected initially", grid.getRow(0)
-                .isSelected());
+        assertFalse("Row should not be selected initially",
+                grid.getRow(0).isSelected());
 
         cell.click(5, 5);
         assertTrue("Click should select row", grid.getRow(0).isSelected());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
index f7ea63e371..d7630301a4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,17 +34,17 @@ public class GridDataSourceResetTest extends SingleBrowserTest {
 
         assertTrue("First row was not selected", grid.getRow(0).isSelected());
         for (int i = 1; i < 10; ++i) {
-            assertFalse("Only first row should be selected", grid.getRow(i)
-                    .isSelected());
+            assertFalse("Only first row should be selected",
+                    grid.getRow(i).isSelected());
         }
 
         $(ButtonElement.class).first().click();
 
-        assertTrue("First row was not selected after remove", grid.getRow(0)
-                .isSelected());
+        assertTrue("First row was not selected after remove",
+                grid.getRow(0).isSelected());
         for (int i = 1; i < 9; ++i) {
-            assertFalse("Only first row should be selected after remove", grid
-                    .getRow(i).isSelected());
+            assertFalse("Only first row should be selected after remove",
+                    grid.getRow(i).isSelected());
         }
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
index df306ee1e6..d9aff44dbd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,13 +34,13 @@ public class GridDefaultSelectionModeTest extends MultiBrowserTest {
 
         $(ButtonElement.class).caption("Select on server").first().click();
 
-        assertTrue("Row should be selected.", $(GridElement.class).first()
-                .getRow(0).isSelected());
+        assertTrue("Row should be selected.",
+                $(GridElement.class).first().getRow(0).isSelected());
 
         $(ButtonElement.class).caption("Deselect on server").first().click();
 
-        assertFalse("Row should not be selected.", $(GridElement.class).first()
-                .getRow(0).isSelected());
+        assertFalse("Row should not be selected.",
+                $(GridElement.class).first().getRow(0).isSelected());
 
         assertNoErrorNotifications();
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
index 7406daeacd..feb9db7a93 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
index 6ea72540b5..04b4ab96f0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests the layouting of Grid's details row when it contains a HorizontalLayout
  * with expand ratios.
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
@@ -70,7 +70,8 @@ public class GridDetailsLayoutExpandTest extends MultiBrowserTest {
 
     private void assertLabelWidth(String id, double expectedWidth) {
         // 1px leeway for calculations
-        assertThat("Unexpected label width.", (double) $(LabelElement.class)
-                .id(id).getSize().width, closeTo(expectedWidth, 1d));
+        assertThat("Unexpected label width.",
+                (double) $(LabelElement.class).id(id).getSize().width,
+                closeTo(expectedWidth, 1d));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
index a395d7e721..bf8d0cf592 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -163,14 +163,15 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
             int visibleIndexOfSpacer) {
         waitForDetailsVisible();
         WebElement details = getDetailsElement(visibleIndexOfSpacer);
-        Assert.assertEquals("Wrong details row height", expectedHeight, details
-                .getSize().getHeight());
+        Assert.assertEquals("Wrong details row height", expectedHeight,
+                details.getSize().getHeight());
     }
 
     private void verifyDetailsDecoratorLocation(int row,
             int visibleIndexOfSpacer, int visibleIndexOfDeco) {
         WebElement detailsElement = getDetailsElement(visibleIndexOfSpacer);
-        WebElement detailsDecoElement = getDetailsDecoElement(visibleIndexOfDeco);
+        WebElement detailsDecoElement = getDetailsDecoElement(
+                visibleIndexOfDeco);
         GridRowElement rowElement = getGrid().getRow(row);
 
         int diff = 0;
@@ -180,8 +181,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
 
         Assert.assertEquals(
                 "Details deco top position does not match row top pos",
-                rowElement.getLocation().getY(), detailsDecoElement
-                        .getLocation().getY());
+                rowElement.getLocation().getY(),
+                detailsDecoElement.getLocation().getY());
         Assert.assertEquals(
                 "Details deco bottom position does not match details bottom pos",
                 detailsElement.getLocation().getY()
@@ -216,9 +217,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                         + bottomBoundary + " decoratorBotton:" + detailsBottom,
                 detailsBottom, bottomBoundary);
 
-        verifyDetailsRowHeight(param.getRowIndex(),
-                param.useGenerator() ? getDefinedHeight()
-                        : detailsDefaultHeight, 0);
+        verifyDetailsRowHeight(param.getRowIndex(), param.useGenerator()
+                ? getDefinedHeight() : detailsDefaultHeight, 0);
         verifyDetailsDecoratorLocation(param.getRowIndex(), 0, 0);
 
         Assert.assertFalse("Notification was present",
@@ -247,8 +247,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 try {
                     WebElement detailsElement = getDetailsElement();
                     return detailsElement.isDisplayed()
-                            && detailsElement.getSize().getHeight() > 3 ? detailsElement
-                            : null;
+                            && detailsElement.getSize().getHeight() > 3
+                                    ? detailsElement : null;
                 } catch (StaleElementReferenceException e) {
                     return null;
                 }
@@ -322,14 +322,14 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
     }
 
     private WebElement getVerticalScrollbar() {
-        WebElement scrollBar = getGrid().findElement(
-                By.className("v-grid-scroller-vertical"));
+        WebElement scrollBar = getGrid()
+                .findElement(By.className("v-grid-scroller-vertical"));
         return scrollBar;
     }
 
     private WebElement getHorizontalScrollbar() {
-        WebElement scrollBar = getGrid().findElement(
-                By.className("v-grid-scroller-horizontal"));
+        WebElement scrollBar = getGrid()
+                .findElement(By.className("v-grid-scroller-horizontal"));
         return scrollBar;
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
index 2def2d0279..272af6e569 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -83,9 +83,9 @@ public class GridDetailsWidthTest extends SingleBrowserTest {
         WebElement spacer = findElement(By.className("v-grid-spacer"));
         Assert.assertEquals("Grid was not sorted correctly", "Hello 0",
                 cell.getText());
-        Assert.assertEquals("Details row was not in correct location", cell
-                .getLocation().getY() + cell.getSize().getHeight(), spacer
-                .getLocation().getY());
+        Assert.assertEquals("Details row was not in correct location",
+                cell.getLocation().getY() + cell.getSize().getHeight(),
+                spacer.getLocation().getY());
 
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java
index 390b855c55..d3383cbf44 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java
@@ -70,11 +70,10 @@ public class GridDisabledMultiselectTest extends MultiBrowserTest {
         setMultiselect();
         disable();
 
-        WebElement firstCheckBoxSpan
-                = findElements(By.cssSelector("span")).get(1);
-        new Actions(driver).moveToElement(firstCheckBoxSpan, 1, 1)
-                           .click()
-                           .perform();
+        WebElement firstCheckBoxSpan = findElements(By.cssSelector("span"))
+                .get(1);
+        new Actions(driver).moveToElement(firstCheckBoxSpan, 1, 1).click()
+                .perform();
 
         assertThat(getFirstSelectCheckBox().isSelected(), is(false));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
index 0f207b68f2..5ecd1d4d88 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
@@ -29,10 +29,12 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest {
 
             @Override
             public Boolean apply(WebDriver input) {
-                return !findElement(By.className("v-grid-sidebar-button")).isEnabled();
+                return !findElement(By.className("v-grid-sidebar-button"))
+                        .isEnabled();
             }
         });
     }
+
     private void clickSideBarButton() {
         findElement(By.cssSelector(".v-grid-sidebar-button")).click();
     }
@@ -42,7 +44,8 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest {
     }
 
     private void assertSideBarContainsClass(String cssClass) {
-        assertThat(findElement(By.cssSelector(".v-grid-sidebar")).getAttribute("class"), containsString(cssClass));
+        assertThat(findElement(By.cssSelector(".v-grid-sidebar"))
+                .getAttribute("class"), containsString(cssClass));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
index f2e3a8e77e..5bfe1c1063 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,8 +42,8 @@ public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
 
         // Scroll grid to view
         GridElement grid = $(GridElement.class).first();
-        ((JavascriptExecutor) getDriver()).executeScript(
-                "arguments[0].scrollIntoView(true);", grid);
+        ((JavascriptExecutor) getDriver())
+                .executeScript("arguments[0].scrollIntoView(true);", grid);
 
         // Drag select 2 rows
         new Actions(getDriver()).moveToElement(grid.getCell(3, 0), 5, 5)
@@ -53,7 +53,9 @@ public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
         // Assert only those are selected.
         assertTrue("Row 3 should be selected", grid.getRow(3).isSelected());
         assertTrue("Row 2 should be selected", grid.getRow(2).isSelected());
-        assertFalse("Row 4 should not be selected", grid.getRow(4).isSelected());
-        assertFalse("Row 1 should not be selected", grid.getRow(1).isSelected());
+        assertFalse("Row 4 should not be selected",
+                grid.getRow(4).isSelected());
+        assertFalse("Row 1 should not be selected",
+                grid.getRow(1).isSelected());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
index 8a67d180c6..39068304de 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest {
 
         GridElement grid = $(GridElement.class).first();
         grid.getCell(1, 1).doubleClick();
-        assertEquals(grid.getEditor().getSize().width, grid.getTableWrapper()
-                .getSize().width);
+        assertEquals(grid.getEditor().getSize().width,
+                grid.getTableWrapper().getSize().width);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
index 468ea8da3a..7eeb0554c8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
index ae81eb9303..2acc554154 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
index 75d71a3c40..48516706bc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -71,8 +71,7 @@ public class GridEditorFrozenColumnsUITest extends MultiBrowserTest {
     }
 
     private WebElement getGridHorizontalScrollbar() {
-        return getDriver()
-                .findElement(
-                        By.xpath("//div[contains(@class, \"v-grid-scroller-horizontal\")]"));
+        return getDriver().findElement(By.xpath(
+                "//div[contains(@class, \"v-grid-scroller-horizontal\")]"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
index 9b53766d96..a2175ca37f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
@@ -40,18 +40,19 @@ public class GridEditorMultiselectTest extends MultiBrowserTest {
     private GridElement openEditor() {
         GridElement grid = $(GridElement.class).first();
         grid.getRow(0).doubleClick();
-        Assert.assertTrue("Grid editor should be displayed.", grid.getEditor()
-                .isDisplayed());
+        Assert.assertTrue("Grid editor should be displayed.",
+                grid.getEditor().isDisplayed());
         return grid;
     }
 
     private void assertCheckboxesEnabled(GridElement grid, boolean isEnabled) {
-        List<WebElement> checkboxes = grid.findElements(By
-                .xpath("//input[@type='checkbox']"));
+        List<WebElement> checkboxes = grid
+                .findElements(By.xpath("//input[@type='checkbox']"));
         for (WebElement checkbox : checkboxes) {
-            Assert.assertEquals("Select checkboxes should be "
-                    + (isEnabled ? "enabled" : "disabled"), isEnabled,
-                    checkbox.isEnabled());
+            Assert.assertEquals(
+                    "Select checkboxes should be "
+                            + (isEnabled ? "enabled" : "disabled"),
+                    isEnabled, checkbox.isEnabled());
         }
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
index 3f17d9a80c..8a07012f92 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
index a6a1231fa0..54a014dda1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
index d50879e65e..b84e04bea3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
     public void testMilesColumnExists() {
         openTestURL();
         GridElement grid = $(GridElement.class).first();
-        assertEquals("Miles header wasn't present.", "miles", grid
-                .getHeaderCell(0, 2).getText().toLowerCase());
+        assertEquals("Miles header wasn't present.", "miles",
+                grid.getHeaderCell(0, 2).getText().toLowerCase());
     }
 
     @Test
@@ -46,14 +46,14 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
         // Overwritten foo property should not be sortable
         GridCellElement fooHeader = grid.getHeaderCell(0, 0);
         fooHeader.click();
-        assertFalse("Column foo was unexpectedly sorted.", fooHeader
-                .getAttribute("class").contains("sort"));
+        assertFalse("Column foo was unexpectedly sorted.",
+                fooHeader.getAttribute("class").contains("sort"));
 
         // Generated property miles is not sortable
         GridCellElement milesHeader = grid.getHeaderCell(0, 2);
         milesHeader.click();
-        assertFalse("Column miles was unexpectedly sorted.", milesHeader
-                .getAttribute("class").contains("sort"));
+        assertFalse("Column miles was unexpectedly sorted.",
+                milesHeader.getAttribute("class").contains("sort"));
     }
 
     @Test
@@ -64,11 +64,11 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
         // Generated property baz is sortable
         GridCellElement bazHeader = grid.getHeaderCell(0, 3);
         bazHeader.click();
-        assertTrue("Column baz was not sorted ascending", bazHeader
-                .getAttribute("class").contains("sort-asc"));
+        assertTrue("Column baz was not sorted ascending",
+                bazHeader.getAttribute("class").contains("sort-asc"));
         bazHeader.click();
-        assertTrue("Column baz was not sorted descending", bazHeader
-                .getAttribute("class").contains("sort-desc"));
+        assertTrue("Column baz was not sorted descending",
+                bazHeader.getAttribute("class").contains("sort-desc"));
     }
 
     @Test
@@ -82,8 +82,8 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
 
         GridCellElement kmHeader = grid.getHeaderCell(0, 1);
         assertFalse("Column km was unexpectedly sorted",
-                kmHeader.getAttribute("class").contains("sort-asc")
-                        || kmHeader.getAttribute("class").contains("sort-desc"));
+                kmHeader.getAttribute("class").contains("sort-asc") || kmHeader
+                        .getAttribute("class").contains("sort-desc"));
         assertFalse("Unexpected client-side exception was visible",
                 isElementPresent(NotificationElement.class));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
index e8d3abf42d..8200984465 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -62,7 +62,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
         assertNoErrorNotifications();
     }
 
-    private TextFieldElement getHeaderElement(GridElement grid, int row, int col) {
+    private TextFieldElement getHeaderElement(GridElement grid, int row,
+            int col) {
         GridCellElement cell = grid.getHeaderCell(row, col);
         List<TextFieldElement> all = cell.$(TextFieldElement.class).all();
         if (all.size() == 0) {
@@ -71,8 +72,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
             return all.get(0);
         } else {
             throw new RuntimeException(
-                    "Multiple elements found in the header cell at " + row
-                            + "," + col);
+                    "Multiple elements found in the header cell at " + row + ","
+                            + col);
         }
     }
 
@@ -99,7 +100,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
         assertNoErrorNotifications();
     }
 
-    private TextFieldElement getFooterElement(GridElement grid, int row, int col) {
+    private TextFieldElement getFooterElement(GridElement grid, int row,
+            int col) {
         GridCellElement cell = grid.getFooterCell(row, col);
         List<TextFieldElement> all = cell.$(TextFieldElement.class).all();
         if (all.size() == 0) {
@@ -108,8 +110,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
             return all.get(0);
         } else {
             throw new RuntimeException(
-                    "Multiple elements found in the footer cell at " + row
-                            + "," + col);
+                    "Multiple elements found in the footer cell at " + row + ","
+                            + col);
         }
     }
 
@@ -121,18 +123,16 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
             // Remove Header
             $(GridElement.class).first().getHeaderCell(i, 0)
                     .$(ButtonElement.class).first().click();
-            assertFalse(
-                    "Header " + i + " should not be present.",
-                    $(GridElement.class).first().isElementPresent(
-                            By.vaadin("#header[" + i + "]")));
+            assertFalse("Header " + i + " should not be present.",
+                    $(GridElement.class).first()
+                            .isElementPresent(By.vaadin("#header[" + i + "]")));
 
             // Remove Footer
             $(GridElement.class).first().getFooterCell(i, 0)
                     .$(ButtonElement.class).first().click();
-            assertFalse(
-                    "Footer " + i + " should not be present.",
-                    $(GridElement.class).first().isElementPresent(
-                            By.vaadin("#footer[" + i + "]")));
+            assertFalse("Footer " + i + " should not be present.",
+                    $(GridElement.class).first()
+                            .isElementPresent(By.vaadin("#footer[" + i + "]")));
         }
 
         assertNoErrorNotifications();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
index 0e2a3d6ac6..aa7fe10dc0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,16 +34,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
 
         // Assert that we do not have the select all checkbox
         Assert.assertTrue(
-                "Found input in header even though none should exist.", grid
-                        .getHeader().findElements(By.tagName("input"))
-                        .isEmpty());
+                "Found input in header even though none should exist.",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
 
         // Set grid into multiselection mode
         toggleSelectionMode();
 
         // Assert that we now have a select all checkbox in the header
-        Assert.assertFalse("Expected one input field in header", grid
-                .getHeader().findElements(By.tagName("input")).isEmpty());
+        Assert.assertFalse("Expected one input field in header",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
 
         // Hide the firstName column from the grid.
         toggleFirstName();
@@ -57,9 +56,8 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
 
         // Assert that we still have the select all checkbox in the header.
         Assert.assertFalse(
-                "Header was missing checkbox after bringing back column", grid
-                        .getHeader().findElements(By.tagName("input"))
-                        .isEmpty());
+                "Header was missing checkbox after bringing back column",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
     }
 
     @Test
@@ -69,16 +67,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
 
         // Assert that we do not have the select all checkbox
         Assert.assertTrue(
-                "Found input in header even though none should exist.", grid
-                        .getHeader().findElements(By.tagName("input"))
-                        .isEmpty());
+                "Found input in header even though none should exist.",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
 
         // Set grid into multiselection mode
         toggleSelectionMode();
 
         // Assert that we now have a select all checkbox in the header
-        Assert.assertFalse("Expected one input field in header", grid
-                .getHeader().findElements(By.tagName("input")).isEmpty());
+        Assert.assertFalse("Expected one input field in header",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
 
         // Add Join columns header
         toggleJoin();
@@ -92,9 +89,8 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
 
         // Assert that we still have the select all checkbox in the header.
         Assert.assertFalse(
-                "Header was missing checkbox after bringing back column", grid
-                        .getHeader().findElements(By.tagName("input"))
-                        .isEmpty());
+                "Header was missing checkbox after bringing back column",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
     }
 
     @Test
@@ -104,16 +100,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
 
         // Assert that we do not have the select all checkbox
         Assert.assertTrue(
-                "Found input in header even though none should exist.", grid
-                        .getHeader().findElements(By.tagName("input"))
-                        .isEmpty());
+                "Found input in header even though none should exist.",
+                grid.getHeader().findElements(By.tagName("input")).isEmpty());
 
         // Set grid into multiselection mode
         toggleSelectionMode();
 
         // Assert that we now have a select all checkbox in the header
-        Assert.assertFalse("Should not be selected after adding", grid
-                .getHeader().findElement(By.tagName("input")).isSelected());
+        Assert.assertFalse("Should not be selected after adding",
+                grid.getHeader().findElement(By.tagName("input")).isSelected());
 
         grid.getHeader().findElement(By.tagName("input")).click();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
index 6dffe16a40..14f3016509 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -58,8 +58,8 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest {
 
     @Test
     public void cellStyleNamesCanBeAddedAndRemoved() {
-        ButtonElement toggleStyles = $(ButtonElement.class).caption(
-                "Toggle styles").first();
+        ButtonElement toggleStyles = $(ButtonElement.class)
+                .caption("Toggle styles").first();
 
         assertStylesSet(true);
         toggleStyles.click();
@@ -70,8 +70,8 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest {
 
     @Test
     public void rowStyleNamesCanBeAddedAndRemoved() {
-        ButtonElement toggleStyles = $(ButtonElement.class).caption(
-                "Toggle styles").first();
+        ButtonElement toggleStyles = $(ButtonElement.class)
+                .caption("Toggle styles").first();
 
         assertRowStylesSet(true);
         toggleStyles.click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
index 14ad0224d6..b332d2dbfc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2016 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that Grid gets correct height based on height mode, and resizes
  * properly with details row if height is undefined.
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
@@ -83,11 +83,11 @@ public class GridHeightTest extends MultiBrowserTest {
         } else {
             caption = (String) gridHeight;
         }
-        $(OptionGroupElement.class).id("gridHeightSelector").selectByText(
-                caption);
+        $(OptionGroupElement.class).id("gridHeightSelector")
+                .selectByText(caption);
         for (String gridWidth : GridHeight.gridWidths) {
-            $(OptionGroupElement.class).id("gridWidthSelector").selectByText(
-                    gridWidth);
+            $(OptionGroupElement.class).id("gridWidthSelector")
+                    .selectByText(gridWidth);
             for (String detailsRowHeight : GridHeight.detailsRowHeights) {
                 $(OptionGroupElement.class).id("detailsHeightSelector")
                         .selectByText(detailsRowHeight);
@@ -110,9 +110,8 @@ public class GridHeightTest extends MultiBrowserTest {
                 int openHeight = grid.getSize().getHeight();
                 try {
                     // check height with details row opened
-                    assertGridHeight(
-                            getExpectedOpenedHeight(gridHeight,
-                                    detailsRowHeight), openHeight);
+                    assertGridHeight(getExpectedOpenedHeight(gridHeight,
+                            detailsRowHeight), openHeight);
                 } catch (AssertionError e) {
                     errors.put(e, new Object[] { gridHeight, gridWidth,
                             detailsRowHeight, "opened" });
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
index f9f8d1309b..1cc04d4fc3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,8 +41,8 @@ public class GridInTabSheetTest extends MultiBrowserTest {
 
         for (int i = 0; i < 3; ++i) {
             addGridRow();
-            assertEquals("" + (100 + i), getGridElement().getCell(i, 1)
-                    .getText());
+            assertEquals("" + (100 + i),
+                    getGridElement().getCell(i, 1).getText());
         }
 
         assertNoNotification();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
index ae4914bf1c..3c30bdc2b0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,8 @@ public class GridInWindowResizeTest extends MultiBrowserTest {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         // Must test on a browser with animations
-        return Collections.singletonList(Browser.CHROME
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.CHROME.getDesiredCapabilities());
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
index 732cd4aa41..cd93e2c5ec 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,8 +53,8 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
     // TODO: as to the getX methods reuse ones from GridBasicFeaturesTest?
 
     protected WebElement getSidebarOpenButton(GridElement grid) {
-        List<WebElement> elements = grid.findElements(By
-                .className("v-grid-sidebar-button"));
+        List<WebElement> elements = grid
+                .findElements(By.className("v-grid-sidebar-button"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
@@ -62,10 +62,11 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
      * Returns the toggle inside the sidebar for hiding the column at the given
      * index, or null if not found.
      */
-    protected WebElement getColumnHidingToggle(GridElement grid, String caption) {
+    protected WebElement getColumnHidingToggle(GridElement grid,
+            String caption) {
         WebElement sidebar = getSidebar(grid);
-        List<WebElement> elements = sidebar.findElements(By
-                .className("column-hiding-toggle"));
+        List<WebElement> elements = sidebar
+                .findElements(By.className("column-hiding-toggle"));
         for (WebElement e : elements) {
             if (caption.equalsIgnoreCase(e.getText())) {
                 return e;
@@ -75,8 +76,8 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
     }
 
     protected WebElement getSidebar(GridElement grid) {
-        List<WebElement> elements = findElements(By
-                .className("v-grid-sidebar-popup"));
+        List<WebElement> elements = findElements(
+                By.className("v-grid-sidebar-popup"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
index dca1d71cb5..b50367bd72 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,12 +30,12 @@ public class GridItemSetChangeTest extends SingleBrowserTest {
         openTestURL();
 
         GridElement grid = $(GridElement.class).first();
-        assertEquals("Last name initially wrong", "Bar", grid.getCell(0, 1)
-                .getText());
+        assertEquals("Last name initially wrong", "Bar",
+                grid.getCell(0, 1).getText());
 
         $(ButtonElement.class).caption("Modify").first().click();
-        assertEquals("Last name was not updated", "Spam", grid.getCell(0, 1)
-                .getText());
+        assertEquals("Last name was not updated", "Spam",
+                grid.getCell(0, 1).getText());
 
         $(ButtonElement.class).caption("Reset").first().click();
         assertEquals("Last name was not updated on reset", "Baz",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
index 5fe2ff0cc3..833de4d8f0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that details row displays GridLayout contents properly.
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
@@ -58,7 +58,8 @@ public class GridLayoutDetailsRowTest extends MultiBrowserTest {
 
     private void assertLabelHeight(String id, double expectedHeight) {
         // 1px leeway for calculations
-        assertThat("Unexpected label height.", (double) $(LabelElement.class)
-                .id(id).getSize().height, closeTo(expectedHeight, 1d));
+        assertThat("Unexpected label height.",
+                (double) $(LabelElement.class).id(id).getSize().height,
+                closeTo(expectedHeight, 1d));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
index 1818baa4c9..3c9d70e35f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
index cf85f4eecd..937adc5fbf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,7 @@ public class GridMultiSelectionScrollBarTest extends MultiBrowserTest {
         setDebug(true);
         openTestURL();
 
-        assertTrue(
-                "Horizontal scrollbar should not be visible.",
+        assertTrue("Horizontal scrollbar should not be visible.",
                 $(GridElement.class).first().getHorizontalScroller()
                         .getAttribute("style").toLowerCase()
                         .contains("display: none;"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
index a8d7fb06be..5ddd0ce167 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
index cf20ac87b5..eebf15f34d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
index 52079c782c..650c85d894 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
index ab9b90856c..efb8944fd8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
index 1e1cab5577..faba380fab 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
@@ -13,8 +13,8 @@ import static org.junit.Assert.assertEquals;
 
 public class GridRowHeightChangeTest extends MultiBrowserTest {
 
-    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
     public void setup() throws Exception {
@@ -32,8 +32,8 @@ public class GridRowHeightChangeTest extends MultiBrowserTest {
 
             int gridHeight = grid.getSize().getHeight();
             int tabsheetHeight = findElements(
-                    By.className("v-tabsheet-content"))
-                    .get(0).getSize().getHeight();
+                    By.className("v-tabsheet-content")).get(0).getSize()
+                            .getHeight();
 
             assertEquals("Grid's visible height should be equal to Grid height",
                     gridHeight, tabsheetHeight, 1);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
index aee1db7a85..4481231c99 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
index 423a9f419b..7b0e33cc6c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
@@ -24,11 +24,14 @@ public class GridSelectAllCellTest extends MultiBrowserTest {
 
     @Test
     public void selectAllCellCanBeClicked() throws IOException {
-        GridElement.GridCellElement selectAllCell = $(GridElement.class).first().getHeaderCell(0, 0);
+        GridElement.GridCellElement selectAllCell = $(GridElement.class).first()
+                .getHeaderCell(0, 0);
 
-        new Actions(getDriver()).moveToElement(selectAllCell, 2, 2).click().perform();
+        new Actions(getDriver()).moveToElement(selectAllCell, 2, 2).click()
+                .perform();
 
-        WebElement selectAllCheckbox = selectAllCell.findElement(By.cssSelector("input"));
+        WebElement selectAllCheckbox = selectAllCell
+                .findElement(By.cssSelector("input"));
         assertThat(selectAllCheckbox.isSelected(), is(true));
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
index 88771b50ca..619cf4daeb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,21 +33,21 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
     @Test
     public void heightRestrictedToBrowserWindow() {
         openTestURL();
-        GridElement gridWithVeryManyColumns = $(GridElement.class).id(
-                GridSidebarPosition.POPUP_WINDOW_HEIGHT);
+        GridElement gridWithVeryManyColumns = $(GridElement.class)
+                .id(GridSidebarPosition.POPUP_WINDOW_HEIGHT);
         getSidebarOpenButton(gridWithVeryManyColumns).click();
         Dimension popupSize = getSidebarPopup().getSize();
         Dimension browserWindowSize = getDriver().manage().window().getSize();
 
-        Assert.assertTrue(popupSize.getHeight() <= browserWindowSize
-                .getHeight());
+        Assert.assertTrue(
+                popupSize.getHeight() <= browserWindowSize.getHeight());
     }
 
     @Test
     public void popupNotBelowBrowserWindow() {
         openTestURL();
-        GridElement gridAtBottom = $(GridElement.class).id(
-                GridSidebarPosition.POPUP_WINDOW_MOVED_UP);
+        GridElement gridAtBottom = $(GridElement.class)
+                .id(GridSidebarPosition.POPUP_WINDOW_MOVED_UP);
         getSidebarOpenButton(gridAtBottom).click();
         WebElement sidebarPopup = getSidebarPopup();
         Dimension popupSize = sidebarPopup.getSize();
@@ -61,8 +61,8 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
     @Test
     public void popupAbove() {
         openTestURL();
-        GridElement gridPopupAbove = $(GridElement.class).id(
-                GridSidebarPosition.POPUP_ABOVE);
+        GridElement gridPopupAbove = $(GridElement.class)
+                .id(GridSidebarPosition.POPUP_ABOVE);
         WebElement sidebarOpenButton = getSidebarOpenButton(gridPopupAbove);
         sidebarOpenButton.click();
         WebElement sidebarPopup = getSidebarPopup();
@@ -81,14 +81,14 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
     }
 
     protected WebElement getSidebarOpenButton(GridElement grid) {
-        List<WebElement> elements = grid.findElements(By
-                .className("v-grid-sidebar-button"));
+        List<WebElement> elements = grid
+                .findElements(By.className("v-grid-sidebar-button"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
     protected WebElement getSidebarPopup() {
-        List<WebElement> elements = findElements(By
-                .className("v-grid-sidebar-popup"));
+        List<WebElement> elements = findElements(
+                By.className("v-grid-sidebar-popup"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
index a3fbb00cf2..4fbc3a5d64 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class GridSingleColumnTest extends MultiBrowserTest {
         openTestURL();
 
         GridCellElement cell = $(GridElement.class).first().getHeaderCell(0, 0);
-        Assert.assertTrue("No header available", cell.getText()
-                .equalsIgnoreCase("header"));
+        Assert.assertTrue("No header available",
+                cell.getText().equalsIgnoreCase("header"));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
index 2874ec32a6..ae6a1d042d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
index f08ab7a8a4..7fff31f8f6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
@@ -92,7 +92,7 @@ public class GridSpacerDecoClipTest extends MultiBrowserTest {
 
     private TestBenchElement getSpacerDeco(int index) {
         SearchContext context = getContext();
-        return (TestBenchElement) context.findElements(
-                By.className(SPACER_CSS_CLASS_DECO)).get(index);
+        return (TestBenchElement) context
+                .findElements(By.className(SPACER_CSS_CLASS_DECO)).get(index);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
index 4368fda158..6e27fddde0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
index 5989ba607f..c72f885381 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
index 1e2b8f4335..fb6afa4ad4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
index 140e8a90d8..2d5ea0eaa2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
index 5098a0e7d8..1d1cdefc1c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,8 +56,8 @@ public class GridWidgetRendererChangeTest extends SingleBrowserTest {
 
     @Override
     protected WebElement getMenuElement(String menuCaption) {
-        return getDriver().findElement(
-                By.xpath("//td[text() = '" + menuCaption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//td[text() = '" + menuCaption + "']"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
index 6f39253fb0..4e124b8ed0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -63,8 +63,8 @@ public class GridWidthIncreaseTest extends MultiBrowserTest {
              * Selenium doesn't support subpixels correctly, we use a rough
              * estimation.
              */
-            assertEquals(grid.getRow(0).getSize().getWidth(), grid
-                    .getTableWrapper().getSize().getWidth(), accuracy);
+            assertEquals(grid.getRow(0).getSize().getWidth(),
+                    grid.getTableWrapper().getSize().getWidth(), accuracy);
         }
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
index 011c8c92ce..b4463c9a15 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
index 7917d0e279..11f6c88b4f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
index fc93e99188..cdf0c61a45 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class GridWithoutRendererTest extends SingleBrowserTest {
         // WebElement errorIndicator = findElement(By
         // .cssSelector("v-error-indicator"));
         // System.out.println(errorIndicator);
-        List<WebElement> errorIndicator = findElements(By
-                .xpath("//span[@class='v-errorindicator']"));
+        List<WebElement> errorIndicator = findElements(
+                By.xpath("//span[@class='v-errorindicator']"));
         Assert.assertTrue("There should not be an error indicator",
                 errorIndicator.isEmpty());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
index b4414a3f38..4c75231a87 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index 917245188a..803c3cedf1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -46,7 +46,7 @@ public class JavaScriptRenderersTest extends MultiBrowserTest {
 
         // Verify onbrowserevent
         cell_1_1.click();
-        Assert.assertTrue(cell_1_1.getText().startsWith(
-                "Clicked 1 with key 2 at"));
+        Assert.assertTrue(
+                cell_1_1.getText().startsWith("Clicked 1 with key 2 at"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
index 55f1238326..2d69dbb9dd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,7 +41,8 @@ public class NullHeadersTest extends SingleBrowserTest {
 
     private void assertRow(GridElement grid, int row, String... contents) {
         for (int col = 0; col < contents.length; col++) {
-            Assert.assertEquals(contents[col], grid.getCell(row, col).getText());
+            Assert.assertEquals(contents[col],
+                    grid.getCell(row, col).getText());
         }
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
index f100c03d4f..e6cddbd08e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
index efbc164e15..8643507137 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -47,8 +47,8 @@ public class ProgrammaticEditorControlTest extends SingleBrowserTest {
     }
 
     private void assertEditorFieldContents(GridElement grid, String text) {
-        TextFieldElement editorField = wrap(TextFieldElement.class, grid
-                .getEditor().getField(0));
+        TextFieldElement editorField = wrap(TextFieldElement.class,
+                grid.getEditor().getField(0));
         Assert.assertEquals(text, editorField.getValue());
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
index 1ba223d71c..17070a7348 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
index 32a896603b..c555a07ad0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
index 063d05b735..cf4e4b2b01 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * TB tests for the various builtin widget-based renderers.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -51,14 +51,14 @@ public class WidgetRenderersTest extends MultiBrowserTest {
 
     @Test
     public void testProgressBarRenderer() {
-        assertTrue(getGridCell(0, 0).isElementPresent(
-                By.className("v-progressbar")));
+        assertTrue(getGridCell(0, 0)
+                .isElementPresent(By.className("v-progressbar")));
     }
 
     @Test
     public void testButtonRenderer() {
-        WebElement button = getGridCell(0, 1).findElement(
-                By.className("v-nativebutton"));
+        WebElement button = getGridCell(0, 1)
+                .findElement(By.className("v-nativebutton"));
 
         button.click();
 
@@ -76,10 +76,10 @@ public class WidgetRenderersTest extends MultiBrowserTest {
         assertTrue("cell should be focused after focusing",
                 buttonCell.isFocused());
 
-        WebElement button = buttonCell.findElement(By
-                .className("v-nativebutton"));
-        assertNotEquals("Button should not be clicked before click",
-                "Clicked!", button.getText());
+        WebElement button = buttonCell
+                .findElement(By.className("v-nativebutton"));
+        assertNotEquals("Button should not be clicked before click", "Clicked!",
+                button.getText());
 
         new Actions(getDriver()).moveToElement(button).click().perform();
 
@@ -88,8 +88,8 @@ public class WidgetRenderersTest extends MultiBrowserTest {
 
     @Test
     public void testImageRenderer() {
-        final WebElement image = getGridCell(0, 2).findElement(
-                By.className("gwt-Image"));
+        final WebElement image = getGridCell(0, 2)
+                .findElement(By.className("gwt-Image"));
 
         waitUntilmageSrcEndsWith(image, "window/img/close.png");
 
@@ -110,9 +110,9 @@ public class WidgetRenderersTest extends MultiBrowserTest {
             @Override
             public String toString() {
                 // Timed out after 10 seconds waiting for ...
-                return String
-                        .format("image source to update. Supposed to end with '%s' (was: '%s').",
-                                expectedText, image.getAttribute("src"));
+                return String.format(
+                        "image source to update. Supposed to end with '%s' (was: '%s').",
+                        expectedText, image.getAttribute("src"));
             }
         });
     }
@@ -124,18 +124,18 @@ public class WidgetRenderersTest extends MultiBrowserTest {
         assertFalse("Notification was present",
                 isElementPresent(NotificationElement.class));
 
-        assertTrue(getGridCell(0, 0)
-                .isElementPresent(By.className("gwt-Image")));
-        assertTrue(getGridCell(0, 1).isElementPresent(
-                By.className("v-progressbar")));
-        assertTrue(getGridCell(0, 2).isElementPresent(
-                By.className("v-nativebutton")));
+        assertTrue(
+                getGridCell(0, 0).isElementPresent(By.className("gwt-Image")));
+        assertTrue(getGridCell(0, 1)
+                .isElementPresent(By.className("v-progressbar")));
+        assertTrue(getGridCell(0, 2)
+                .isElementPresent(By.className("v-nativebutton")));
     }
 
     @Test
     public void testPropertyIdInEvent() {
-        WebElement button = getGridCell(0, 3).findElement(
-                By.className("v-nativebutton"));
+        WebElement button = getGridCell(0, 3)
+                .findElement(By.className("v-nativebutton"));
 
         button.click();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
index 5367d32328..0bfb13a24c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,8 @@ import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 @TestCategory("grid")
-public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest {
+public abstract class EscalatorBasicClientFeaturesTest
+        extends MultiBrowserTest {
 
     private static final String LOGICAL_ROW_ATTRIBUTE_NAME = "vLogicalRow";
     private static final String SPACER_CSS_CLASS = "v-escalator-spacer";
@@ -217,8 +218,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest
 
     @Override
     protected WebElement getMenuElement(String menuCaption) {
-        return getDriver().findElement(
-                By.xpath("//td[text() = '" + menuCaption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//td[text() = '" + menuCaption + "']"));
     }
 
     protected void assertLogContains(String substring) {
@@ -261,8 +262,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest
     }
 
     private TestBenchElement getVerticalScrollbar() {
-        return (TestBenchElement) getEscalator().findElement(
-                By.className("v-escalator-scroller-vertical"));
+        return (TestBenchElement) getEscalator()
+                .findElement(By.className("v-escalator-scroller-vertical"));
     }
 
     protected void scrollHorizontallyTo(int px) {
@@ -275,8 +276,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest
     }
 
     protected TestBenchElement getHorizontalScrollbar() {
-        return (TestBenchElement) getEscalator().findElement(
-                By.className("v-escalator-scroller-horizontal"));
+        return (TestBenchElement) getEscalator()
+                .findElement(By.className("v-escalator-scroller-horizontal"));
     }
 
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
index 0a1b1735fa..912d0a77be 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,11 +25,12 @@ import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
 
 /**
  * GridBasicClientFeatures.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
-public abstract class GridBasicClientFeaturesTest extends GridBasicFeaturesTest {
+public abstract class GridBasicClientFeaturesTest
+        extends GridBasicFeaturesTest {
 
     private boolean composite = false;
 
@@ -59,17 +60,17 @@ public abstract class GridBasicClientFeaturesTest extends GridBasicFeaturesTest
 
     @Override
     protected WebElement getMenuElement(String menuCaption) {
-        return getDriver().findElement(
-                By.xpath("//td[text() = '" + menuCaption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//td[text() = '" + menuCaption + "']"));
     }
 
     @Override
     protected CustomGridElement getGridElement() {
         if (composite) {
             // Composite requires the basic client features widget for subparts
-            return ((TestBenchElement) findElement(By
-                    .vaadin("//TestWidgetComponent")))
-                    .wrap(CustomGridElement.class);
+            return ((TestBenchElement) findElement(
+                    By.vaadin("//TestWidgetComponent")))
+                            .wrap(CustomGridElement.class);
         } else {
             return super.getGridElement();
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
index 640c4a448b..0c95e24700 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -87,8 +87,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
     }
 
     protected WebElement getEditor() {
-        List<WebElement> elems = getGridElement().findElements(
-                By.className("v-grid-editor"));
+        List<WebElement> elems = getGridElement()
+                .findElements(By.className("v-grid-editor"));
 
         assertLessThanOrEqual("number of editors", elems.size(), 1);
 
@@ -108,15 +108,13 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
     }
 
     protected WebElement getGridVerticalScrollbar() {
-        return getDriver()
-                .findElement(
-                        By.xpath("//div[contains(@class, \"v-grid-scroller-vertical\")]"));
+        return getDriver().findElement(By.xpath(
+                "//div[contains(@class, \"v-grid-scroller-vertical\")]"));
     }
 
     protected WebElement getGridHorizontalScrollbar() {
-        return getDriver()
-                .findElement(
-                        By.xpath("//div[contains(@class, \"v-grid-scroller-horizontal\")]"));
+        return getDriver().findElement(By.xpath(
+                "//div[contains(@class, \"v-grid-scroller-horizontal\")]"));
     }
 
     /**
@@ -148,25 +146,25 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
 
     protected void assertColumnHeader(String expectedHeaderCaption,
             TestBenchElement testBenchElement) {
-        assertEquals(expectedHeaderCaption.toLowerCase(), testBenchElement
-                .getText().toLowerCase());
+        assertEquals(expectedHeaderCaption.toLowerCase(),
+                testBenchElement.getText().toLowerCase());
     }
 
     protected GridCellElement getDefaultColumnHeader(int index) {
-        List<GridCellElement> headerRowCells = getGridElement().getHeaderCells(
-                0);
+        List<GridCellElement> headerRowCells = getGridElement()
+                .getHeaderCells(0);
         return headerRowCells.get(index);
     }
 
     protected void dragAndDropDefaultColumnHeader(int draggedColumnHeaderIndex,
             int onTopOfColumnHeaderIndex, CellSide cellSide) {
-        GridCellElement columnHeader = getDefaultColumnHeader(onTopOfColumnHeaderIndex);
+        GridCellElement columnHeader = getDefaultColumnHeader(
+                onTopOfColumnHeaderIndex);
         new Actions(getDriver())
                 .clickAndHold(getDefaultColumnHeader(draggedColumnHeaderIndex))
-                .moveToElement(
-                        columnHeader,
-                        getHorizontalOffsetForDragAndDrop(columnHeader,
-                                cellSide), 0).release().perform();
+                .moveToElement(columnHeader, getHorizontalOffsetForDragAndDrop(
+                        columnHeader, cellSide), 0)
+                .release().perform();
     }
 
     private int getHorizontalOffsetForDragAndDrop(GridCellElement columnHeader,
@@ -185,13 +183,12 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
         GridCellElement headerCell = getGridElement().getHeaderCell(headerRow,
                 onTopOfColumnHeaderIndex);
         new Actions(getDriver())
-                .clickAndHold(
-                        getGridElement().getHeaderCell(headerRow,
-                                draggedColumnHeaderIndex))
-                .moveToElement(
-                        headerCell,
+                .clickAndHold(getGridElement().getHeaderCell(headerRow,
+                        draggedColumnHeaderIndex))
+                .moveToElement(headerCell,
                         getHorizontalOffsetForDragAndDrop(headerCell, cellSide),
-                        0).release().perform();
+                        0)
+                .release().perform();
     }
 
     protected void dragAndDropColumnHeader(int headerRow,
@@ -200,9 +197,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
         GridCellElement headerCell = getGridElement().getHeaderCell(headerRow,
                 onTopOfColumnHeaderIndex);
         new Actions(getDriver())
-                .clickAndHold(
-                        getGridElement().getHeaderCell(headerRow,
-                                draggedColumnHeaderIndex))
+                .clickAndHold(getGridElement().getHeaderCell(headerRow,
+                        draggedColumnHeaderIndex))
                 .moveToElement(headerCell, horizontalOffset, 0).release()
                 .perform();
     }
@@ -218,8 +214,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
     }
 
     protected WebElement getSidebarPopup() {
-        List<WebElement> elements = findElements(By
-                .className("v-grid-sidebar-popup"));
+        List<WebElement> elements = findElements(
+                By.className("v-grid-sidebar-popup"));
         if (elements.isEmpty()) {
             getSidebarOpenButton().click();
             elements = findElements(By.className("v-grid-sidebar-popup"));
@@ -228,14 +224,14 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
     }
 
     protected WebElement getSidebarPopupIfPresent() {
-        List<WebElement> elements = findElements(By
-                .className("v-grid-sidebar-popup"));
+        List<WebElement> elements = findElements(
+                By.className("v-grid-sidebar-popup"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
     protected WebElement getSidebarOpenButton() {
-        List<WebElement> elements = findElements(By
-                .className("v-grid-sidebar-button"));
+        List<WebElement> elements = findElements(
+                By.className("v-grid-sidebar-button"));
         return elements.isEmpty() ? null : elements.get(0);
     }
 
@@ -245,10 +241,11 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
      */
     protected WebElement getColumnHidingToggle(int columnIndex) {
         WebElement sidebar = getSidebarPopup();
-        List<WebElement> elements = sidebar.findElements(By
-                .className("column-hiding-toggle"));
+        List<WebElement> elements = sidebar
+                .findElements(By.className("column-hiding-toggle"));
         for (WebElement e : elements) {
-            if ((e.getText().toLowerCase()).startsWith("column " + columnIndex)) {
+            if ((e.getText().toLowerCase())
+                    .startsWith("column " + columnIndex)) {
                 return e;
             }
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
index c406f85c0c..577ce31cdf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -101,15 +101,16 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
     }
 
     private void assertCellPresent(String content) {
-        assertNotNull("A cell with content \"" + content
-                + "\" should've been found", findByXPath("//td[text()='"
-                + content + "']"));
+        assertNotNull(
+                "A cell with content \"" + content + "\" should've been found",
+                findByXPath("//td[text()='" + content + "']"));
     }
 
     private void assertCellNotPresent(String content) {
-        assertNull("A cell with content \"" + content
-                + "\" should've not been found", findByXPath("//td[text()='"
-                + content + "']"));
+        assertNull(
+                "A cell with content \"" + content
+                        + "\" should've not been found",
+                findByXPath("//td[text()='" + content + "']"));
     }
 
     private void scrollToTop() {
@@ -129,7 +130,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
     }
 
     private void scrollVerticallyTo(int px) {
-        executeScript("arguments[0].scrollTop = " + px, findVerticalScrollbar());
+        executeScript("arguments[0].scrollTop = " + px,
+                findVerticalScrollbar());
     }
 
     private Object executeScript(String script, Object args) {
@@ -145,9 +147,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
     }
 
     private WebElement findVerticalScrollbar() {
-        return getDriver().findElement(
-                By.xpath("//div[contains(@class, "
-                        + "\"v-grid-scroller-vertical\")]"));
+        return getDriver().findElement(By.xpath(
+                "//div[contains(@class, " + "\"v-grid-scroller-vertical\")]"));
     }
 
     @Override
@@ -158,8 +159,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest {
 
     @Override
     protected WebElement getMenuElement(String menuCaption) {
-        return getDriver().findElement(
-                By.xpath("//td[text() = '" + menuCaption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//td[text() = '" + menuCaption + "']"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
index 86686225d0..7aec919080 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
@@ -13,7 +13,8 @@ public class GridClientHeightByRowOnInitTest extends MultiBrowserTest {
     public void gridHeightIsMoreThanACoupleOfRows() {
         openTestURL();
         int height = findElement(By.className("v-grid")).getSize().getHeight();
-        assertGreater("Grid should be much taller than 150px (was " + height
-                + "px)", height, 150);
+        assertGreater(
+                "Grid should be much taller than 150px (was " + height + "px)",
+                height, 150);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
index 02e94ec6c4..5dbf269d6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -113,12 +113,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
 
         WebElement webElement = findElement(By.id("columnvisibility"));
         int counter = Integer.parseInt(webElement.getAttribute("counter"));
-        int columnIndex = Integer.parseInt(webElement
-                .getAttribute("columnindex"));
-        boolean userOriginated = Boolean.parseBoolean(webElement
-                .getAttribute("useroriginated"));
-        boolean hidden = Boolean.parseBoolean(webElement
-                .getAttribute("ishidden"));
+        int columnIndex = Integer
+                .parseInt(webElement.getAttribute("columnindex"));
+        boolean userOriginated = Boolean
+                .parseBoolean(webElement.getAttribute("useroriginated"));
+        boolean hidden = Boolean
+                .parseBoolean(webElement.getAttribute("ishidden"));
 
         assertNotNull("no event fired", webElement);
         assertEquals(1, counter);
@@ -132,8 +132,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         webElement = findElement(By.id("columnvisibility"));
         counter = Integer.parseInt(webElement.getAttribute("counter"));
         columnIndex = Integer.parseInt(webElement.getAttribute("columnIndex"));
-        userOriginated = Boolean.parseBoolean(webElement
-                .getAttribute("userOriginated"));
+        userOriginated = Boolean
+                .parseBoolean(webElement.getAttribute("userOriginated"));
         hidden = Boolean.parseBoolean(webElement.getAttribute("ishidden"));
 
         assertNotNull("no event fired", webElement);
@@ -156,12 +156,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
 
         WebElement webElement = findElement(By.id("columnvisibility"));
         int counter = Integer.parseInt(webElement.getAttribute("counter"));
-        int columnIndex = Integer.parseInt(webElement
-                .getAttribute("columnindex"));
-        boolean userOriginated = Boolean.parseBoolean(webElement
-                .getAttribute("useroriginated"));
-        boolean hidden = Boolean.parseBoolean(webElement
-                .getAttribute("ishidden"));
+        int columnIndex = Integer
+                .parseInt(webElement.getAttribute("columnindex"));
+        boolean userOriginated = Boolean
+                .parseBoolean(webElement.getAttribute("useroriginated"));
+        boolean hidden = Boolean
+                .parseBoolean(webElement.getAttribute("ishidden"));
 
         assertNotNull("no event fired", webElement);
         assertEquals(1, counter);
@@ -175,8 +175,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         webElement = findElement(By.id("columnvisibility"));
         counter = Integer.parseInt(webElement.getAttribute("counter"));
         columnIndex = Integer.parseInt(webElement.getAttribute("columnIndex"));
-        userOriginated = Boolean.parseBoolean(webElement
-                .getAttribute("userOriginated"));
+        userOriginated = Boolean
+                .parseBoolean(webElement.getAttribute("userOriginated"));
         hidden = Boolean.parseBoolean(webElement.getAttribute("ishidden"));
 
         assertNotNull("no event fired", webElement);
@@ -827,20 +827,20 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "Row details", "Toggle details for...",
                 "Row 1");
         assertColumnHeaderOrder(0, 1, 2, 3, 4);
-        Assert.assertNotNull("Details not found", getGridElement()
-                .getDetails(1));
+        Assert.assertNotNull("Details not found",
+                getGridElement().getDetails(1));
 
         toggleHideColumnAPI(0);
 
         assertColumnHeaderOrder(1, 2, 3, 4);
-        Assert.assertNotNull("Details not found", getGridElement()
-                .getDetails(1));
+        Assert.assertNotNull("Details not found",
+                getGridElement().getDetails(1));
 
         toggleHideColumnAPI(0);
 
         assertColumnHeaderOrder(0, 1, 2, 3, 4);
-        Assert.assertNotNull("Details not found", getGridElement()
-                .getDetails(1));
+        Assert.assertNotNull("Details not found",
+                getGridElement().getDetails(1));
     }
 
     @Test
@@ -884,17 +884,17 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         toggleHideColumnAPI(1);
 
         getGridElement().scrollToRow(500);
-        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
-                .getText());
-        Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 1)
-                .getText());
+        Assert.assertEquals("(500, 0)",
+                getGridElement().getCell(500, 0).getText());
+        Assert.assertEquals("(500, 2)",
+                getGridElement().getCell(500, 1).getText());
 
         toggleHideColumnAPI(1);
 
-        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
-                .getText());
-        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
-                .getText());
+        Assert.assertEquals("(500, 0)",
+                getGridElement().getCell(500, 0).getText());
+        Assert.assertEquals("(500, 1)",
+                getGridElement().getCell(500, 1).getText());
     }
 
     @Test
@@ -902,26 +902,26 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         toggleHidableColumnAPI(0);
         toggleHidableColumnAPI(1);
 
-        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
-                .getText());
-        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
-                .getText());
+        Assert.assertEquals("(500, 0)",
+                getGridElement().getCell(500, 0).getText());
+        Assert.assertEquals("(500, 1)",
+                getGridElement().getCell(500, 1).getText());
 
         toggleHideColumnAPI(0);
         toggleHideColumnAPI(1);
 
-        Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 0)
-                .getText());
-        Assert.assertEquals("(500, 3)", getGridElement().getCell(500, 1)
-                .getText());
+        Assert.assertEquals("(500, 2)",
+                getGridElement().getCell(500, 0).getText());
+        Assert.assertEquals("(500, 3)",
+                getGridElement().getCell(500, 1).getText());
 
         toggleHideColumnAPI(0);
         toggleHideColumnAPI(1);
 
-        Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0)
-                .getText());
-        Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1)
-                .getText());
+        Assert.assertEquals("(500, 0)",
+                getGridElement().getCell(500, 0).getText());
+        Assert.assertEquals("(500, 1)",
+                getGridElement().getCell(500, 1).getText());
     }
 
     private void loadSpannedCellsFixture() {
@@ -955,20 +955,22 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
     }
 
     private void toggleFrozenColumns(int count) {
-        selectMenuPath("Component", "State", "Frozen column count", count
-                + " columns");
+        selectMenuPath("Component", "State", "Frozen column count",
+                count + " columns");
     }
 
     private void verifyHeaderCellColspan(int row, int column, int colspan) {
         try {
-            assertEquals(Integer.valueOf(colspan), Integer.valueOf(Integer
-                    .parseInt(getGridElement().getHeaderCell(row, column)
-                            .getAttribute("colspan"))));
+            assertEquals(Integer.valueOf(colspan),
+                    Integer.valueOf(Integer.parseInt(
+                            getGridElement().getHeaderCell(row, column)
+                                    .getAttribute("colspan"))));
         } catch (NumberFormatException nfe) {
             // IE8 has colSpan
-            assertEquals(Integer.valueOf(colspan), Integer.valueOf(Integer
-                    .parseInt(getGridElement().getHeaderCell(row, column)
-                            .getAttribute("colSpan"))));
+            assertEquals(Integer.valueOf(colspan),
+                    Integer.valueOf(Integer.parseInt(
+                            getGridElement().getHeaderCell(row, column)
+                                    .getAttribute("colSpan"))));
         }
     }
 
@@ -983,8 +985,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
     }
 
     private void verifyHeaderCellContent(int row, int column, String content) {
-        GridCellElement headerCell = getGridElement()
-                .getHeaderCell(row, column);
+        GridCellElement headerCell = getGridElement().getHeaderCell(row,
+                column);
         assertEquals(content.toLowerCase(), headerCell.getText().toLowerCase());
         assertTrue(headerCell.isDisplayed());
     }
@@ -999,12 +1001,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
 
     private void verifyColumnHidingTogglesOrder(int... indices) {
         WebElement sidebar = getSidebarPopup();
-        List<WebElement> elements = sidebar.findElements(By
-                .className("column-hiding-toggle"));
+        List<WebElement> elements = sidebar
+                .findElements(By.className("column-hiding-toggle"));
         for (int i = 0; i < indices.length; i++) {
             WebElement e = elements.get(i);
-            assertTrue(("Header (0," + indices[i] + ")").equalsIgnoreCase(e
-                    .getText()));
+            assertTrue(("Header (0," + indices[i] + ")")
+                    .equalsIgnoreCase(e.getText()));
         }
     }
 
@@ -1041,8 +1043,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
     @Override
     protected WebElement getColumnHidingToggle(int columnIndex) {
         WebElement sidebar = getSidebarPopup();
-        List<WebElement> elements = sidebar.findElements(By
-                .className("column-hiding-toggle"));
+        List<WebElement> elements = sidebar
+                .findElements(By.className("column-hiding-toggle"));
         for (WebElement e : elements) {
             if (("Header (0," + columnIndex + ")")
                     .equalsIgnoreCase(e.getText())) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
index d779a5c81a..967fd34273 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
@@ -43,10 +43,10 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
     public void columnReorderEventTriggered() {
         final int firstIndex = 3;
         final int secondIndex = 4;
-        final String firstHeaderText = getGridElement().getHeaderCell(0,
-                firstIndex).getText();
-        final String secondHeaderText = getGridElement().getHeaderCell(0,
-                secondIndex).getText();
+        final String firstHeaderText = getGridElement()
+                .getHeaderCell(0, firstIndex).getText();
+        final String secondHeaderText = getGridElement()
+                .getHeaderCell(0, secondIndex).getText();
         selectMenuPath("Component", "Internals", "Listeners",
                 "Add ColumnReorder listener");
         selectMenuPath("Component", "Columns", "Column " + secondIndex,
@@ -60,16 +60,16 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
 
         // the reorder event should have typed the order to this label
         WebElement columnReorderElement = findElement(By.id("columnreorder"));
-        int eventIndex = Integer.parseInt(columnReorderElement
-                .getAttribute("columns"));
+        int eventIndex = Integer
+                .parseInt(columnReorderElement.getAttribute("columns"));
         assertEquals(1, eventIndex);
 
         // trigger another event
         selectMenuPath("Component", "Columns", "Column " + secondIndex,
                 "Move column left");
         columnReorderElement = findElement(By.id("columnreorder"));
-        eventIndex = Integer.parseInt(columnReorderElement
-                .getAttribute("columns"));
+        eventIndex = Integer
+                .parseInt(columnReorderElement.getAttribute("columns"));
         assertEquals(2, eventIndex);
     }
 
@@ -77,10 +77,10 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
     public void testColumnReorder_onReorder_columnReorderEventTriggered() {
         final int firstIndex = 3;
         final int secondIndex = 4;
-        final String firstHeaderText = getGridElement().getHeaderCell(0,
-                firstIndex).getText();
-        final String secondHeaderText = getGridElement().getHeaderCell(0,
-                secondIndex).getText();
+        final String firstHeaderText = getGridElement()
+                .getHeaderCell(0, firstIndex).getText();
+        final String secondHeaderText = getGridElement()
+                .getHeaderCell(0, secondIndex).getText();
         selectMenuPath("Component", "Internals", "Listeners",
                 "Add ColumnReorder listener");
         selectMenuPath("Component", "Columns", "Column " + secondIndex,
@@ -94,16 +94,16 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
 
         // the reorder event should have typed the order to this label
         WebElement columnReorderElement = findElement(By.id("columnreorder"));
-        int eventIndex = Integer.parseInt(columnReorderElement
-                .getAttribute("columns"));
+        int eventIndex = Integer
+                .parseInt(columnReorderElement.getAttribute("columns"));
         assertEquals(1, eventIndex);
 
         // trigger another event
         selectMenuPath("Component", "Columns", "Column " + secondIndex,
                 "Move column left");
         columnReorderElement = findElement(By.id("columnreorder"));
-        eventIndex = Integer.parseInt(columnReorderElement
-                .getAttribute("columns"));
+        eventIndex = Integer
+                .parseInt(columnReorderElement.getAttribute("columns"));
         assertEquals(2, eventIndex);
     }
 
@@ -280,7 +280,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
         toggleColumnReorder();
         selectMenuPath("Component", "Header", "Append row");
         selectMenuPath("Component", "Header", "Append row");
-        selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1");
+        selectMenuPath("Component", "Header", "Row 2",
+                "Join column cells 0, 1");
         selectMenuPath("Component", "Header", "Row 3", "Join columns 1, 2");
         dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT);
         assertColumnHeaderOrder(3, 0, 1, 2, 4);
@@ -298,7 +299,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
         toggleColumnReorder();
         selectMenuPath("Component", "Header", "Append row");
         selectMenuPath("Component", "Header", "Append row");
-        selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1");
+        selectMenuPath("Component", "Header", "Row 2",
+                "Join column cells 0, 1");
         selectMenuPath("Component", "Header", "Row 3", "Join columns 1, 2");
         dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT);
         assertColumnHeaderOrder(3, 0, 1, 2, 4);
@@ -415,7 +417,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
         toggleColumnReorder();
         selectMenuPath("Component", "Footer", "Append row");
         selectMenuPath("Component", "Footer", "Append row");
-        selectMenuPath("Component", "Footer", "Row 1", "Join column cells 0, 1");
+        selectMenuPath("Component", "Footer", "Row 1",
+                "Join column cells 0, 1");
         selectMenuPath("Component", "Footer", "Row 2", "Join columns 1, 2");
         dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT);
         assertColumnHeaderOrder(3, 0, 1, 2, 4);
@@ -500,7 +503,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "Header", "Append row");
         selectMenuPath("Component", "Header", "Row 2", "Join columns 1, 2");
         selectMenuPath("Component", "Header", "Append row");
-        selectMenuPath("Component", "Header", "Row 3", "Join column cells 0, 1");
+        selectMenuPath("Component", "Header", "Row 3",
+                "Join column cells 0, 1");
         assertColumnHeaderOrder(0, 1, 2, 3, 4);
 
         // when
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
index ae9a8fe381..6baacc0f81 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -50,19 +50,19 @@ public class GridDefaultTextRendererTest extends MultiBrowserTest {
 
     @Test
     public void testNullIsRenderedAsEmptyStringByDefaultTextRenderer() {
-        assertTrue("First cell should've been empty", grid.getCell(0, 0)
-                .getText().isEmpty());
+        assertTrue("First cell should've been empty",
+                grid.getCell(0, 0).getText().isEmpty());
     }
 
     @Test
     public void testStringIsRenderedAsStringByDefaultTextRenderer() {
-        assertEquals("Second cell should've been populated ", "string", grid
-                .getCell(1, 0).getText());
+        assertEquals("Second cell should've been populated ", "string",
+                grid.getCell(1, 0).getText());
     }
 
     @Test
     public void testWarningShouldNotBeInDebugLog() {
-        assertFalse("Warning visible with string content.",
-                isElementPresent(By.xpath("//span[contains(.,'attached:#1')]")));
+        assertFalse("Warning visible with string content.", isElementPresent(
+                By.xpath("//span[contains(.,'attached:#1')]")));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
index ac494efc2c..068e6e7f60 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,7 +39,8 @@ public class GridDescriptionGeneratorTest extends GridBasicFeaturesTest {
 
         getGridElement().getCell(1, 1).showTooltip();
         assertTrue("Tooltip should not be present in cell (1, 1) ",
-                findElement(By.className("v-tooltip-text")).getText().isEmpty());
+                findElement(By.className("v-tooltip-text")).getText()
+                        .isEmpty());
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
index 651cd3a763..94e16f537c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
@@ -14,7 +14,8 @@ public class GridHeightByRowOnInitTest extends MultiBrowserTest {
     public void gridHeightIsMoreThanACoupleOfRows() {
         openTestURL();
         int height = $(GridElement.class).first().getSize().getHeight();
-        assertGreater("Grid should be much taller than 150px (was " + height
-                + "px)", height, 150);
+        assertGreater(
+                "Grid should be much taller than 150px (was " + height + "px)",
+                height, 150);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
index 5eb05c61ca..31c0c8f904 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
index 8465906801..95335d144a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
index 8188553e61..1cf03f10a8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,8 +29,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
     public void testStyleNameGeneratorScrolling() throws Exception {
         openTestURL();
 
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
 
         GridRowElement row2 = getGridElement().getRow(2);
         GridCellElement cell4_2 = getGridElement().getCell(4, 2);
@@ -51,8 +53,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
     public void testDisableStyleNameGenerator() throws Exception {
         openTestURL();
 
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
 
         // Just verify that change was effective
         GridRowElement row2 = getGridElement().getRow(2);
@@ -62,8 +66,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
         Assert.assertTrue(hasCssClass(cell4_2, "4_2"));
 
         // Disable the generator and check again
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_NONE);
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_NONE);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE);
 
         Assert.assertFalse(hasCssClass(row2, "2"));
         Assert.assertFalse(hasCssClass(cell4_2, "4_2"));
@@ -73,8 +79,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
     public void testChangeStyleNameGenerator() throws Exception {
         openTestURL();
 
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
 
         // Just verify that change was effective
         GridRowElement row2 = getGridElement().getRow(2);
@@ -84,8 +92,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
         Assert.assertTrue(hasCssClass(cell4_2, "4_2"));
 
         // Change the generator and check again
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE);
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_SIMPLE);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_SIMPLE);
 
         // Old styles removed?
         Assert.assertFalse(hasCssClass(row2, "2"));
@@ -99,8 +109,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
     public void testStyleNameGeneratorChangePrimary() throws Exception {
         openTestURL();
 
-        selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
-        selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
+        selectCellStyleNameGenerator(
+                GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX);
+        selectRowStyleNameGenerator(
+                GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX);
 
         // Just verify that change was effective
         GridRowElement row2 = getGridElement().getRow(2);
@@ -110,7 +122,8 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
         Assert.assertTrue(hasCssClass(cell4_2, "4_2"));
 
         // Change primary stylename
-        selectMenuPath("Component", "State", "Primary Stylename", "v-escalator");
+        selectMenuPath("Component", "State", "Primary Stylename",
+                "v-escalator");
 
         // Styles still present
         Assert.assertTrue(hasCssClass(row2, "2"));
@@ -118,7 +131,8 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest {
 
         // New styles present?
         Assert.assertFalse(hasCssClass(row2, "v-escalator-row-2"));
-        Assert.assertFalse(hasCssClass(cell4_2, "v-escalator-cell-content-4_2"));
+        Assert.assertFalse(
+                hasCssClass(cell4_2, "v-escalator-cell-content-4_2"));
     }
 
     private void selectCellStyleNameGenerator(String name) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
index 2f5d0e7291..af27172c90 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,8 @@ import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget;
 
-public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest {
+public class GridClientColumnPropertiesTest
+        extends GridBasicClientFeaturesTest {
 
     @Test
     public void initialColumnWidths() {
@@ -72,7 +73,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
         assertFalse(cellIsFrozen(0, 0));
         assertFalse(cellIsFrozen(0, 1));
 
-        selectMenuPath("Component", "State", "Frozen column count", "1 columns");
+        selectMenuPath("Component", "State", "Frozen column count",
+                "1 columns");
 
         assertTrue(cellIsFrozen(1, 0));
         assertFalse(cellIsFrozen(1, 1));
@@ -82,7 +84,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
         assertTrue(cellIsFrozen(1, 1));
         assertFalse(cellIsFrozen(1, 2));
 
-        selectMenuPath("Component", "State", "Frozen column count", "0 columns");
+        selectMenuPath("Component", "State", "Frozen column count",
+                "0 columns");
 
         assertTrue(cellIsFrozen(1, 0));
         assertFalse(cellIsFrozen(1, 1));
@@ -97,7 +100,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
     public void testFrozenColumns_columnsReordered_frozenColumnsKept() {
         openTestURL();
 
-        selectMenuPath("Component", "State", "Frozen column count", "2 columns");
+        selectMenuPath("Component", "State", "Frozen column count",
+                "2 columns");
 
         assertTrue(cellIsFrozen(1, 0));
         assertTrue(cellIsFrozen(1, 1));
@@ -136,11 +140,11 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
         assertFalse("Text in broken cell should have old value",
                 "(0, 0)".equals(gridElement.getCell(0, 0).getText()));
 
-        assertEquals("Neighbour cell should be updated", "(0, 1)", gridElement
-                .getCell(0, 1).getText());
+        assertEquals("Neighbour cell should be updated", "(0, 1)",
+                gridElement.getCell(0, 1).getText());
 
-        assertEquals("Neighbour cell should be updated", "(1, 0)", gridElement
-                .getCell(1, 0).getText());
+        assertEquals("Neighbour cell should be updated", "(1, 0)",
+                gridElement.getCell(1, 0).getText());
     }
 
     @Test
@@ -166,7 +170,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest
             // Avoid issues with inaccuracies regarding subpixels.
             assertEquals(
                     "Column widths don't match after reset, index after flip "
-                            + i, columnWidths.get(i),
+                            + i,
+                    columnWidths.get(i),
                     headerCells.get(size - 1 - i).getSize().getWidth(), 1.0d);
         }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
index b7242c87be..ae01a10e28 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,8 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
-public class GridClientContextMenuEventTest extends GridBasicClientFeaturesTest {
+public class GridClientContextMenuEventTest
+        extends GridBasicClientFeaturesTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
@@ -49,19 +50,15 @@ public class GridClientContextMenuEventTest extends GridBasicClientFeaturesTest
                 .moveToElement(getGridElement().getCell(0, 0), 5, 5)
                 .contextClick().perform();
 
-        assertTrue(
-                "Debug log was not visible",
-                isElementPresent(By
-                        .xpath("//span[text() = 'Prevented opening a context menu in grid body']")));
+        assertTrue("Debug log was not visible", isElementPresent(By.xpath(
+                "//span[text() = 'Prevented opening a context menu in grid body']")));
 
         new Actions(getDriver())
                 .moveToElement(getGridElement().getHeaderCell(0, 0), 5, 5)
                 .contextClick().perform();
 
-        assertTrue(
-                "Debug log was not visible",
-                isElementPresent(By
-                        .xpath("//span[text() = 'Prevented opening a context menu in grid header']")));
+        assertTrue("Debug log was not visible", isElementPresent(By.xpath(
+                "//span[text() = 'Prevented opening a context menu in grid header']")));
 
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
index 740eaf3f09..541895d530 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -94,7 +94,8 @@ public class GridClientKeyEventsTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "State", "Selection mode", "multi");
 
         // IE8 does not handle 1k rows well with assertions enabled. Less rows!
-        selectMenuPath("Component", "DataSource", "Reset with 100 rows of Data");
+        selectMenuPath("Component", "DataSource",
+                "Reset with 100 rows of Data");
 
         // Focus cell above select all checkbox
         getGridElement().getHeaderCell(0, 0).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
index d1d7b21e11..a760a4c330 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,11 +33,11 @@ public class GridClientSelectionTest extends GridBasicClientFeaturesTest {
         openTestURL();
 
         setSelectionModelNone();
-        assertTrue("First column was selection column", getGridElement()
-                .getCell(0, 0).getText().equals("(0, 0)"));
+        assertTrue("First column was selection column",
+                getGridElement().getCell(0, 0).getText().equals("(0, 0)"));
         setSelectionModelMulti();
-        assertTrue("First column was not selection column", getGridElement()
-                .getCell(0, 1).getText().equals("(0, 0)"));
+        assertTrue("First column was not selection column",
+                getGridElement().getCell(0, 1).getText().equals("(0, 0)"));
     }
 
     @Test
@@ -45,20 +45,21 @@ public class GridClientSelectionTest extends GridBasicClientFeaturesTest {
         openTestURL();
 
         setSelectionModelMulti();
-        selectMenuPath("Component", "DataSource", "Reset with 100 rows of Data");
+        selectMenuPath("Component", "DataSource",
+                "Reset with 100 rows of Data");
         GridCellElement header = getGridElement().getHeaderCell(0, 0);
 
         assertTrue("No checkbox", header.isElementPresent(By.tagName("input")));
         header.findElement(By.tagName("input")).click();
 
         for (int i = 0; i < 100; i += 10) {
-            assertTrue("Row " + i + " was not selected.", getGridElement()
-                    .getRow(i).isSelected());
+            assertTrue("Row " + i + " was not selected.",
+                    getGridElement().getRow(i).isSelected());
         }
 
         header.findElement(By.tagName("input")).click();
-        assertFalse("Row 52 was still selected", getGridElement().getRow(52)
-                .isSelected());
+        assertFalse("Row 52 was still selected",
+                getGridElement().getRow(52).isSelected());
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
index 74cf368da9..35ef03c0b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ public class GridClientStructureTest extends GridBasicClientFeaturesTest {
         // it's easier to notice with valo
         openTestURL("theme=valo");
 
-        WebElement topDeco = getGridElement().findElement(
-                By.className("v-grid-header-deco"));
+        WebElement topDeco = getGridElement()
+                .findElement(By.className("v-grid-header-deco"));
         assertGreater(
                 "The header deco in Valo hasn't been recalculated after initial rendering",
                 topDeco.getSize().getHeight(), 20);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
index 01e7e52923..58b44e43dc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -111,7 +111,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath(SET_FAULTY_GENERATOR);
         toggleDetailsFor(1);
 
-        ElementQuery<FixedNotificationElement> notification = $(FixedNotificationElement.class);
+        ElementQuery<FixedNotificationElement> notification = $(
+                FixedNotificationElement.class);
         assertTrue("Was expecting an error notification here",
                 notification.exists());
         notification.first().close();
@@ -140,9 +141,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath(SET_GENERATOR);
         toggleDetailsFor(1);
 
-        assertNotEquals(
-                "New details should've been generated even after error", "",
-                getGridElement().getDetails(1).getText());
+        assertNotEquals("New details should've been generated even after error",
+                "", getGridElement().getDetails(1).getText());
     }
 
     @Test
@@ -161,8 +161,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         toggleDetailsFor(1);
 
         TestBenchElement detailsElement = getGridElement().getDetails(1);
-        WebElement button = detailsElement.findElement(By
-                .className("gwt-Button"));
+        WebElement button = detailsElement
+                .findElement(By.className("gwt-Button"));
         button.click();
 
         WebElement label = detailsElement
@@ -175,8 +175,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath(SET_EMPTY_GENERATOR);
         toggleDetailsFor(1);
 
-        assertEquals("empty generator did not produce an empty details row",
-                "", getGridElement().getDetails(1).getText());
+        assertEquals("empty generator did not produce an empty details row", "",
+                getGridElement().getDetails(1).getText());
     }
 
     @Test(expected = NoSuchElementException.class)
@@ -194,8 +194,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         toggleDetailsFor(0);
         toggleDetailsFor(1);
 
-        List<WebElement> elements = getGridElement().findElements(
-                By.className("v-grid-spacer"));
+        List<WebElement> elements = getGridElement()
+                .findElements(By.className("v-grid-spacer"));
         assertEquals("v-grid-spacer", elements.get(0).getAttribute("class"));
         assertEquals("v-grid-spacer stripe",
                 elements.get(1).getAttribute("class"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
index 0dd137db48..810f20cc7b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -128,8 +128,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath(EDIT_ROW_100);
         WebElement editor = getEditor();
 
-        List<WebElement> widgets = editor.findElements(By
-                .className("gwt-TextBox"));
+        List<WebElement> widgets = editor
+                .findElements(By.className("gwt-TextBox"));
 
         assertEquals(GridBasicFeatures.EDITABLE_COLUMNS, widgets.size());
 
@@ -150,27 +150,27 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
 
         WebElement editorCells = findElements(
                 By.className("v-grid-editor-cells")).get(1);
-        List<WebElement> selectorDivs = editorCells.findElements(By
-                .cssSelector("div"));
+        List<WebElement> selectorDivs = editorCells
+                .findElements(By.cssSelector("div"));
 
-        assertFalse("selector column cell should've had contents", selectorDivs
-                .get(0).getAttribute("innerHTML").isEmpty());
-        assertFalse("normal column cell shoul've had contents", selectorDivs
-                .get(1).getAttribute("innerHTML").isEmpty());
+        assertFalse("selector column cell should've had contents",
+                selectorDivs.get(0).getAttribute("innerHTML").isEmpty());
+        assertFalse("normal column cell shoul've had contents",
+                selectorDivs.get(1).getAttribute("innerHTML").isEmpty());
     }
 
     @Test
     public void testSave() {
         selectMenuPath(EDIT_ROW_100);
 
-        WebElement textField = getEditor().findElements(
-                By.className("gwt-TextBox")).get(0);
+        WebElement textField = getEditor()
+                .findElements(By.className("gwt-TextBox")).get(0);
 
         textField.clear();
         textField.sendKeys("Changed");
 
-        WebElement saveButton = getEditor().findElement(
-                By.className("v-grid-editor-save"));
+        WebElement saveButton = getEditor()
+                .findElement(By.className("v-grid-editor-save"));
 
         saveButton.click();
 
@@ -181,8 +181,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
     public void testProgrammaticSave() {
         selectMenuPath(EDIT_ROW_100);
 
-        WebElement textField = getEditor().findElements(
-                By.className("gwt-TextBox")).get(0);
+        WebElement textField = getEditor()
+                .findElements(By.className("gwt-TextBox")).get(0);
 
         textField.clear();
         textField.sendKeys("Changed");
@@ -200,8 +200,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
                 GridConstants.DEFAULT_SAVE_CAPTION, getSaveButton().getText());
         assertEquals("Cancel button caption should've been \""
                 + GridConstants.DEFAULT_CANCEL_CAPTION + "\" to begin with",
-                GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton()
-                        .getText());
+                GridConstants.DEFAULT_CANCEL_CAPTION,
+                getCancelButton().getText());
 
         selectMenuPath("Component", "Editor", "Change Save Caption");
         assertNotEquals(
@@ -214,8 +214,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath(EDIT_ROW_5);
         assertNotEquals(
                 "Cancel button caption should've changed while editor is closed",
-                GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton()
-                        .getText());
+                GridConstants.DEFAULT_CANCEL_CAPTION,
+                getCancelButton().getText());
     }
 
     @Test
@@ -240,10 +240,9 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "Editor", "Toggle second editor error");
         getSaveButton().click();
 
-        assertEquals("Unexpected amount of error fields", 1, editor
-                .findElements(By.className("error")).size());
-        assertEquals(
-                "Unexpedted error message",
+        assertEquals("Unexpected amount of error fields", 1,
+                editor.findElements(By.className("error")).size());
+        assertEquals("Unexpedted error message",
                 "Syntethic fail of editor in column 2. "
                         + "This message is so long that it doesn't fit into its box",
                 editor.getErrorMessage());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
index 8b65ba315b..e519d18771 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -99,15 +99,16 @@ public class GridFooterTest extends GridStaticSectionTest {
 
         selectMenuPath("Component", "Footer", "Append row");
 
-        selectMenuPath("Component", "Footer", "Row 1", "Join column cells 0, 1");
+        selectMenuPath("Component", "Footer", "Row 1",
+                "Join column cells 0, 1");
 
         GridCellElement spannedCell = getGridElement().getFooterCell(0, 0);
         assertTrue(spannedCell.isDisplayed());
         assertEquals("2", spannedCell.getAttribute("colspan"));
 
         // TestBench returns the spanned cell for all columns
-        assertEquals(spannedCell.getText(), getGridElement()
-                .getFooterCell(0, 1).getText());
+        assertEquals(spannedCell.getText(),
+                getGridElement().getFooterCell(0, 1).getText());
     }
 
     @Test
@@ -123,8 +124,8 @@ public class GridFooterTest extends GridStaticSectionTest {
         assertEquals("2", spannedCell.getAttribute("colspan"));
 
         // TestBench returns the spanned cell for all columns
-        assertEquals(spannedCell.getText(), getGridElement()
-                .getFooterCell(0, 2).getText());
+        assertEquals(spannedCell.getText(),
+                getGridElement().getFooterCell(0, 2).getText());
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
index 8cf7f7374f..f7d3252559 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -144,7 +144,8 @@ public class GridHeaderTest extends GridStaticSectionTest {
 
         selectMenuPath("Component", "Header", "Append row");
 
-        selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1");
+        selectMenuPath("Component", "Header", "Row 2",
+                "Join column cells 0, 1");
 
         GridCellElement spannedCell = getGridElement().getHeaderCell(1, 0);
         assertTrue(spannedCell.isDisplayed());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
index c7a509da45..3a1ca9ae77 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,8 +27,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest {
     public void testRefreshingThroughRowHandle() {
         openTestURL();
 
-        assertEquals("Unexpected initial state", "(0, 0)", getGridElement()
-                .getCell(0, 0).getText());
+        assertEquals("Unexpected initial state", "(0, 0)",
+                getGridElement().getCell(0, 0).getText());
         selectMenuPath("Component", "State", "Edit and refresh Row 0");
         assertEquals("Cell contents did not update correctly", "Foo",
                 getGridElement().getCell(0, 0).getText());
@@ -39,8 +39,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest {
             throws InterruptedException {
         openTestURL();
 
-        assertEquals("Unexpected initial state", "(0, 0)", getGridElement()
-                .getCell(0, 0).getText());
+        assertEquals("Unexpected initial state", "(0, 0)",
+                getGridElement().getCell(0, 0).getText());
         selectMenuPath("Component", "State", "Delayed edit of Row 0");
         // Still the same data
         assertEquals("Cell contents did not update correctly", "(0, 0)",
@@ -55,8 +55,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest {
     public void testRefreshingWhenNotInViewThroughRowHandle() {
         openTestURL();
 
-        assertEquals("Unexpected initial state", "(0, 0)", getGridElement()
-                .getCell(0, 0).getText());
+        assertEquals("Unexpected initial state", "(0, 0)",
+                getGridElement().getCell(0, 0).getText());
         getGridElement().scrollToRow(100);
         selectMenuPath("Component", "State", "Edit and refresh Row 0");
         assertEquals("Cell contents did not update correctly", "Foo",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
index 1b9d1a0728..08725c79a1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,8 +38,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
 
         getSidebarOpenButton().click();
 
-        WebElement toggle = getSidebarPopup().findElement(
-                By.className("column-hiding-toggle"));
+        WebElement toggle = getSidebarPopup()
+                .findElement(By.className("column-hiding-toggle"));
 
         Assert.assertEquals("Column 0 should be togglable", "Header (0,0)",
                 toggle.getText());
@@ -64,8 +64,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
 
         sidebarItem.click();
 
-        Assert.assertEquals("Sidebar should be closed after clicking item 0",
-                0, countBySelector(".v-grid-sidebar-content"));
+        Assert.assertEquals("Sidebar should be closed after clicking item 0", 0,
+                countBySelector(".v-grid-sidebar-content"));
     }
 
     @Test
@@ -122,8 +122,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
     }
 
     private void assertSidebarMenuItems(String... items) {
-        List<WebElement> menuItems = getSidebarPopup().findElements(
-                By.cssSelector(".v-grid-sidebar-content td"));
+        List<WebElement> menuItems = getSidebarPopup()
+                .findElements(By.cssSelector(".v-grid-sidebar-content td"));
 
         Assert.assertEquals("Expected " + items.length + " menu items",
                 items.length, menuItems.size());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
index ef7d15ff3d..412783cad1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,15 +26,17 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
 
 /**
  * Abstract base class for header and footer tests.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
-public abstract class GridStaticSectionTest extends GridBasicClientFeaturesTest {
+public abstract class GridStaticSectionTest
+        extends GridBasicClientFeaturesTest {
 
     protected void assertHeaderTexts(int headerId, int rowIndex) {
         int i = 0;
-        for (TestBenchElement cell : getGridElement().getHeaderCells(rowIndex)) {
+        for (TestBenchElement cell : getGridElement()
+                .getHeaderCells(rowIndex)) {
             WebElement content = cell.findElement(By.tagName("div"));
 
             if (i % 3 == 0) {
@@ -56,7 +58,8 @@ public abstract class GridStaticSectionTest extends GridBasicClientFeaturesTest
 
     protected void assertFooterTexts(int footerId, int rowIndex) {
         int i = 0;
-        for (TestBenchElement cell : getGridElement().getFooterCells(rowIndex)) {
+        for (TestBenchElement cell : getGridElement()
+                .getFooterCells(rowIndex)) {
             WebElement content = cell.findElement(By.tagName("div"));
 
             if (i % 3 == 0) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
index cbf27a69d9..50a1987f52 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -47,13 +47,13 @@ public class GridStylingTest extends GridStaticSectionTest {
         String classNames = getGridElement().getAttribute("class");
         assertEquals(stylename, classNames);
 
-        classNames = getGridElement().getVerticalScroller().getAttribute(
-                "class");
+        classNames = getGridElement().getVerticalScroller()
+                .getAttribute("class");
         assertTrue(classNames.contains(stylename + "-scroller"));
         assertTrue(classNames.contains(stylename + "-scroller-vertical"));
 
-        classNames = getGridElement().getHorizontalScroller().getAttribute(
-                "class");
+        classNames = getGridElement().getHorizontalScroller()
+                .getAttribute("class");
         assertTrue(classNames.contains(stylename + "-scroller"));
         assertTrue(classNames.contains(stylename + "-scroller-horizontal"));
 
@@ -64,8 +64,8 @@ public class GridStylingTest extends GridStaticSectionTest {
         assertEquals(stylename + "-header", classNames);
 
         for (int row = 0; row < getGridElement().getHeaderCount(); row++) {
-            classNames = getGridElement().getHeaderRow(row).getAttribute(
-                    "class");
+            classNames = getGridElement().getHeaderRow(row)
+                    .getAttribute("class");
             assertEquals(stylename + "-row", classNames);
 
             for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) {
@@ -86,12 +86,13 @@ public class GridStylingTest extends GridStaticSectionTest {
             assertTrue(classNames.contains(stylename + "-row-has-data"));
 
             for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) {
-                classNames = getGridElement().getCell(row, col).getAttribute(
-                        "class");
+                classNames = getGridElement().getCell(row, col)
+                        .getAttribute("class");
                 assertTrue(classNames.contains(stylename + "-cell"));
 
                 if (row == 0 && col == 0) {
-                    assertTrue(classNames.contains(stylename + "-cell-focused"));
+                    assertTrue(
+                            classNames.contains(stylename + "-cell-focused"));
                 }
             }
         }
@@ -100,8 +101,8 @@ public class GridStylingTest extends GridStaticSectionTest {
         assertEquals(stylename + "-footer", classNames);
 
         for (int row = 0; row < getGridElement().getFooterCount(); row++) {
-            classNames = getGridElement().getFooterRow(row).getAttribute(
-                    "class");
+            classNames = getGridElement().getFooterRow(row)
+                    .getAttribute("class");
             assertEquals(stylename + "-row", classNames);
 
             for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
index e1934d4f2b..08e7ce233d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elementsbase.ServerClass;
 public class CustomGridElement extends GridElement {
     /**
      * Gets the element that contains the details of a row.
-     * 
+     *
      * @since
      * @param rowIndex
      *            the index of the row for the details
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
index 1d26477d34..703466a3f1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
index d9b3debbe1..0881990c05 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
index e808001cf7..3702258f46 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,8 +27,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
-public class EscalatorColumnFreezingTest extends
-        EscalatorBasicClientFeaturesTest {
+public class EscalatorColumnFreezingTest
+        extends EscalatorBasicClientFeaturesTest {
 
     private final static Pattern TRANSFORM_PATTERN = Pattern.compile(// @formatter:off
             // any start of the string
@@ -48,8 +48,8 @@ public class EscalatorColumnFreezingTest extends
 
             // @formatter:on
 
-    private final static Pattern LEFT_PATTERN = Pattern.compile(
-            ".*left: (\\d+)px.*", Pattern.CASE_INSENSITIVE);
+    private final static Pattern LEFT_PATTERN = Pattern
+            .compile(".*left: (\\d+)px.*", Pattern.CASE_INSENSITIVE);
 
     private static final int NO_FREEZE = -1;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
index 19ba72b49d..e5951f3f7c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,8 +27,8 @@ import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeatur
 /**
  * Test class to test the escalator level issue for ticket #16832
  */
-public class EscalatorRemoveAndAddRowsTest extends
-        EscalatorBasicClientFeaturesTest {
+public class EscalatorRemoveAndAddRowsTest
+        extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testRemoveAllRowsAndAddThirtyThenScroll() throws IOException {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
index e72e8fae70..17578f9bed 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
index 41ad370b98..8e868b3612 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@ public class EscalatorScrollTest extends EscalatorBasicClientFeaturesTest {
      * Before the fix, removing and adding rows and also scrolling would put the
      * scroll state in an internally inconsistent state. The scrollbar would've
      * been scrolled correctly, but the body wasn't.
-     * 
+     *
      * This was due to optimizations that didn't keep up with the promises, so
      * to say. So the optimizations were removed.
      */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
index 66c131255f..34b69027a4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,7 +44,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
 
     //@formatter:off
     // separate strings made so that eclipse can show the concatenated string by hovering the mouse over the constant
-    
+
     // translate3d(0px, 40px, 123px);
     // translate3d(24px, 15.251px, 0);
     // translate(0, 40px);
@@ -71,7 +71,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
             + "(?:, .*?)?" // the possible z argument, uninteresting (translate doesn't have one, translate3d does)
             + "\\)" // literal ")"
             + ";?"; // optional ending semicolon
-    
+
     // 40px;
     // 12.34px
     private final static String PIXEL_VALUE_REGEX =
@@ -96,8 +96,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
 
     private final static Pattern TRANSLATE_VALUE_PATTERN = Pattern
             .compile(TRANSLATE_VALUE_REGEX);
-    private final static Pattern PIXEL_VALUE_PATTERN = Pattern.compile(
-            PIXEL_VALUE_REGEX, Pattern.CASE_INSENSITIVE);
+    private final static Pattern PIXEL_VALUE_PATTERN = Pattern
+            .compile(PIXEL_VALUE_REGEX, Pattern.CASE_INSENSITIVE);
 
     @Before
     public void before() {
@@ -191,8 +191,10 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         long oldBottomScrollTop = getScrollTop();
         selectMenuPath(FEATURES, SPACERS, ROW_99, SET_100PX);
 
-        assertEquals("Adding a spacer underneath the current viewport should "
-                + "not scroll anywhere", oldBottomScrollTop, getScrollTop());
+        assertEquals(
+                "Adding a spacer underneath the current viewport should "
+                        + "not scroll anywhere",
+                oldBottomScrollTop, getScrollTop());
         assertFalse("Got an unexpected notification",
                 $(NotificationElement.class).exists());
 
@@ -238,15 +240,17 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
     public void spacersAreFixedInViewport_firstFreezeThenScroll() {
         selectMenuPath(FEATURES, FROZEN_COLUMNS, FREEZE_1_COLUMN);
         selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
-        assertEquals("Spacer's left position should've been 0 at the "
-                + "beginning", 0d, getElementLeft(getSpacer(1)),
-                WidgetUtil.PIXEL_EPSILON);
+        assertEquals(
+                "Spacer's left position should've been 0 at the " + "beginning",
+                0d, getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON);
 
         int scrollTo = 10;
         scrollHorizontallyTo(scrollTo);
-        assertEquals("Spacer's left position should've been " + scrollTo
-                + " after scrolling " + scrollTo + "px", scrollTo,
-                getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON);
+        assertEquals(
+                "Spacer's left position should've been " + scrollTo
+                        + " after scrolling " + scrollTo + "px",
+                scrollTo, getElementLeft(getSpacer(1)),
+                WidgetUtil.PIXEL_EPSILON);
     }
 
     @Test
@@ -255,9 +259,11 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         int scrollTo = 10;
         scrollHorizontallyTo(scrollTo);
         selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
-        assertEquals("Spacer's left position should've been " + scrollTo
-                + " after scrolling " + scrollTo + "px", scrollTo,
-                getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON);
+        assertEquals(
+                "Spacer's left position should've been " + scrollTo
+                        + " after scrolling " + scrollTo + "px",
+                scrollTo, getElementLeft(getSpacer(1)),
+                WidgetUtil.PIXEL_EPSILON);
     }
 
     @Test
@@ -389,8 +395,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         selectMenuPath(FEATURES, SPACERS, FOCUSABLE_UPDATER);
         selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
 
-        WebElement inputElement = getEscalator().findElement(
-                By.tagName("input"));
+        WebElement inputElement = getEscalator()
+                .findElement(By.tagName("input"));
         inputElement.click();
         scrollVerticallyTo(30);
 
@@ -398,8 +404,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         // the DOM reordering to take place.
         Thread.sleep(500);
 
-        assertFalse("Error message detected", $(NotificationElement.class)
-                .exists());
+        assertFalse("Error message detected",
+                $(NotificationElement.class).exists());
     }
 
     @Test
@@ -409,8 +415,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         WebElement tbody = getEscalator().findElement(By.tagName("tbody"));
         WebElement spacer = getChild(tbody, 2);
         String cssClass = spacer.getAttribute("class");
-        assertTrue("element index 2 was not a spacer (class=\"" + cssClass
-                + "\")", cssClass.contains("-spacer"));
+        assertTrue(
+                "element index 2 was not a spacer (class=\"" + cssClass + "\")",
+                cssClass.contains("-spacer"));
     }
 
     @Test
@@ -422,8 +429,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
         WebElement tbody = getEscalator().findElement(By.tagName("tbody"));
         WebElement spacer = getChild(tbody, 1);
         String cssClass = spacer.getAttribute("class");
-        assertTrue("element index 1 was not a spacer (class=\"" + cssClass
-                + "\")", cssClass.contains("-spacer"));
+        assertTrue(
+                "element index 1 was not a spacer (class=\"" + cssClass + "\")",
+                cssClass.contains("-spacer"));
     }
 
     @Test
@@ -493,8 +501,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
     }
 
     private WebElement getChild(WebElement parent, int childIndex) {
-        return (WebElement) executeScript("return arguments[0].children["
-                + childIndex + "];", parent);
+        return (WebElement) executeScript(
+                "return arguments[0].children[" + childIndex + "];", parent);
     }
 
     private static double[] getElementDimensions(WebElement element) {
@@ -574,8 +582,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
 
     private static double getPixelValue(String top) {
         Matcher matcher = PIXEL_VALUE_PATTERN.matcher(top);
-        assertTrue("no matches for \"" + top + "\" against "
-                + PIXEL_VALUE_PATTERN, matcher.find());
+        assertTrue(
+                "no matches for \"" + top + "\" against " + PIXEL_VALUE_PATTERN,
+                matcher.find());
         assertEquals("wrong amount of groups matched in " + top, 1,
                 matcher.groupCount());
         return Double.parseDouble(matcher.group(1));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
index 85d3fc0bac..5d4d2dcfe9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
index cd6a7a7b69..65a2ee7113 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
index 0c26ceb5c9..6cf9841069 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,13 +38,13 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
                 grid.getCell(1, 0).isFocused());
 
         selectMenuPath("Component", "Body rows", "Add 18 rows");
-        assertTrue("Cell focus was not moved when adding multiple rows", grid
-                .getCell(19, 0).isFocused());
+        assertTrue("Cell focus was not moved when adding multiple rows",
+                grid.getCell(19, 0).isFocused());
 
         for (int i = 18; i <= 0; --i) {
             selectMenuPath("Component", "Body rows", "Remove first row");
-            assertTrue("Cell focus was not moved when removing a row", grid
-                    .getCell(i, 0).isFocused());
+            assertTrue("Cell focus was not moved when removing a row",
+                    grid.getCell(i, 0).isFocused());
         }
     }
 
@@ -53,12 +53,12 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
         openTestURL();
         getGridElement().getCell(0, 0).click();
         new Actions(getDriver()).sendKeys(Keys.UP).perform();
-        assertTrue("Header 0,0 should've become focused", getGridElement()
-                .getHeaderCell(0, 0).isFocused());
+        assertTrue("Header 0,0 should've become focused",
+                getGridElement().getHeaderCell(0, 0).isFocused());
 
         selectMenuPath("Component", "Body rows", "Add first row");
-        assertTrue("Header 0,0 should've remained focused", getGridElement()
-                .getHeaderCell(0, 0).isFocused());
+        assertTrue("Header 0,0 should've remained focused",
+                getGridElement().getHeaderCell(0, 0).isFocused());
     }
 
     @Test
@@ -79,8 +79,8 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
                 getGridElement().getCell(0, 0).isFocused());
 
         selectMenuPath("Component", "Body rows", "Add third row");
-        assertTrue("Body 0,0 should've remained focused", getGridElement()
-                .getCell(0, 0).isFocused());
+        assertTrue("Body 0,0 should've remained focused",
+                getGridElement().getCell(0, 0).isFocused());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
index f013b76075..f3a3494865 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
     public void testStyleNameGeneratorScrolling() throws Exception {
         openTestURL();
 
-        selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
+        selectRowStyleNameGenerator(
+                GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
 
         GridRowElement row = getGridElement().getRow(2);
         GridCellElement cell = getGridElement().getCell(3, 2);
@@ -55,8 +57,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
     public void testDisableStyleNameGenerator() throws Exception {
         openTestURL();
 
-        selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
+        selectRowStyleNameGenerator(
+                GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
 
         // Just verify that change was effective
         GridRowElement row2 = getGridElement().getRow(2);
@@ -67,7 +71,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
 
         // Disable the generator and check again
         selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NONE);
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_NONE);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_NONE);
 
         Assert.assertFalse(hasCssClass(row2, "row2"));
         Assert.assertFalse(hasCssClass(cell3_2, "Column_2"));
@@ -77,8 +82,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
     public void testChangeStyleNameGenerator() throws Exception {
         openTestURL();
 
-        selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
+        selectRowStyleNameGenerator(
+                GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
 
         // Just verify that change was effective
         GridRowElement row2 = getGridElement().getRow(2);
@@ -89,7 +96,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
 
         // Change the generator and check again
         selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NONE);
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_PROPERTY_TO_STRING);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_PROPERTY_TO_STRING);
 
         // Old styles removed?
         Assert.assertFalse(hasCssClass(row2, "row2"));
@@ -105,7 +113,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
         openTestURL();
         selectMenuPath("Component", "State", "Selection mode", "multi");
 
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL);
 
         assertFalse("Error notification was present",
                 isElementPresent(NotificationElement.class));
@@ -123,8 +132,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
     public void testEmptyStringStyleGenerator() {
         setDebug(true);
         openTestURL();
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_EMPTY);
-        selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_EMPTY);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_EMPTY);
+        selectRowStyleNameGenerator(
+                GridBasicFeatures.ROW_STYLE_GENERATOR_EMPTY);
 
         assertFalse("Error notification was present",
                 isElementPresent(NotificationElement.class));
@@ -134,7 +145,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest {
     public void testNullStringStyleGenerator() {
         setDebug(true);
         openTestURL();
-        selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_NULL);
+        selectCellStyleNameGenerator(
+                GridBasicFeatures.CELL_STYLE_GENERATOR_NULL);
         selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NULL);
 
         assertFalse("Error notification was present",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
index 91b5d04ab6..1e8dc49dc1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that removing and adding rows doesn't cause an infinite loop in the
  * browser.
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("grid")
@@ -37,15 +37,15 @@ public class GridClearContainerTest extends MultiBrowserTest {
     @Test
     public void clearAndReadd() {
         openTestURL();
-        ButtonElement button = $(ButtonElement.class).caption(
-                "Clear and re-add").first();
+        ButtonElement button = $(ButtonElement.class)
+                .caption("Clear and re-add").first();
         GridElement grid = $(GridElement.class).first();
         Assert.assertEquals(ERRORNOTE, "default", grid.getCell(0, 0).getText());
         Assert.assertEquals(ERRORNOTE, "default", grid.getCell(1, 0).getText());
         button.click();
-        Assert.assertEquals(ERRORNOTE, "Updated value 1", grid.getCell(0, 0)
-                .getText());
-        Assert.assertEquals(ERRORNOTE, "Updated value 2", grid.getCell(1, 0)
-                .getText());
+        Assert.assertEquals(ERRORNOTE, "Updated value 1",
+                grid.getCell(0, 0).getText());
+        Assert.assertEquals(ERRORNOTE, "Updated value 2",
+                grid.getCell(1, 0).getText());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
index 7f19559aec..a467a452d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
index 62be202277..c6d6f44a00 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 /**
  * Tests that Grid columns can be reordered by user with drag and drop #16643.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class GridColumnReorderTest extends GridBasicFeaturesTest {
@@ -331,21 +331,23 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {
         selectMenuPath("Component", "Size", "Width", "900px");
         assertColumnHeaderOrder(0, 1, 2, 3);
 
-        GridCellElement draggedHeaderCell = getGridElement()
-                .getHeaderCell(0, 1);
+        GridCellElement draggedHeaderCell = getGridElement().getHeaderCell(0,
+                1);
         final int xOffset = 500;
         new Actions(getDriver()).moveToElement(draggedHeaderCell, 20, 10)
                 .clickAndHold().moveByOffset(xOffset, 0).build().perform();
 
-        WebElement floatingDragElement = findElement(By
-                .className("dragged-column-header"));
+        WebElement floatingDragElement = findElement(
+                By.className("dragged-column-header"));
 
-        int expectedLeft = draggedHeaderCell.getLocation().getX() + xOffset
-                + 20 - (floatingDragElement.getSize().getWidth() / 2);
+        int expectedLeft = draggedHeaderCell.getLocation().getX() + xOffset + 20
+                - (floatingDragElement.getSize().getWidth() / 2);
         int realLeft = floatingDragElement.getLocation().getX();
 
-        assertTrue("Dragged element location wrong, expected " + expectedLeft
-                + " was " + realLeft, Math.abs(expectedLeft - realLeft) < 10);
+        assertTrue(
+                "Dragged element location wrong, expected " + expectedLeft
+                        + " was " + realLeft,
+                Math.abs(expectedLeft - realLeft) < 10);
     }
 
     @Test
@@ -362,14 +364,15 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {
         new Actions(getDriver()).clickAndHold(getDefaultColumnHeader(10))
                 .moveByOffset(800, 0).build().perform();
 
-        WebElement dragDropMarker = findElement(By
-                .className("v-grid-drop-marker"));
+        WebElement dragDropMarker = findElement(
+                By.className("v-grid-drop-marker"));
         WebElement sidebar = findElement(By.className("v-grid-sidebar"));
 
         int dragDropMarkerX = dragDropMarker.getLocation().getX();
         int sidebarX = sidebar.getLocation().getX();
-        assertTrue("Drop marker misplaced " + dragDropMarkerX
-                + " compared to sidebar open button " + sidebarX,
+        assertTrue(
+                "Drop marker misplaced " + dragDropMarkerX
+                        + " compared to sidebar open button " + sidebarX,
                 dragDropMarkerX <= sidebarX);
     }
 
@@ -382,14 +385,14 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {
     }
 
     private void moveColumnManuallyLeftByOne(int index) {
-        selectMenuPath(new String[] { "Component", "Columns",
-                "Column " + index, "Move left" });
+        selectMenuPath(new String[] { "Component", "Columns", "Column " + index,
+                "Move left" });
     }
 
     private void assertColumnReorderEvent(boolean userOriginated) {
         final String logRow = getLogRow(0);
-        assertTrue(logRow.contains("Columns reordered, userOriginated: "
-                + userOriginated));
+        assertTrue(logRow.contains(
+                "Columns reordered, userOriginated: " + userOriginated));
     }
 
     private void assertNoColumnReorderEvent() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
index a452a60280..0ed3de39d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -122,8 +122,8 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest {
         Dimension size = headerCell.getSize();
         new Actions(getDriver())
                 .moveToElement(headerCell, size.getWidth() + posX,
-                        size.getHeight() / 2).clickAndHold()
-                .moveByOffset(offset, 0).release().perform();
+                        size.getHeight() / 2)
+                .clickAndHold().moveByOffset(offset, 0).release().perform();
     }
 
     private void assertResizable(int columnIndex, boolean resizable) {
@@ -133,8 +133,8 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest {
 
     private void assertResizable(GridCellElement cell, boolean resizable) {
         assertEquals("Header resize handle present", resizable,
-                cell.isElementPresent(By
-                        .cssSelector("div.v-grid-column-resize-handle")));
+                cell.isElementPresent(
+                        By.cssSelector("div.v-grid-column-resize-handle")));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
index 11a6dcf4b3..9563ae11d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
@@ -51,20 +51,20 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
 
     @Test
     public void columnIsNotShownWhenHidden() {
-        assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText()
-                .toLowerCase());
+        assertEquals("column 0",
+                getGridElement().getHeaderCell(0, 0).getText().toLowerCase());
 
         selectMenuPath(TOGGLE_HIDE_COLUMN_0);
-        assertEquals("column 1", getGridElement().getHeaderCell(0, 0).getText()
-                .toLowerCase());
+        assertEquals("column 1",
+                getGridElement().getHeaderCell(0, 0).getText().toLowerCase());
     }
 
     @Test
     public void columnIsShownWhenUnhidden() {
         selectMenuPath(TOGGLE_HIDE_COLUMN_0);
         selectMenuPath(TOGGLE_HIDE_COLUMN_0);
-        assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText()
-                .toLowerCase());
+        assertEquals("column 0",
+                getGridElement().getHeaderCell(0, 0).getText().toLowerCase());
     }
 
     @Test
@@ -170,15 +170,15 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
     public void testColumnHidingToggleCaption_settingToggleCaption_updatesToggle() {
         toggleColumnHidable(1);
         getSidebarOpenButton().click();
-        assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText()
-                .toLowerCase());
+        assertEquals("column 1",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
         assertEquals("Column 1", getColumnHidingToggle(1).getText());
 
         toggleColumnHidingToggleCaptionChange(1);
 
         getSidebarOpenButton().click();
-        assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText()
-                .toLowerCase());
+        assertEquals("column 1",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
         assertEquals("Column 1 caption 0", getColumnHidingToggle(1).getText());
 
         toggleColumnHidingToggleCaptionChange(1);
@@ -190,8 +190,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
     public void testColumnHidingToggleCaption_settingWidgetToHeader_toggleCaptionStays() {
         toggleColumnHidable(1);
         getSidebarOpenButton().click();
-        assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText()
-                .toLowerCase());
+        assertEquals("column 1",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
         assertEquals("Column 1", getColumnHidingToggle(1).getText());
 
         selectMenuPath("Component", "Columns", "Column 1", "Header Type",
@@ -209,8 +209,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
                 "Change header caption");
 
         getSidebarOpenButton().click();
-        assertEquals("column 1 header 0", getGridElement().getHeaderCell(0, 1)
-                .getText().toLowerCase());
+        assertEquals("column 1 header 0",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
         assertEquals("Column 1 header 0", getColumnHidingToggle(1).getText());
     }
 
@@ -224,8 +224,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
                 "Change header caption");
 
         getSidebarOpenButton().click();
-        assertEquals("column 1 header 0", getGridElement().getHeaderCell(0, 1)
-                .getText().toLowerCase());
+        assertEquals("column 1 header 0",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
         assertEquals("Column 1 caption 0", getColumnHidingToggle(1).getText());
     }
 
@@ -298,7 +298,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
     }
 
     @Test
-    public void showColumnAndScrollbarWhenScrolledDownAndVisibleRowsChange() throws Exception {
+    public void showColumnAndScrollbarWhenScrolledDownAndVisibleRowsChange()
+            throws Exception {
         // Set a (un)suitable height
         selectMenuPath("Component", "Size", "HeightMode Row");
         selectMenuPath("Component", "Size", "Height by Rows", "4.33 rows");
@@ -307,7 +308,7 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
 
         // Hide all but the first 3
         getSidebarOpenButton().click();
-        for (int i=3; i < 12; i++) {
+        for (int i = 3; i < 12; i++) {
             getColumnHidingToggle(i).click();
         }
 
@@ -321,7 +322,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
         getColumnHidingToggle(3).click();
 
         // Make sure that the new column contains the data it should
-        Assert.assertEquals("(999, 3)", getGridElement().getCell(999, 3).getText());
+        Assert.assertEquals("(999, 3)",
+                getGridElement().getCell(999, 3).getText());
     }
 
     private void verifyColumnFrozen(int index) {
@@ -335,6 +337,7 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest {
     private void toggleColumnHidable(int index) {
         selectMenuPath("Component", "Columns", "Column " + index, "Hidable");
     }
+
     private void toggleAllColumnsHidable() {
         selectMenuPath("Component", "Columns", "All columns hidable");
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
index dda9c03f94..f4778eab4c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -50,8 +50,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
             "Component", "Details", "Generators", "\"Watching\"" };
     private static final String[] DETAILS_GENERATOR_PERSISTING = new String[] {
             "Component", "Details", "Generators", "Persisting" };
-    private static final String[] CHANGE_HIERARCHY = new String[] {
-            "Component", "Details", "Generators", "- Change Component" };
+    private static final String[] CHANGE_HIERARCHY = new String[] { "Component",
+            "Details", "Generators", "- Change Component" };
 
     @Before
     public void setUp() {
@@ -93,8 +93,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
         getGridElement().scroll(0);
         Thread.sleep(50);
-        assertNotNull("details should've been opened", getGridElement()
-                .getDetails(0));
+        assertNotNull("details should've been opened",
+                getGridElement().getDetails(0));
     }
 
     @Test(expected = NoSuchElementException.class)
@@ -149,8 +149,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         getGridElement().scrollToRow(0);
 
         // if this fails, it'll fail before the assertNotNull
-        assertNotNull("unexpected null details row", getGridElement()
-                .getDetails(0));
+        assertNotNull("unexpected null details row",
+                getGridElement().getDetails(0));
     }
 
     @Test
@@ -171,8 +171,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         selectMenuPath(OPEN_ALMOST_LAST_ITEM_DETAILS);
         scrollGridVerticallyTo(100000);
 
-        TestBenchElement details = getGridElement().getDetails(
-                ALMOST_LAST_INDEX);
+        TestBenchElement details = getGridElement()
+                .getDetails(ALMOST_LAST_INDEX);
         assertNotNull(details);
         assertTrue("Unexpected details content",
                 details.getText().endsWith(ALMOST_LAST_INDEX + " (0)"));
@@ -205,8 +205,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         assertEquals("One", getGridElement().getDetails(0).getText());
 
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
-        assertFalse("Details should be detached", getGridElement()
-                .isElementPresent(By.vaadin("#details[0]")));
+        assertFalse("Details should be detached",
+                getGridElement().isElementPresent(By.vaadin("#details[0]")));
 
         selectMenuPath(CHANGE_HIERARCHY);
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
@@ -225,8 +225,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
     public void swappingDetailsGenerators_shownDetails() {
         selectMenuPath(DETAILS_GENERATOR_PERSISTING);
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
-        assertTrue("Details should contain 'One' at first", getGridElement()
-                .getDetails(0).getText().contains("One"));
+        assertTrue("Details should contain 'One' at first",
+                getGridElement().getDetails(0).getText().contains("One"));
 
         selectMenuPath(DETAILS_GENERATOR_WATCHING);
         assertFalse(
@@ -251,8 +251,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         scrollGridVerticallyTo(0);
 
         assertFalse("Got some errors", $(NotificationElement.class).exists());
-        assertNotNull("Could not find a details", getGridElement()
-                .getDetails(0));
+        assertNotNull("Could not find a details",
+                getGridElement().getDetails(0));
     }
 
     @Test
@@ -263,8 +263,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         scrollGridVerticallyTo(1000);
 
         assertFalse("Got some errors", $(NotificationElement.class).exists());
-        assertNotNull("Could not find a details", getGridElement()
-                .getDetails(0));
+        assertNotNull("Could not find a details",
+                getGridElement().getDetails(0));
     }
 
     @Test
@@ -276,8 +276,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         scrollGridVerticallyTo(0);
 
         assertFalse("Got some errors", $(NotificationElement.class).exists());
-        assertNotNull("Could not find a details", getGridElement()
-                .getDetails(0));
+        assertNotNull("Could not find a details",
+                getGridElement().getDetails(0));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
index 8340c40b4b..34d46eae78 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -59,8 +59,8 @@ public class GridEditorBufferedTest extends GridEditorTest {
         new Actions(getDriver()).sendKeys(Keys.ENTER).perform();
 
         assertEditorClosed();
-        assertEquals("(100, 0) changed", getGridElement().getCell(100, 0)
-                .getText());
+        assertEquals("(100, 0) changed",
+                getGridElement().getCell(100, 0).getText());
     }
 
     @Test
@@ -101,13 +101,13 @@ public class GridEditorBufferedTest extends GridEditorTest {
 
         textField.sendKeys(" changed");
 
-        WebElement saveButton = getEditor().findElement(
-                By.className("v-grid-editor-save"));
+        WebElement saveButton = getEditor()
+                .findElement(By.className("v-grid-editor-save"));
 
         saveButton.click();
 
-        assertEquals("(100, 0) changed", getGridElement().getCell(100, 0)
-                .getText());
+        assertEquals("(100, 0) changed",
+                getGridElement().getCell(100, 0).getText());
     }
 
     @Test
@@ -125,8 +125,8 @@ public class GridEditorBufferedTest extends GridEditorTest {
 
         selectMenuPath("Component", "Editor", "Save");
 
-        assertEquals("(100, 0) changed", getGridElement().getCell(100, 0)
-                .getText());
+        assertEquals("(100, 0) changed",
+                getGridElement().getCell(100, 0).getText());
     }
 
     @Test
@@ -151,7 +151,8 @@ public class GridEditorBufferedTest extends GridEditorTest {
 
     private void makeInvalidEdition() {
         selectMenuPath(EDIT_ITEM_5);
-        assertFalse(logContainsText("Exception occured, java.lang.IllegalStateException"));
+        assertFalse(logContainsText(
+                "Exception occured, java.lang.IllegalStateException"));
 
         GridEditorElement editor = getGridElement().getEditor();
 
@@ -197,8 +198,8 @@ public class GridEditorBufferedTest extends GridEditorTest {
                 GridConstants.DEFAULT_SAVE_CAPTION, getSaveButton().getText());
         assertEquals("Cancel button caption should've been \""
                 + GridConstants.DEFAULT_CANCEL_CAPTION + "\" to begin with",
-                GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton()
-                        .getText());
+                GridConstants.DEFAULT_CANCEL_CAPTION,
+                getCancelButton().getText());
 
         selectMenuPath("Component", "Editor", "Change save caption");
         assertNotEquals(
@@ -211,8 +212,8 @@ public class GridEditorBufferedTest extends GridEditorTest {
         selectMenuPath(EDIT_ITEM_5);
         assertNotEquals(
                 "Cancel button caption should've changed while editor is closed",
-                GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton()
-                        .getText());
+                GridConstants.DEFAULT_CANCEL_CAPTION,
+                getCancelButton().getText());
     }
 
     @Test(expected = NoSuchElementException.class)
@@ -288,11 +289,12 @@ public class GridEditorBufferedTest extends GridEditorTest {
     public void testProgrammaticOpeningDisabledWhenOpen() {
         selectMenuPath(EDIT_ITEM_5);
         assertEditorOpen();
-        assertEquals("Editor should edit row 5", "(5, 0)", getEditorWidgets()
-                .get(0).getAttribute("value"));
+        assertEquals("Editor should edit row 5", "(5, 0)",
+                getEditorWidgets().get(0).getAttribute("value"));
 
         selectMenuPath(EDIT_ITEM_100);
-        boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException");
+        boolean thrown = logContainsText(
+                "Exception occured, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
 
         assertEditorOpen();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
index 0cba2ce34b..f7fc4460d3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -70,7 +70,8 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
         selectMenuPath(TOGGLE_EDIT_ENABLED);
         selectMenuPath(EDIT_ITEM_5);
         assertEditorClosed();
-        boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException");
+        boolean thrown = logContainsText(
+                "Exception occured, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
@@ -79,7 +80,8 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
         selectMenuPath(EDIT_ITEM_5);
         selectMenuPath(TOGGLE_EDIT_ENABLED);
         assertEditorOpen();
-        boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException");
+        boolean thrown = logContainsText(
+                "Exception occured, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
index c4d1893875..c623d9abc5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -62,7 +62,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
         selectMenuPath(EDIT_ITEM_5);
         assertEditorOpen();
         selectMenuPath(TOGGLE_EDITOR_BUFFERED);
-        boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException");
+        boolean thrown = logContainsText(
+                "Exception occured, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
@@ -110,8 +111,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
 
             firstFieldValue = getEditorWidgets().get(0).getAttribute("value");
             int row = 100 - i;
-            assertEquals("Editor should move to row " + row,
-                    "(" + row + ", 0)", firstFieldValue);
+            assertEquals("Editor should move to row " + row, "(" + row + ", 0)",
+                    firstFieldValue);
         }
     }
 
@@ -156,8 +157,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
 
         assertEditorOpen();
 
-        WebElement editorFooter = getEditor().findElement(
-                By.className("v-grid-editor-footer"));
+        WebElement editorFooter = getEditor()
+                .findElement(By.className("v-grid-editor-footer"));
 
         assertTrue("Editor footer should not be visible when there's no error",
                 editorFooter.getCssValue("display").equalsIgnoreCase("none"));
@@ -236,8 +237,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
     public void testProgrammaticOpeningWhenOpen() {
         selectMenuPath(EDIT_ITEM_5);
         assertEditorOpen();
-        assertEquals("Editor should edit row 5", "(5, 0)", getEditorWidgets()
-                .get(0).getAttribute("value"));
+        assertEquals("Editor should edit row 5", "(5, 0)",
+                getEditorWidgets().get(0).getAttribute("value"));
 
         selectMenuPath(EDIT_ITEM_100);
         assertEditorOpen();
@@ -282,13 +283,12 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
         editor.click(5, 5);
         editor.sendKeys("Foo", Keys.ENTER);
 
-        assertEquals("Editor did not move.", "(6, 0)", getGridElement()
-                .getEditor().getField(0).getAttribute("value"));
-        assertEquals("Editor field value did not update from server.",
-                "(6, 2)", getGridElement().getEditor().getField(2)
-                        .getAttribute("value"));
+        assertEquals("Editor did not move.", "(6, 0)",
+                getGridElement().getEditor().getField(0).getAttribute("value"));
+        assertEquals("Editor field value did not update from server.", "(6, 2)",
+                getGridElement().getEditor().getField(2).getAttribute("value"));
 
-        assertEquals("Edited value was not saved.", "Foo", getGridElement()
-                .getCell(5, 2).getText());
+        assertEquals("Edited value was not saved.", "Foo",
+                getGridElement().getCell(5, 2).getText());
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
index ca9d78409c..408c837e76 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 /**
  * Test for server-side Grid focus features.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -62,8 +62,8 @@ public class GridFocusTest extends GridBasicFeaturesTest {
     public void testProgrammaticFocus() {
         selectMenuPath("Component", "State", "Set focus");
 
-        assertTrue("Grid cell (0, 0) should be focused", getGridElement()
-                .getCell(0, 0).isFocused());
+        assertTrue("Grid cell (0, 0) should be focused",
+                getGridElement().getCell(0, 0).isFocused());
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
index 57fc56c995..f7eeff44ae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,8 @@ public class GridItemClickTest extends GridBasicFeaturesTest {
         GridCellElement cell = getGridElement().getCell(3, 2);
         new Actions(getDriver()).moveToElement(cell).click().perform();
 
-        assertTrue("No click in log", logContainsText(itemClickOn(3, 2, false)));
+        assertTrue("No click in log",
+                logContainsText(itemClickOn(3, 2, false)));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
index 6724a7bb49..aacb32c982 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,13 +35,13 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         openTestURL();
 
         GridElement grid = getGridElement();
-        assertTrue("Body cell 0, 0 is not focused on init.", grid.getCell(0, 0)
-                .isFocused());
+        assertTrue("Body cell 0, 0 is not focused on init.",
+                grid.getCell(0, 0).isFocused());
         grid.getCell(5, 2).click();
-        assertFalse("Body cell 0, 0 was still focused after clicking", grid
-                .getCell(0, 0).isFocused());
-        assertTrue("Body cell 5, 2 is not focused after clicking", grid
-                .getCell(5, 2).isFocused());
+        assertFalse("Body cell 0, 0 was still focused after clicking",
+                grid.getCell(0, 0).isFocused());
+        assertTrue("Body cell 5, 2 is not focused after clicking",
+                grid.getCell(5, 2).isFocused());
     }
 
     @Test
@@ -49,11 +49,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         openTestURL();
 
         GridElement grid = getGridElement();
-        assertTrue("Body cell 0, 0 is not focused on init.", grid.getCell(0, 0)
-                .isFocused());
+        assertTrue("Body cell 0, 0 is not focused on init.",
+                grid.getCell(0, 0).isFocused());
         grid.getHeaderCell(0, 3).click();
-        assertFalse("Body cell 0, 0 is focused after click on header.", grid
-                .getCell(0, 0).isFocused());
+        assertFalse("Body cell 0, 0 is focused after click on header.",
+                grid.getCell(0, 0).isFocused());
         assertTrue("Header cell 0, 3 is not focused after click on header.",
                 grid.getHeaderCell(0, 3).isFocused());
     }
@@ -82,8 +82,8 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
                 isElementPresent(By.xpath("//td[text() = '(0, 0)']")));
         assertTrue("Cell focus is not visible",
                 isElementPresent(By.xpath("//td[text() = '(" + i + ", 0)']")));
-        assertTrue("Body cell " + i + ", 1 is not focused", grid.getCell(i, 1)
-                .isFocused());
+        assertTrue("Body cell " + i + ", 1 is not focused",
+                grid.getCell(i, 1).isFocused());
     }
 
     @Test
@@ -96,11 +96,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
                 .perform();
         grid.scrollToRow(280);
 
-        assertTrue("Header cell is not focused.", grid.getHeaderCell(0, 7)
-                .isFocused());
+        assertTrue("Header cell is not focused.",
+                grid.getHeaderCell(0, 7).isFocused());
         new Actions(getDriver()).sendKeys(Keys.ARROW_DOWN).perform();
-        assertTrue("Body cell 280, 7 is not focused", grid.getCell(280, 7)
-                .isFocused());
+        assertTrue("Body cell 280, 7 is not focused",
+                grid.getCell(280, 7).isFocused());
     }
 
     @Test
@@ -113,11 +113,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         grid.scrollToRow(300);
         grid.getFooterCell(0, 2).click();
 
-        assertTrue("Footer cell does not have focus.", grid.getFooterCell(0, 2)
-                .isFocused());
+        assertTrue("Footer cell does not have focus.",
+                grid.getFooterCell(0, 2).isFocused());
         new Actions(getDriver()).sendKeys(Keys.ARROW_UP).perform();
-        assertTrue("Body cell 300, 2 does not have focus.", grid
-                .getCell(300, 2).isFocused());
+        assertTrue("Body cell 300, 2 does not have focus.",
+                grid.getCell(300, 2).isFocused());
     }
 
     @Test
@@ -127,15 +127,15 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         GridElement grid = getGridElement();
         grid.getCell(10, 2).click();
 
-        assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2)
-                .isFocused());
+        assertTrue("Body cell 10, 2 does not have focus",
+                grid.getCell(10, 2).isFocused());
         new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB)
                 .keyUp(Keys.SHIFT).perform();
         assertTrue("Header cell 0, 2 does not have focus",
                 grid.getHeaderCell(0, 2).isFocused());
         new Actions(getDriver()).sendKeys(Keys.TAB).perform();
-        assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2)
-                .isFocused());
+        assertTrue("Body cell 10, 2 does not have focus",
+                grid.getCell(10, 2).isFocused());
 
         // Navigate out of the Grid and try to navigate with arrow keys.
         new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB)
@@ -154,15 +154,15 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         GridElement grid = getGridElement();
         grid.getCell(10, 2).click();
 
-        assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2)
-                .isFocused());
+        assertTrue("Body cell 10, 2 does not have focus",
+                grid.getCell(10, 2).isFocused());
         new Actions(getDriver()).sendKeys(Keys.TAB).perform();
         assertTrue("Footer cell 0, 2 does not have focus",
                 grid.getFooterCell(0, 2).isFocused());
         new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB)
                 .keyUp(Keys.SHIFT).perform();
-        assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2)
-                .isFocused());
+        assertTrue("Body cell 10, 2 does not have focus",
+                grid.getCell(10, 2).isFocused());
 
         // Navigate out of the Grid and try to navigate with arrow keys.
         new Actions(getDriver()).sendKeys(Keys.TAB).sendKeys(Keys.TAB)
@@ -178,13 +178,12 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         getGridElement().getCell(100, 2).click();
 
         new Actions(getDriver()).sendKeys(Keys.HOME).perform();
-        assertTrue("First row is not visible", getGridElement().getCell(0, 2)
-                .isDisplayed());
+        assertTrue("First row is not visible",
+                getGridElement().getCell(0, 2).isDisplayed());
 
         new Actions(getDriver()).sendKeys(Keys.END).perform();
-        assertTrue("Last row cell not visible",
-                getGridElement().getCell(GridBasicFeatures.ROWS - 1, 2)
-                        .isDisplayed());
+        assertTrue("Last row cell not visible", getGridElement()
+                .getCell(GridBasicFeatures.ROWS - 1, 2).isDisplayed());
     }
 
     @Test
@@ -215,8 +214,8 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
     }
 
     private void checkFocusedCell(int row, int column, int rowTolerance) {
-        WebElement focusedCell = getGridElement().findElement(
-                By.className("v-grid-cell-focused"));
+        WebElement focusedCell = getGridElement()
+                .findElement(By.className("v-grid-cell-focused"));
         String cellContents = focusedCell.getText();
         String[] rowAndCol = cellContents.replaceAll("[()\\s]", "").split(",");
         int focusedRow = Integer.parseInt(rowAndCol[0].trim());
@@ -224,8 +223,9 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
         // rowTolerance is the maximal allowed difference from the expected
         // focused row. It is required because scrolling using page up/down
         // may not move the position by exactly the visible height of the grid.
-        assertTrue("The wrong cell is focused. Expected (" + row + "," + column
-                + "), was " + cellContents,
+        assertTrue(
+                "The wrong cell is focused. Expected (" + row + "," + column
+                        + "), was " + cellContents,
                 column == focusedColumn
                         && Math.abs(row - focusedRow) <= rowTolerance);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
index a3cf5872f0..344c97a4f6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -58,9 +58,8 @@ public class GridMultiSortingTest extends GridBasicFeaturesTest {
 
         prev = getGridElement().getCell(0, 0).getText();
         for (int i = 1; i <= 6; ++i) {
-            assertTrue(
-                    "Grid is not sorted by column 0.",
-                    prev.compareTo(getGridElement().getCell(i, 0).getText()) < 0);
+            assertTrue("Grid is not sorted by column 0.", prev
+                    .compareTo(getGridElement().getCell(i, 0).getText()) < 0);
         }
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
index f91f93c5d5..899edd2e4a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
index 9313b40770..e394be36de 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,8 +33,8 @@ public class GridScrollTest extends GridBasicFeaturesTest {
                 getLogRow(1).equals("0. Requested items 0 - 40"));
         // Client response varies a bit between browsers as different amount of
         // rows is cached.
-        assertTrue("First row request from client not found", getLogRow(0)
-                .startsWith("1. Requested items 0 - "));
+        assertTrue("First row request from client not found",
+                getLogRow(0).startsWith("1. Requested items 0 - "));
 
         selectMenuPath("Component", "Size", "HeightMode Row");
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
index 44a632bc49..bd2380ee45 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         setSelectionModelMulti();
 
-        assertFalse("row shouldn't start out as selected", getRow(0)
-                .isSelected());
+        assertFalse("row shouldn't start out as selected",
+                getRow(0).isSelected());
         toggleFirstRowSelection();
         assertTrue("row should become selected", getRow(0).isSelected());
         toggleFirstRowSelection();
@@ -54,8 +54,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         setSelectionModelMulti();
 
-        assertFalse("row shouldn't start out as selected", getRow(0)
-                .isSelected());
+        assertFalse("row shouldn't start out as selected",
+                getRow(0).isSelected());
         toggleFirstRowSelection();
         assertTrue("row should become selected", getRow(0).isSelected());
 
@@ -72,8 +72,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         setSelectionModelMulti();
 
-        assertFalse("row shouldn't start out as selected", getRow(0)
-                .isSelected());
+        assertFalse("row shouldn't start out as selected",
+                getRow(0).isSelected());
 
         scrollGridVerticallyTo(10000); // make sure the row is out of cache
         toggleFirstRowSelection();
@@ -92,16 +92,17 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         setSelectionModelMulti();
 
-        assertFalse("row shouldn't start out as selected", getRow(0)
-                .isSelected());
+        assertFalse("row shouldn't start out as selected",
+                getRow(0).isSelected());
 
         scrollGridVerticallyTo(10000); // make sure the row is out of cache
         toggleFirstRowSelection();
         toggleFirstRowSelection();
 
         scrollGridVerticallyTo(0); // make sure the row is out of cache
-        assertFalse("row shouldn't be selected when scrolling "
-                + "back into view", getRow(0).isSelected());
+        assertFalse(
+                "row shouldn't be selected when scrolling " + "back into view",
+                getRow(0).isSelected());
     }
 
     @Test
@@ -110,8 +111,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         setSelectionModelSingle();
 
         GridElement grid = getGridElement();
-        assertFalse("First row was selected from start", grid.getRow(0)
-                .isSelected());
+        assertFalse("First row was selected from start",
+                grid.getRow(0).isSelected());
         toggleFirstRowSelection();
         assertTrue("First row was not selected.", getRow(0).isSelected());
         assertTrue("Selection event was not correct",
@@ -151,20 +152,20 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         grid.getCell(3, 1).click();
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not selected with space key.", grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not selected with space key.",
+                grid.getRow(3).isSelected());
 
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not deselected with space key.", !grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not deselected with space key.",
+                !grid.getRow(3).isSelected());
 
         grid.scrollToRow(500);
 
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not selected with space key.", grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not selected with space key.",
+                grid.getRow(3).isSelected());
     }
 
     @Test
@@ -175,25 +176,25 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         GridElement grid = getGridElement();
         grid.getCell(3, 1).click();
 
-        assertTrue("Grid row 3 was not selected with clicking.", grid.getRow(3)
-                .isSelected());
+        assertTrue("Grid row 3 was not selected with clicking.",
+                grid.getRow(3).isSelected());
 
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not deselected with space key.", !grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not deselected with space key.",
+                !grid.getRow(3).isSelected());
 
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not selected with space key.", grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not selected with space key.",
+                grid.getRow(3).isSelected());
 
         grid.scrollToRow(500);
 
         new Actions(getDriver()).sendKeys(Keys.SPACE).perform();
 
-        assertTrue("Grid row 3 was not deselected with space key.", !grid
-                .getRow(3).isSelected());
+        assertTrue("Grid row 3 was not deselected with space key.",
+                !grid.getRow(3).isSelected());
     }
 
     @Test
@@ -207,13 +208,13 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         header.findElement(By.tagName("input")).click();
 
         for (int i = 0; i < GridBasicFeatures.ROWS; i += 100) {
-            assertTrue("Row " + i + " was not selected.", getGridElement()
-                    .getRow(i).isSelected());
+            assertTrue("Row " + i + " was not selected.",
+                    getGridElement().getRow(i).isSelected());
         }
 
         header.findElement(By.tagName("input")).click();
-        assertFalse("Row 100 was still selected", getGridElement().getRow(100)
-                .isSelected());
+        assertFalse("Row 100 was still selected",
+                getGridElement().getRow(100).isSelected());
     }
 
     @Test
@@ -227,14 +228,13 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         getGridElement().getHeaderCell(0, 1).click();
 
-        WebElement selectionBox = getGridElement().getCell(4, 0).findElement(
-                By.tagName("input"));
+        WebElement selectionBox = getGridElement().getCell(4, 0)
+                .findElement(By.tagName("input"));
         selectionBox.click();
         selectionBox.click();
 
-        assertFalse(
-                "Exception occured on row reselection.",
-                logContainsText("Exception occured, java.lang.IllegalStateException: No item id for key 101 found."));
+        assertFalse("Exception occured on row reselection.", logContainsText(
+                "Exception occured, java.lang.IllegalStateException: No item id for key 101 found."));
     }
 
     @Test
@@ -261,8 +261,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         // Single selection model shouldn't have selection column to begin with
         assertFalse(
                 "Selection columnn shouldn't have been in grid for Single Selection Model",
-                getGridElement().getCell(0, 1).isElementPresent(
-                        By.tagName("input")));
+                getGridElement().getCell(0, 1)
+                        .isElementPresent(By.tagName("input")));
 
         setSelectionModelNone();
         header = getGridElement().getHeaderCell(0, 0);
@@ -295,19 +295,19 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         getGridElement().getCell(5, 1).click();
         getGridElement().getCell(5, 1).click();
-        assertFalse("Row should be not selected after two clicks", getRow(5)
-                .isSelected());
+        assertFalse("Row should be not selected after two clicks",
+                getRow(5).isSelected());
 
         selectMenuPath("Component", "State", "Single select allow deselect");
         getGridElement().getCell(5, 1).click();
         getGridElement().getCell(5, 1).click();
-        assertTrue("Row should be selected after two clicks", getRow(5)
-                .isSelected());
+        assertTrue("Row should be selected after two clicks",
+                getRow(5).isSelected());
 
         selectMenuPath("Component", "State", "Single select allow deselect");
         getGridElement().getCell(5, 1).click();
-        assertFalse("Row should be not selected after another click", getRow(5)
-                .isSelected());
+        assertFalse("Row should be not selected after another click",
+                getRow(5).isSelected());
 
         // Also verify that state is updated together with the model
         setSelectionModelNone();
@@ -317,8 +317,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         getGridElement().getCell(5, 1).click();
         getGridElement().getCell(5, 1).click();
 
-        assertTrue("Row should stay selected after two clicks", getRow(5)
-                .isSelected());
+        assertTrue("Row should stay selected after two clicks",
+                getRow(5).isSelected());
     }
 
     @Test
@@ -328,12 +328,11 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
         setSelectionModelSingle();
 
         getGridElement().getCell(5, 1).click();
-        assertTrue("Row should be selected after clicking", getRow(5)
-                .isSelected());
+        assertTrue("Row should be selected after clicking",
+                getRow(5).isSelected());
 
         setSelectionModelNone();
-        assertFalse(
-                "Row should not be selected after changing selection model",
+        assertFalse("Row should not be selected after changing selection model",
                 getRow(5).isSelected());
     }
 
@@ -393,7 +392,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
 
         assertFalse(
                 "Unexpected NullPointerException when removing selected rows",
-                logContainsText("Exception occured, java.lang.NullPointerException: null"));
+                logContainsText(
+                        "Exception occured, java.lang.NullPointerException: null"));
     }
 
     private void waitUntilCheckBoxValue(final WebElement checkBoxElememnt,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
index 238b470feb..bca00690af 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
index c23e5d1f11..cc56958626 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -86,8 +86,10 @@ public class GridSortingTest extends GridBasicFeaturesTest {
             row += "9";
             String expected = "(" + row + ", 0)";
             String cellValue = getGridElement().getCell(i, 0).getText();
-            assertEquals("Grid is not sorted by Column 9 "
-                    + "using descending direction.", expected, cellValue);
+            assertEquals(
+                    "Grid is not sorted by Column 9 "
+                            + "using descending direction.",
+                    expected, cellValue);
         }
 
         // Column 10 is random numbers from Random with seed 13334
@@ -100,10 +102,10 @@ public class GridSortingTest extends GridBasicFeaturesTest {
         assertColumnsAreSortedAs(_(10, 1, SortDirection.ASCENDING));
 
         for (int i = 0; i < 5; ++i) {
-            Integer firstRow = Integer.valueOf(getGridElement().getCell(i + 1,
-                    10).getText());
-            Integer secondRow = Integer.valueOf(getGridElement().getCell(i, 10)
-                    .getText());
+            Integer firstRow = Integer
+                    .valueOf(getGridElement().getCell(i + 1, 10).getText());
+            Integer secondRow = Integer
+                    .valueOf(getGridElement().getCell(i, 10).getText());
             assertGreater("Grid is not sorted by Column 10 using"
                     + " ascending direction", firstRow, secondRow);
 
@@ -114,8 +116,8 @@ public class GridSortingTest extends GridBasicFeaturesTest {
         sortBy("Column 7, DESC");
         for (int i = 0; i < 3; ++i) {
             String expected = "(" + i + ", 0)";
-            String cellContent = getGridElement().getCell(
-                    GridBasicFeatures.ROWS - (i + 1), 0).getText();
+            String cellContent = getGridElement()
+                    .getCell(GridBasicFeatures.ROWS - (i + 1), 0).getText();
             assertEquals("Grid is not sorted by Column 7 using "
                     + "descending direction", expected, cellContent);
         }
@@ -167,8 +169,8 @@ public class GridSortingTest extends GridBasicFeaturesTest {
         assertColumnsAreSortedAs(_(10, 1, SortDirection.ASCENDING));
 
         for (int i = 0; i < 5; ++i) {
-            Integer firstRow = Integer.valueOf(grid.getCell(i + 1, 10)
-                    .getText());
+            Integer firstRow = Integer
+                    .valueOf(grid.getCell(i + 1, 10).getText());
             Integer secondRow = Integer.valueOf(grid.getCell(i, 10).getText());
             assertGreater(
                     "Grid is not sorted by Column 10 using ascending direction",
@@ -190,7 +192,8 @@ public class GridSortingTest extends GridBasicFeaturesTest {
             assertEquals(
                     "Grid is not sorted by Column 7 using descending direction",
                     "(" + i + ", 0)",
-                    grid.getCell(GridBasicFeatures.ROWS - (i + 1), 0).getText());
+                    grid.getCell(GridBasicFeatures.ROWS - (i + 1), 0)
+                            .getText());
         }
 
     }
@@ -377,9 +380,8 @@ public class GridSortingTest extends GridBasicFeaturesTest {
 
     private void assertLastSortIsUserOriginated(boolean isUserOriginated) {
         // Find a message in the log
-        List<WebElement> userOriginatedMessages = getDriver()
-                .findElements(
-                        By.xpath("//div[@id='Log']//*[contains(text(),'SortEvent: isUserOriginated')]"));
+        List<WebElement> userOriginatedMessages = getDriver().findElements(By
+                .xpath("//div[@id='Log']//*[contains(text(),'SortEvent: isUserOriginated')]"));
 
         Collections.sort(userOriginatedMessages, new Comparator<WebElement>() {
             @Override
@@ -388,8 +390,8 @@ public class GridSortingTest extends GridBasicFeaturesTest {
             }
         });
 
-        String newestEntry = userOriginatedMessages.get(
-                userOriginatedMessages.size() - 1).getText();
+        String newestEntry = userOriginatedMessages
+                .get(userOriginatedMessages.size() - 1).getText();
 
         String[] parts = newestEntry.split(" ");
         boolean wasUserOriginated = Boolean
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
index 2fbaa58cab..4fda9d2086 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,8 +64,8 @@ public class GridStaticSectionComponentTest extends GridBasicFeaturesTest {
         assertTrue("No notifications should've been shown",
                 !$(NotificationElement.class).exists());
         assertEquals("Header should've been reverted back to text header",
-                "text header", getGridElement().getHeaderCell(0, 1).getText()
-                        .toLowerCase());
+                "text header",
+                getGridElement().getHeaderCell(0, 1).getText().toLowerCase());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index 7c50ae5d6e..f8a4bd3e95 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,8 +49,8 @@ public class GridStructureTest extends GridBasicFeaturesTest {
             assertFalse(isElementPresent(NotificationElement.class));
         }
 
-        assertEquals("Headers still visible.", 0, getGridHeaderRowCells()
-                .size());
+        assertEquals("Headers still visible.", 0,
+                getGridHeaderRowCells().size());
     }
 
     @Test
@@ -58,16 +58,16 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         setDebug(true);
         openTestURL();
 
-        assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText()
-                .toLowerCase());
+        assertEquals("column 0",
+                getGridElement().getHeaderCell(0, 0).getText().toLowerCase());
         selectMenuPath("Component", "Columns", "Column 0", "Add / Remove");
-        assertEquals("column 1", getGridElement().getHeaderCell(0, 0).getText()
-                .toLowerCase());
+        assertEquals("column 1",
+                getGridElement().getHeaderCell(0, 0).getText().toLowerCase());
         selectMenuPath("Component", "Columns", "Column 0", "Add / Remove");
 
         // Column 0 is now the last column in Grid.
-        assertEquals("Unexpected column content", "(0, 0)", getGridElement()
-                .getCell(0, 11).getText());
+        assertEquals("Unexpected column content", "(0, 0)",
+                getGridElement().getCell(0, 11).getText());
     }
 
     @Test
@@ -316,9 +316,10 @@ public class GridStructureTest extends GridBasicFeaturesTest {
             try {
                 GridCellElement cell = getGridElement().getCell(row, 1);
                 foundElements = true;
-                assertTrue("Unexpected cell contents. "
-                        + "Did the ItemSetChange work after all?", cell
-                        .getText().startsWith("(23"));
+                assertTrue(
+                        "Unexpected cell contents. "
+                                + "Did the ItemSetChange work after all?",
+                        cell.getText().startsWith("(23"));
             } catch (NoSuchElementException e) {
                 assertTrue("No rows were found", foundElements);
                 return;
@@ -357,10 +358,11 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         // Compare with reversed order
         for (int i = 0; i < gridData.length; ++i) {
             final int column = gridData.length - 1 - i;
-            final String newText = grid.getCell(0, column).getAttribute(
-                    "innerHTML");
-            assertEquals("Grid contained unexpected values. (0, " + column
-                    + ")", gridData[i], newText);
+            final String newText = grid.getCell(0, column)
+                    .getAttribute("innerHTML");
+            assertEquals(
+                    "Grid contained unexpected values. (0, " + column + ")",
+                    gridData[i], newText);
         }
     }
 
@@ -369,10 +371,11 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         setDebug(true);
         openTestURL();
 
-        assertNotEquals("property value", getGridElement().getCell(0, 0)
-                .getText());
+        assertNotEquals("property value",
+                getGridElement().getCell(0, 0).getText());
         selectMenuPath("Component", "Properties", "Prepend property");
-        assertEquals("property value", getGridElement().getCell(0, 0).getText());
+        assertEquals("property value",
+                getGridElement().getCell(0, 0).getText());
     }
 
     @Test
@@ -380,20 +383,20 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         openTestURL();
 
         assertEquals("(0, 0)", getGridElement().getCell(0, 0).getText());
-        assertNotEquals("property value", getGridElement().getCell(0, 0)
-                .getText());
+        assertNotEquals("property value",
+                getGridElement().getCell(0, 0).getText());
 
         selectMenuPath("Component", "Properties", "Prepend property");
         selectMenuPath("Component", "Properties", "Prepend property");
 
-        assertNotEquals("property value", getGridElement().getCell(0, 0)
-                .getText());
+        assertNotEquals("property value",
+                getGridElement().getCell(0, 0).getText());
         assertEquals("(0, 0)", getGridElement().getCell(0, 0).getText());
     }
 
     private boolean verticalScrollbarIsPresent() {
-        return "scroll".equals(getGridVerticalScrollbar().getCssValue(
-                "overflow-y"));
+        return "scroll"
+                .equals(getGridVerticalScrollbar().getCssValue("overflow-y"));
     }
 
     @Test
@@ -444,7 +447,8 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         assertFalse("Error notification was present after removing all rows",
                 isElementPresent(NotificationElement.class));
 
-        assertFalse(getGridElement().isElementPresent(By.vaadin("#cell[0][0]")));
+        assertFalse(
+                getGridElement().isElementPresent(By.vaadin("#cell[0][0]")));
     }
 
     private void assertPrimaryStylename(String stylename) {
@@ -457,8 +461,8 @@ public class GridStructureTest extends GridBasicFeaturesTest {
         String hscrollStyleName = getGridElement().getHorizontalScroller()
                 .getAttribute("class");
         assertTrue(hscrollStyleName.contains(stylename + "-scroller"));
-        assertTrue(hscrollStyleName
-                .contains(stylename + "-scroller-horizontal"));
+        assertTrue(
+                hscrollStyleName.contains(stylename + "-scroller-horizontal"));
 
         String vscrollStyleName = getGridElement().getVerticalScroller()
                 .getAttribute("class");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
index f4771b9067..c72a65a20c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -45,11 +45,11 @@ public class LoadingIndicatorTest extends GridBasicFeaturesTest {
         gridElement.getCell(200, 1);
 
         // Wait for loading indicator delay
-        waitUntil(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-loading-indicator")));
+        waitUntil(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-loading-indicator")));
 
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-loading-indicator")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-loading-indicator")));
 
         // Scroll so much that more data gets fetched, but not so much that
         // missing rows are shown
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
index cdc8dc77f1..daf0c2e6d8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for TOP_CENTER and TOP_RIGHT alignments in VerticalLayout.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComponentAlignmentsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
index 0f8f717c60..74449ff163 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
index 8bbb5cfe1a..b240ad2031 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
@@ -50,7 +50,8 @@ public abstract class GridLayoutBaseTest extends MultiBrowserTest {
         }
     }
 
-    private void waitUntilColumnAndRowAreHidden(final List<WebElement> slots4x4) {
+    private void waitUntilColumnAndRowAreHidden(
+            final List<WebElement> slots4x4) {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
index 240ea4ce6f..a661dcdbc4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
index 8c753b1f5c..35678c1960 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
@@ -90,9 +90,9 @@ public class GridLayoutCellSizesUITest extends MultiBrowserTest {
 
     private void assertNotMatchesSmallHeight(int firstSlotHeight, int i,
             String id) {
-        Assert.assertNotEquals("Big slot '" + id
-                + "' matched small slots in height", firstSlotHeight,
-                getSlotHeight(i));
+        Assert.assertNotEquals(
+                "Big slot '" + id + "' matched small slots in height",
+                firstSlotHeight, getSlotHeight(i));
     }
 
     private int getSlotHeight(int slot) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java
index 693fdc73db..39648a5083 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java
@@ -21,8 +21,8 @@ public class GridLayoutExpandWithManyRowsTest extends SingleBrowserTest {
         // to the first N rows.
         // The tests uses rowspan=2 so one row in the DOM should be max 2 pixels
         // lower than the first row
-        List<WebElement> slots = gridlayout.findElements(By
-                .className("v-gridlayout-slot"));
+        List<WebElement> slots = gridlayout
+                .findElements(By.className("v-gridlayout-slot"));
         Assert.assertEquals(GridLayoutExpandWithManyRows.POPULATED_ROWS,
                 slots.size());
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
index 22c9c0d4e3..e70b39386e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest {
         // There should be 3 * 6px spacing (red) above the csslayout
         verifySpacingAbove(3 * 6, gridLayout, component);
 
-        CheckBoxElement spacingCheckbox = $(CheckBoxElement.class).caption(
-                "spacing").first();
+        CheckBoxElement spacingCheckbox = $(CheckBoxElement.class)
+                .caption("spacing").first();
         check(spacingCheckbox);
 
         // Spacing off, not hiding empty rows/columns
@@ -100,6 +100,7 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest {
     }
 
     private void assertHeight(WebElement component, int height, int tolerance) {
-        Assert.assertTrue(Math.abs(height - component.getSize().getHeight()) <= tolerance);
+        Assert.assertTrue(Math
+                .abs(height - component.getSize().getHeight()) <= tolerance);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
index 1913fbfdf9..e8127d07be 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
index b60aea49f0..c8abb580a3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
index 961b08002b..224a497d19 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
index 95152e1416..2c512b0552 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
@@ -9,8 +9,8 @@ import java.io.IOException;
 
 import static org.junit.Assert.*;
 
-public class MoveComponentsFromGridLayoutToInnerLayoutTest extends
-        MultiBrowserTest {
+public class MoveComponentsFromGridLayoutToInnerLayoutTest
+        extends MultiBrowserTest {
 
     @Test
     public void buttonIsMovedInsideInnerLayout() throws IOException {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
index 80f85b3b21..39301da8f6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
index ea610dccda..9626e9d537 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
@@ -29,7 +29,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest {
         }
         Assert.assertEquals(
                 "9. Argument[4][aDate] type: elemental.json.impl.JreJsonString, value: "
-                        + expected, getLogRow(idx++));
+                        + expected,
+                getLogRow(idx++));
         Assert.assertEquals(
                 "8. Argument[4][aBoolean] type: elemental.json.impl.JreJsonBoolean, value: false",
                 getLogRow(idx++));
@@ -59,7 +60,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest {
 
         Assert.assertEquals(
                 "1. Argument[0] type: elemental.json.impl.JreJsonString, value: "
-                        + expected, getLogRow(idx++));
+                        + expected,
+                getLogRow(idx++));
 
         // Component attributes
         AbstractJavaScriptComponentElement jsComponent = $(
@@ -67,8 +69,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest {
         Assert.assertEquals("Component caption", getCaption(jsComponent));
 
         // app://APP/connector/[uiid]/[cid]/[key]/[filename]
-        Assert.assertTrue(getChildText(jsComponent, 0).matches(
-                "4. Url: .*/run/APP/connector/0/\\d+/test"));
+        Assert.assertTrue(getChildText(jsComponent, 0)
+                .matches("4. Url: .*/run/APP/connector/0/\\d+/test"));
         Assert.assertEquals("3. State message: Second state message",
                 getChildText(jsComponent, 1));
         Assert.assertEquals("2. State message: First state message",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
index 3530eb1e16..df43346cf2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
index 4009365814..b88c688ce5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,14 +42,14 @@ public class JavaScriptPreloadingTest extends MultiBrowserTest {
         openTestURL();
 
         try {
-            new WebDriverWait(driver, 10).until(ExpectedConditions
-                    .alertIsPresent());
+            new WebDriverWait(driver, 10)
+                    .until(ExpectedConditions.alertIsPresent());
             Alert alert = driver.switchTo().alert();
             assertEquals("First", alert.getText());
             alert.accept();
 
-            new WebDriverWait(driver, 10).until(ExpectedConditions
-                    .alertIsPresent());
+            new WebDriverWait(driver, 10)
+                    .until(ExpectedConditions.alertIsPresent());
             alert = driver.switchTo().alert();
             assertEquals("Second", alert.getText());
             alert.accept();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
index 92ebc3a335..2094560cea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java b/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java
index 7314ce4093..21f283ee31 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java
index 36606b9972..79ddefd3d3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,10 +53,12 @@ public class LabelTooltipTest extends MultiBrowserTest {
 
     private void assertTooltips() throws IOException {
         $(LabelElement.class).get(2).showTooltip();
-        Assert.assertEquals("Default tooltip content", getTooltipElement()
-                .getText());
+        Assert.assertEquals("Default tooltip content",
+                getTooltipElement().getText());
 
-        /* Some cases tooltip doesn't disappear without some extra mouse events */
+        /*
+         * Some cases tooltip doesn't disappear without some extra mouse events
+         */
         new Actions(getDriver()).moveByOffset(100, -40).perform();
         new Actions(getDriver()).moveToElement($(LabelElement.class).get(1))
                 .click().perform();
@@ -65,8 +67,8 @@ public class LabelTooltipTest extends MultiBrowserTest {
         Assert.assertEquals(
                 "Error inside tooltip together with the regular tooltip message.",
                 getTooltipErrorElement().getText());
-        Assert.assertEquals("Default tooltip content", getTooltipElement()
-                .getText());
+        Assert.assertEquals("Default tooltip content",
+                getTooltipElement().getText());
 
         /* Visual comparison */
         compareScreen("tooltipVisible");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
index 09d19034e6..e2d09f1773 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,19 +25,19 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to make sure that there is no any empty space (in Google Chrome) on page
  * after expanded component (#12672)
- * 
+ *
  * Layout:
- * 
+ *
  * [ Panel (auto x auto) [ Grid (auto x auto) ]
- * 
+ *
  * AnyComponent (100% x 100%)
- * 
+ *
  * <HERE SHOULD NOT BE ANY EMPTY SPACE> ]
- * 
+ *
  * @author Vaadin Ltd
  */
-public class EmptySpaceOnPageAfterExpandedComponentTest extends
-        MultiBrowserTest {
+public class EmptySpaceOnPageAfterExpandedComponentTest
+        extends MultiBrowserTest {
 
     @Test
     public void testNoEmptySpaceOnPageAfterExpandedComponent() {
@@ -49,8 +49,8 @@ public class EmptySpaceOnPageAfterExpandedComponentTest extends
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
-                int expandedElementBottom = expandedElement.getLocation()
-                        .getY() + expandedElement.getSize().getHeight();
+                int expandedElementBottom = expandedElement.getLocation().getY()
+                        + expandedElement.getSize().getHeight();
                 int containerElementBottom = containerElement.getLocation()
                         .getY() + containerElement.getSize().getHeight();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
index dd694995f1..bef940b060 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,8 +53,8 @@ public class ListSelectAddRemoveItemsTest extends SingleBrowserTest {
     }
 
     private void assertOptions(String... options) {
-        Assert.assertEquals(Arrays.asList(options), $(ListSelectElement.class)
-                .first().getOptions());
+        Assert.assertEquals(Arrays.asList(options),
+                $(ListSelectElement.class).first().getOptions());
     }
 
     private void click(String caption) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
index 97b475e092..7d3d6fc17e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
index a13482d175..8b8c1fa6ca 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,15 +28,15 @@ import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
 
-public class ListSelectPushSelectionChangesTest extends
-        SingleBrowserTestPhantomJS2 {
+public class ListSelectPushSelectionChangesTest
+        extends SingleBrowserTestPhantomJS2 {
     @Test
     public void testMultiSelectBehavior() {
         openTestURL();
 
         Assert.assertEquals(
-                "Should have null item + 3 options in single selection mode",
-                4, getListSelect().getOptions().size());
+                "Should have null item + 3 options in single selection mode", 4,
+                getListSelect().getOptions().size());
 
         $(OptionGroupElement.class).caption("Mode").first()
                 .selectByText("Multi");
@@ -124,7 +124,8 @@ public class ListSelectPushSelectionChangesTest extends
 
     private List<WebElement> getSelectedOptions() {
         ListSelectElement listSelect = getListSelect();
-        Select select = new Select(listSelect.findElement(By.tagName("select")));
+        Select select = new Select(
+                listSelect.findElement(By.tagName("select")));
         return select.getAllSelectedOptions();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java
index 5f5e6c8abc..5c1aa847a5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Test for top level menu item which should close its sub-menus each time when
  * it's clicked. Also it checks sub-menu item which should not close its
  * sub-menus if they are opened on click.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuBarClickOpenedMenuTest extends MultiBrowserTest {
@@ -75,7 +75,8 @@ public class MenuBarClickOpenedMenuTest extends MultiBrowserTest {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
-                return isElementPresent(By.className(menuItemClassName)) == present;
+                return isElementPresent(
+                        By.className(menuItemClassName)) == present;
             }
 
             @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
index a4f8023ea2..e105006a6c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
@@ -10,8 +10,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 public class MenuBarNavigationMouseTest extends MultiBrowserTest {
 
     @ServerClass("com.vaadin.ui.MenuBar")
-    public static class MenuBarElement extends
-            com.vaadin.testbench.elements.MenuBarElement {
+    public static class MenuBarElement
+            extends com.vaadin.testbench.elements.MenuBarElement {
 
         public void openMenuPath(String... captions) {
             for (String c : captions) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
index b7ed88c9ca..ea8c2c2e7e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
@@ -55,8 +55,8 @@ public class MenuBarSubmenusClosingValoTest extends MultiBrowserTest {
 
         Mouse mouse = ((HasInputDevices) getDriver()).getMouse();
 
-        List<WebElement> menuItemList = driver.findElements(By
-                .className("v-menubar-menuitem"));
+        List<WebElement> menuItemList = driver
+                .findElements(By.className("v-menubar-menuitem"));
 
         mouse.click(((Locatable) menuItemList.get(0)).getCoordinates());
         waitForElementPresent(By.className("v-menubar-popup"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
index a460290ee0..56689a6284 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to see if tooltips will render in the correct locations near the edges.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuBarTooltipsNearEdgeTest extends MultiBrowserTest {
@@ -54,7 +54,7 @@ public class MenuBarTooltipsNearEdgeTest extends MultiBrowserTest {
         mouse.click(menuLocation);
         mouse.mouseMove(menuLocation, 5, -40);
         WebElement tooltip = getTooltipElement();
-        assertThat(tooltip.getLocation().x, is(lessThan(menuLocation.onPage().x
-                - tooltip.getSize().getWidth())));
+        assertThat(tooltip.getLocation().x, is(lessThan(
+                menuLocation.onPage().x - tooltip.getSize().getWidth())));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
index 4c3383c5d6..b9d2ff22e7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * This class tests the method VMenuBar.getSubPartElement(String) by using
  * Vaadin locators for finding the items of a MenuBar.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -53,8 +53,8 @@ public class MenuBarsWithNestingTest extends MultiBrowserTest {
         fileMenu.click();
         WebElement exportMenu = fileMenu.findElement(By.vaadin("#Export.."));
         exportMenu.click();
-        waitUntil(ExpectedConditions.visibilityOfElementLocated(By
-                .xpath(".//*[text() = 'As PDF...']")));
+        waitUntil(ExpectedConditions.visibilityOfElementLocated(
+                By.xpath(".//*[text() = 'As PDF...']")));
     }
 
     @Test
@@ -72,8 +72,8 @@ public class MenuBarsWithNestingTest extends MultiBrowserTest {
     public void testNestedMenuWithIcons() throws InterruptedException {
         String selection = itemNames[itemNames.length - 1];
         for (String itemName : nestedItemnames) {
-            WebElement lastMenuItem = secondMenuBar.findElement(By.vaadin("#"
-                    + selection));
+            WebElement lastMenuItem = secondMenuBar
+                    .findElement(By.vaadin("#" + selection));
             lastMenuItem.click();
             lastMenuItem.findElement(By.vaadin("#" + itemName)).click();
             waitUntil(ExpectedConditions.textToBePresentInElement(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
index e25aa664cd..24a7fb21bb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
@@ -19,8 +19,8 @@ public class MenuItemStyleRemovedTest extends MultiBrowserTest {
         $(ButtonElement.class).caption("Add styles").first().click();
 
         MenuBarElement menu = $(MenuBarElement.class).first();
-        List<WebElement> elements = menu.findElements(By
-                .className("custom-menu-item"));
+        List<WebElement> elements = menu
+                .findElements(By.className("custom-menu-item"));
         Assert.assertEquals(2, elements.size());
 
         menu.clickItem("first");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java
index 091f7be954..6bdf98eca9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to see if tooltips on menu items obscure other items on the menu.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MenuTooltipTest extends MultiBrowserTest {
@@ -47,8 +47,8 @@ public class MenuTooltipTest extends MultiBrowserTest {
     public void testToolTipDelay() throws InterruptedException {
         openTestURL();
 
-        Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class)
-                .first());
+        Coordinates elementCoordinates = getCoordinates(
+                $(MenuBarElement.class).first());
         sleep(1000);
 
         Mouse mouse = ((HasInputDevices) getDriver()).getMouse();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
index a32a611d9a..8756c715c0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
@@ -42,8 +42,8 @@ public class SpaceMenuBarNavigationTest extends MultiBrowserTest {
         menu.sendKeys(Keys.ARROW_RIGHT);
         menu.sendKeys(Keys.ENTER);
 
-        List<WebElement> captions = driver.findElements(By
-                .className("v-menubar-menuitem-caption"));
+        List<WebElement> captions = driver
+                .findElements(By.className("v-menubar-menuitem-caption"));
         boolean found = false;
 
         for (WebElement caption : captions) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
index cab2acefff..267717f784 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,14 +25,14 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to see if coordinates returned by click event on NativeButtons look
  * good. (see #14022)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NativeButtonClickTest extends MultiBrowserTest {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.tb3.MultiBrowserTest#getBrowsersToTest()
      */
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
index 37987171d2..68741dd3c1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -70,7 +70,7 @@ public class NativeButtonIconAndTextTest extends MultiBrowserTest {
      * If the button identified by 'buttonId' has an icon, asserts that the
      * alternate text of the icon matches 'expected'. "" and null are considered
      * equivalent.
-     * 
+     *
      * @param buttonId
      *            the id of the button who possibly contains an icon
      * @param expected
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
index 4e23db8eb7..cd860fcea9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class NativeSelectsAndChromeKeyboardNavigationTest extends
-        MultiBrowserTest {
+public class NativeSelectsAndChromeKeyboardNavigationTest
+        extends MultiBrowserTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
index 194b1bb64b..9f0ab83cf8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
index dc43b9d19a..d20baaf764 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Unit test class for Notification with middle left and middle right positions.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -35,12 +35,12 @@ public class MiddleNotificationPositionTest extends MultiBrowserTest {
     public void testMiddleLeft() {
         openTestURL();
 
-        WebElement webElement = driver.findElement(By
-                .className("show-middle-left"));
+        WebElement webElement = driver
+                .findElement(By.className("show-middle-left"));
         webElement.click();
 
-        WebElement notification = driver.findElement(By
-                .className("v-Notification"));
+        WebElement notification = driver
+                .findElement(By.className("v-Notification"));
 
         Assert.assertNotNull(notification);
         String left = notification.getCssValue("left");
@@ -65,12 +65,12 @@ public class MiddleNotificationPositionTest extends MultiBrowserTest {
     public void testMiddleRight() {
         openTestURL();
 
-        WebElement webElement = driver.findElement(By
-                .className("show-middle-right"));
+        WebElement webElement = driver
+                .findElement(By.className("show-middle-right"));
         webElement.click();
 
-        WebElement notification = driver.findElement(By
-                .className("v-Notification"));
+        WebElement notification = driver
+                .findElement(By.className("v-Notification"));
 
         Assert.assertNotNull(notification);
         String right = notification.getCssValue("right");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java
index 903c3440cc..3dcfdc87ff 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 /**
  * Test to check notification delay.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NotificationDelayTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
index 33ba8d1df0..a6434c2a3c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Unit test class for Notification ARIA (Accessible Rich Internet Applications)
  * roles.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -39,7 +39,7 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
 
     /**
      * Checks if the ARIA roles are correctly applied to Notification.
-     * 
+     *
      * @since 7.2
      * @throws Exception
      */
@@ -58,8 +58,8 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
         postfix.clear();
         postfix.sendKeys("- press ESC to close");
 
-        type.selectByText(StringToEnumConverter.enumToString(
-                NotificationRole.ALERT, null));
+        type.selectByText(StringToEnumConverter
+                .enumToString(NotificationRole.ALERT, null));
 
         show.click();
         waitForElementPresent(By.className("v-Notification"));
@@ -67,23 +67,24 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
         NotificationElement notification = $(NotificationElement.class).first();
 
         String text = notification.getAttribute("role");
-        Assert.assertTrue("Expected attribute 'role' to equal 'alert', found "
-                + text, text.equals("alert"));
+        Assert.assertTrue(
+                "Expected attribute 'role' to equal 'alert', found " + text,
+                text.equals("alert"));
 
-        text = getHiddenText(notification.findElements(
-                By.className("v-assistive-device-only")).get(0));
+        text = getHiddenText(notification
+                .findElements(By.className("v-assistive-device-only")).get(0));
         Assert.assertTrue("Expected 'Prefix:', found " + text,
                 text.equals("Prefix:"));
 
-        text = getHiddenText(notification.findElements(
-                By.className("v-assistive-device-only")).get(1));
+        text = getHiddenText(notification
+                .findElements(By.className("v-assistive-device-only")).get(1));
         Assert.assertTrue("Expected '- press ESC to close', found " + text,
                 text.equals("- press ESC to close"));
 
         notification.close();
 
-        type.selectByText(StringToEnumConverter.enumToString(
-                NotificationRole.STATUS, null));
+        type.selectByText(StringToEnumConverter
+                .enumToString(NotificationRole.STATUS, null));
 
         show.click();
         waitForElementPresent(By.className("v-Notification"));
@@ -91,8 +92,9 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
         notification = $(NotificationElement.class).first();
 
         text = notification.getAttribute("role");
-        Assert.assertTrue("Expected attribute 'role' to equal 'status', found "
-                + text, text.equals("status"));
+        Assert.assertTrue(
+                "Expected attribute 'role' to equal 'status', found " + text,
+                text.equals("status"));
 
         notification.close();
 
@@ -104,9 +106,8 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
 
         WebElement element;
         try {
-            element = getDriver()
-                    .findElement(
-                            By.vaadin("Root/VNotification[0]/domChild[0]/domChild[0]/domChild[1]"));
+            element = getDriver().findElement(By.vaadin(
+                    "Root/VNotification[0]/domChild[0]/domChild[0]/domChild[1]"));
         } catch (Exception e) {
             element = null;
         }
@@ -117,7 +118,7 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
     }
 
     private String getHiddenText(WebElement element) {
-        return (String) getTestBenchCommandExecutor().executeScript(
-                "return arguments[0].innerHTML", element);
+        return (String) getTestBenchCommandExecutor()
+                .executeScript("return arguments[0].innerHTML", element);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
index 090286b1ad..98bdc0dff8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for Option group (with new items allowed): unset read only state.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ReadOnlyOptionGroupTest extends MultiBrowserTest {
@@ -40,8 +40,9 @@ public class ReadOnlyOptionGroupTest extends MultiBrowserTest {
 
         assertNoErrorNotifications();
 
-        Assert.assertFalse("Radio button in option group is still disabled "
-                + "after unset reaonly",
+        Assert.assertFalse(
+                "Radio button in option group is still disabled "
+                        + "after unset reaonly",
                 isElementPresent(By.className("v-radiobutton-disabled")));
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
index 9bb53d8742..35e6111ca0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -75,8 +75,7 @@ public class CaptionLeakTest extends MultiBrowserTest {
     }
 
     private void checkConnectorCount() {
-        getDriver()
-                .findElement(
-                        By.xpath("//span[text() = 'Measured 3 non connector elements']"));
+        getDriver().findElement(By
+                .xpath("//span[text() = 'Measured 3 non connector elements']"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
index e784eb3b64..1e483fa919 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
index ea78d9f30c..12794b6058 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,8 +23,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class HorizontalLayoutFullsizeContentWithErrorMsgTest extends
-        MultiBrowserTest {
+public class HorizontalLayoutFullsizeContentWithErrorMsgTest
+        extends MultiBrowserTest {
 
     @Test
     public void test() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
index 1cddbc28c3..1ee48bf1ca 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,8 +38,8 @@ public class NestedLayoutCaptionHoverTest extends MultiBrowserTest {
     public void testTooltipInNestedLayout() throws Exception {
         openTestURL();
 
-        WebElement caption = getDriver().findElement(
-                By.className("v-captiontext"));
+        WebElement caption = getDriver()
+                .findElement(By.className("v-captiontext"));
 
         assertEquals("inner layout", caption.getText());
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
index 1a2a9cbedf..81c386d28a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
index 565c11c1f0..d3e4e6ea95 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,8 +33,7 @@ public class SpacingLeakTest extends MultiBrowserTest {
         getDriver().findElement(By.id("removebutton")).click();
 
         // this should be present
-        getDriver()
-                .findElement(
-                        By.xpath("//span[text() = 'Measured 0 non connector elements']"));
+        getDriver().findElement(By
+                .xpath("//span[text() = 'Measured 0 non connector elements']"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
index 815c00bfac..e826385adb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class TooltipOnRequiredIndicatorTest extends TooltipTest {
 
         // caption
         checkTooltip(
-                $(VerticalLayoutElement.class).get(1).findElement(
-                        By.className("v-captiontext")),
+                $(VerticalLayoutElement.class).get(1)
+                        .findElement(By.className("v-captiontext")),
                 "Vertical layout tooltip");
         // required indicator
         checkTooltip(By.className("v-required-field-indicator"),
@@ -41,8 +41,8 @@ public class TooltipOnRequiredIndicatorTest extends TooltipTest {
 
         // caption
         checkTooltip(
-                $(HorizontalLayoutElement.class).first().findElement(
-                        By.className("v-captiontext")),
+                $(HorizontalLayoutElement.class).first()
+                        .findElement(By.className("v-captiontext")),
                 "Horizontal layout tooltip");
         // required indicator
         checkTooltip(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
index 0890414fea..81bc49ec72 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,8 +35,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
     @Test
     public void inputTextAndChangeFocus() throws InterruptedException {
         openTestURL();
-        List<WebElement> textFields = getDriver().findElements(
-                By.tagName("input"));
+        List<WebElement> textFields = getDriver()
+                .findElements(By.tagName("input"));
         WebElement tf1 = textFields.get(0);
         WebElement tf2 = textFields.get(1);
         tf1.sendKeys(initialText);
@@ -69,8 +69,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
     @Test
     public void moveFocusAndChangeFieldWithValue() {
         openTestURL();
-        List<WebElement> textFields = getDriver().findElements(
-                By.tagName("input"));
+        List<WebElement> textFields = getDriver()
+                .findElements(By.tagName("input"));
         WebElement tf1 = textFields.get(0);
         WebElement tf2 = textFields.get(1);
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java b/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java
index bc2e6f7ca1..7abb38ea48 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
index 039b054040..beb9e73e6d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,27 +27,24 @@ public class PanelChangeContentsTest extends MultiBrowserTest {
         setPush(true);
         openTestURL();
 
-        Assert.assertEquals(
-                "stats",
+        Assert.assertEquals("stats",
                 vaadinElement(
                         "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
+                                .getText());
         vaadinElement(
                 "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]")
-                .click();
-        Assert.assertEquals(
-                "companies",
+                        .click();
+        Assert.assertEquals("companies",
                 vaadinElement(
                         "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
+                                .getText());
         vaadinElement(
                 "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
-                .click();
-        Assert.assertEquals(
-                "stats",
+                        .click();
+        Assert.assertEquals("stats",
                 vaadinElement(
                         "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
+                                .getText());
 
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
index 872abe9191..bfcf620310 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for removing a shortcut listener from Panel.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PanelRemoveShortcutListenerTest extends MultiBrowserTest {
@@ -63,8 +63,9 @@ public class PanelRemoveShortcutListenerTest extends MultiBrowserTest {
 
     @Test
     public void testToggleWithShortcut() {
-        assertThat(panel.findElement(By.className("v-panel-caption"))
-                .findElement(By.tagName("span")).getText(),
+        assertThat(
+                panel.findElement(By.className("v-panel-caption"))
+                        .findElement(By.tagName("span")).getText(),
                 is("No shortcut effects (press 'A')"));
 
         attemptShortcut("A on");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
index c055356624..65a4942a0f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
index 510cc7c883..51524a6c9b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
index f9b1692b85..120fb8bfa7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewCaptionTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
index aafd310b70..4d0dece121 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Resizing PopupView's popup component while it is visible should also resize
  * the drop shadow of the overlay.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewResizeWhileOpenTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
index 6155820990..e1786efd44 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Check availability of shortcut action listener in the popup view.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PopupViewShortcutActionHandlerTest extends MultiBrowserTest {
@@ -44,8 +44,8 @@ public class PopupViewShortcutActionHandlerTest extends MultiBrowserTest {
         openTestURL();
 
         getDriver().findElement(By.className("v-popupview")).click();
-        WebElement textField = getDriver().findElement(
-                By.className("v-textfield"));
+        WebElement textField = getDriver()
+                .findElement(By.className("v-textfield"));
         textField.sendKeys("a", Keys.ENTER);
 
         Assert.assertTrue(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
index 073fd321e5..40880f7eb8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Popup view with extension should not throw an exception.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
index f1056a640d..310f2bbcb8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
index 751e048694..aebf75ac16 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
index 5c31ce4dc7..afdbe7904d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,8 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest {
                 .findElement(By.cssSelector(".v-richtextarea")).getSize()
                 .getHeight();
         int originalEditorHeight = driver
-                .findElement(By.cssSelector(".v-richtextarea iframe"))
-                .getSize().getHeight();
+                .findElement(By.cssSelector(".v-richtextarea iframe")).getSize()
+                .getHeight();
 
         // Increase the component height
         driver.findElement(By.cssSelector(".v-button")).click();
@@ -40,8 +40,8 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest {
         int newHeight = driver.findElement(By.cssSelector(".v-richtextarea"))
                 .getSize().getHeight();
         int newEditorHeight = driver
-                .findElement(By.cssSelector(".v-richtextarea iframe"))
-                .getSize().getHeight();
+                .findElement(By.cssSelector(".v-richtextarea iframe")).getSize()
+                .getHeight();
 
         // Check that the component height changed and that the editor height
         // changed equally as much
@@ -49,7 +49,7 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest {
                 newHeight != originalHeight);
         Assert.assertEquals(
                 "Editor height change didn't match the Component height change",
-                newHeight - originalHeight, newEditorHeight
-                        - originalEditorHeight);
+                newHeight - originalHeight,
+                newEditorHeight - originalEditorHeight);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
index c0429baa31..9669f82ae2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -55,7 +55,7 @@ public class EnumSelectTest extends SingleBrowserTest {
         List<String> options = cb.getPopupSuggestions();
         Assert.assertEquals("Only one item should match filter", 1,
                 options.size());
-        Assert.assertEquals("Invalid option matched filter",
-                "Some other value", options.get(0));
+        Assert.assertEquals("Invalid option matched filter", "Some other value",
+                options.get(0));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
index bbef30bf1d..6f688961b3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,10 +26,10 @@ public class SelectWithIntegersTest extends SingleBrowserTest {
     public void testSelectWithIntegers() {
         openTestURL();
 
-        ListSelectElement defaultSelect = $(ListSelectElement.class).caption(
-                "Default").first();
-        ListSelectElement toStringSelect = $(ListSelectElement.class).caption(
-                "ID_TOSTRING").first();
+        ListSelectElement defaultSelect = $(ListSelectElement.class)
+                .caption("Default").first();
+        ListSelectElement toStringSelect = $(ListSelectElement.class)
+                .caption("ID_TOSTRING").first();
 
         Assert.assertEquals("2,014", defaultSelect.getOptions().get(0));
         Assert.assertEquals("2014", toStringSelect.getOptions().get(0));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
index 3717f7f754..43c7b1574d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java
index 12d26b8f8f..5a8bb02b34 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -52,7 +52,8 @@ public class SliderDisableTest extends MultiBrowserTest {
     }
 
     private void moveSlider(int offset) {
-        WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
+        WebElement element = vaadinElement(
+                "/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
         new Actions(driver).dragAndDropBy(element, offset, 0).perform();
         testBench().waitForVaadin();
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java
index 86bc351480..1b1de1535f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,8 +32,8 @@ public class SliderFeedbackTest extends MultiBrowserTest {
         new Actions(driver).dragAndDropBy(handle, 400, 0).perform();
         testBench().waitForVaadin();
 
-        double value = Double.valueOf(findElement(
-                By.className("v-slider-feedback")).getText());
+        double value = Double.valueOf(
+                findElement(By.className("v-slider-feedback")).getText());
 
         // Allow for some tolerance due to, you guessed it, IE8
         assertLessThan("Unexpected feedback value {1} < {0}", 505000000000.0,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java
index 22df3e4211..b57661e983 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
index fee46c155a..9e638cbea1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
index 0ceca66dd3..cfde16003c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for horizontal split panel height in case when only second component is
  * set.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class HorizontalSplitPanelHeightTest extends MultiBrowserTest {
@@ -60,11 +60,12 @@ public class HorizontalSplitPanelHeightTest extends MultiBrowserTest {
     private void testSplitPanel(String id) {
         WebElement splitPanel = findElement(By.id(id));
         WebElement label = splitPanel.findElement(By.className("target"));
-        Assert.assertTrue(id + ": split panel height ("
-                + splitPanel.getSize().getHeight() + ") is less than "
-                + "height of second component (" + label.getSize().getHeight()
-                + ")", splitPanel.getSize().getHeight() >= label.getSize()
-                .getHeight());
+        Assert.assertTrue(
+                id + ": split panel height (" + splitPanel.getSize().getHeight()
+                        + ") is less than " + "height of second component ("
+                        + label.getSize().getHeight() + ")",
+                splitPanel.getSize().getHeight() >= label.getSize()
+                        .getHeight());
         Assert.assertEquals("Label text in the second panel is not visible",
                 "Label", label.getText());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
index 8a142ac2e1..3934115155 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for duplicate primary style name in SplitPanel.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPanelDuplicateStyleNameTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
index 1bf5212185..8fe71c4623 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,19 +37,17 @@ public class SplitPanelMoveComponentTest extends MultiBrowserTest {
     }
 
     private WebElement getFirstChild() {
-        WebElement container = getDriver()
-                .findElement(
-                        By.xpath("//div[contains(@class,'v-splitpanel-first-container')]"));
-        return container.findElement(By
-                .xpath("//div[contains(@class, 'v-button')]"));
+        WebElement container = getDriver().findElement(By.xpath(
+                "//div[contains(@class,'v-splitpanel-first-container')]"));
+        return container
+                .findElement(By.xpath("//div[contains(@class, 'v-button')]"));
     }
 
     private WebElement getSecondChild() {
-        WebElement container = getDriver()
-                .findElement(
-                        By.xpath("//div[contains(@class,'v-splitpanel-second-container')]"));
-        return container.findElement(By
-                .xpath("//div[contains(@class, 'v-button')]"));
+        WebElement container = getDriver().findElement(By.xpath(
+                "//div[contains(@class,'v-splitpanel-second-container')]"));
+        return container
+                .findElement(By.xpath("//div[contains(@class, 'v-button')]"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
index 1ad9cdb461..8fd1bf6342 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
index b8592e1bd8..8080f2f78c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for {@link SplitPositionChangeListeners}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
@@ -65,9 +65,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
 
             // Due to minor browser differences and sub-pixels we must allow 1px
             // of play between the expected and measured value
-            assertTrue("When moving left, the splitter at index " + i
-                    + " was at position " + newX + " (expected " + expectedX
-                    + ").", Math.abs(newX - expectedX) <= 1);
+            assertTrue(
+                    "When moving left, the splitter at index " + i
+                            + " was at position " + newX + " (expected "
+                            + expectedX + ").",
+                    Math.abs(newX - expectedX) <= 1);
         }
 
         // Amount of pixels to move each splitter (to right)
@@ -84,9 +86,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
             double newX = parseHorizontalPosition(splitter, i < 4);
             int expectedX = finalPositions[i];
 
-            assertTrue("When moving right, the splitter at index " + i
-                    + " was at position " + newX + " (expected " + expectedX
-                    + ").", Math.abs(newX - expectedX) <= 1);
+            assertTrue(
+                    "When moving right, the splitter at index " + i
+                            + " was at position " + newX + " (expected "
+                            + expectedX + ").",
+                    Math.abs(newX - expectedX) <= 1);
         }
     }
 
@@ -113,9 +117,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
             double newY = parseVerticalPosition(splitter, i < 4);
             int expectedY = finalPositions[i];
 
-            assertTrue("When moving up, the splitter at index " + i
-                    + " was at position " + newY + " (expected " + expectedY
-                    + ").", Math.abs(newY - expectedY) <= 1);
+            assertTrue(
+                    "When moving up, the splitter at index " + i
+                            + " was at position " + newY + " (expected "
+                            + expectedY + ").",
+                    Math.abs(newY - expectedY) <= 1);
         }
 
         // Amount of pixels to move each splitter (down)
@@ -132,9 +138,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
             double newY = parseVerticalPosition(splitter, i < 4);
             int expectedY = finalPositions[i];
 
-            assertTrue("When moving down, the splitter at index " + i
-                    + " was at position " + newY + " (expected " + expectedY
-                    + ").", Math.abs(newY - expectedY) <= 1);
+            assertTrue(
+                    "When moving down, the splitter at index " + i
+                            + " was at position " + newY + " (expected "
+                            + expectedY + ").",
+                    Math.abs(newY - expectedY) <= 1);
         }
     }
 
@@ -161,8 +169,9 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
         double newX = parseHorizontalPosition(splitter, true);
         int expectedX = finalPositions[0];
 
-        assertTrue("When moving to left limit, the splitter was at position "
-                + newX + " (expected " + expectedX + ").",
+        assertTrue(
+                "When moving to left limit, the splitter was at position "
+                        + newX + " (expected " + expectedX + ").",
                 Math.abs(newX - expectedX) <= 1);
 
         // Disable left limit
@@ -196,8 +205,9 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
         newX = parseHorizontalPosition(splitter, true);
         expectedX = finalPositions[2];
 
-        assertTrue("When moving to right limit, the splitter was at position "
-                + newX + " (expected " + expectedX + ").",
+        assertTrue(
+                "When moving to right limit, the splitter was at position "
+                        + newX + " (expected " + expectedX + ").",
                 Math.abs(newX - expectedX) <= 1);
 
         // Disable right limit
@@ -229,21 +239,22 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest {
     private double parseHorizontalPosition(TestBenchElement splitter,
             boolean left) {
         if (left) {
-            return Double.parseDouble(splitter.getCssValue("left").replace(
-                    "px", ""));
+            return Double.parseDouble(
+                    splitter.getCssValue("left").replace("px", ""));
         } else {
-            return Double.parseDouble(splitter.getCssValue("right").replace(
-                    "px", ""));
+            return Double.parseDouble(
+                    splitter.getCssValue("right").replace("px", ""));
         }
     }
 
-    private double parseVerticalPosition(TestBenchElement splitter, boolean top) {
+    private double parseVerticalPosition(TestBenchElement splitter,
+            boolean top) {
         if (top) {
-            return Double.parseDouble(splitter.getCssValue("top").replace("px",
-                    ""));
+            return Double
+                    .parseDouble(splitter.getCssValue("top").replace("px", ""));
         } else {
-            return Double.parseDouble(splitter.getCssValue("bottom").replace(
-                    "px", ""));
+            return Double.parseDouble(
+                    splitter.getCssValue("bottom").replace("px", ""));
         }
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
index 43edb56f3a..9a6d59b64f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for {@link SplitPositionChangeListeners}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPositionChangeTest extends MultiBrowserTest {
@@ -43,8 +43,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest {
     public void testHorizontalSplit() {
         HorizontalSplitPanelElement split = $(HorizontalSplitPanelElement.class)
                 .first();
-        WebElement splitter = split.findElement(By
-                .className("v-splitpanel-hsplitter"));
+        WebElement splitter = split
+                .findElement(By.className("v-splitpanel-hsplitter"));
         int position = splitter.getLocation().getX();
         Actions actions = new Actions(driver);
         actions.clickAndHold(splitter).moveByOffset(50, 0).release().perform();
@@ -56,8 +56,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest {
     public void testVerticalSplit() {
         VerticalSplitPanelElement split = $(VerticalSplitPanelElement.class)
                 .first();
-        WebElement splitter = split.findElement(By
-                .className("v-splitpanel-vsplitter"));
+        WebElement splitter = split
+                .findElement(By.className("v-splitpanel-vsplitter"));
         int position = splitter.getLocation().getY();
         Actions actions = new Actions(driver);
         actions.clickAndHold(splitter).moveByOffset(0, 50).release().perform();
@@ -74,9 +74,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest {
                 "1. Split position changed: %s, position: .*",
                 horizontal ? "horizontal" : "vertical");
         String actual = getLogRow(0);
-        Assert.assertTrue(
-                String.format(
-                        "Log content didn't match the expected format.\nexpected: '%s'\nwas: '%s'",
-                        expected, actual), actual.matches(expected));
+        Assert.assertTrue(String.format(
+                "Log content didn't match the expected format.\nexpected: '%s'\nwas: '%s'",
+                expected, actual), actual.matches(expected));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
index 68b3748472..b699a10403 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -45,8 +45,8 @@ public class AddSelectionToRemovedRangeTest extends MultiBrowserTest {
     @Test
     public void addAndRemoveItemToRemovedRange() throws IOException {
         openTestURL();
-        List<WebElement> rows = driver.findElements(By
-                .className("v-table-cell-wrapper"));
+        List<WebElement> rows = driver
+                .findElements(By.className("v-table-cell-wrapper"));
         WebElement rangeStart = rows.get(0);
         WebElement rangeEnd = rows.get(1);
         rangeStart.click();
@@ -54,8 +54,8 @@ public class AddSelectionToRemovedRangeTest extends MultiBrowserTest {
         rangeEnd.click();
         new Actions(driver).keyUp(Keys.SHIFT).perform();
         driver.findElement(By.className("v-button")).click();
-        WebElement extraRow = driver.findElements(
-                By.className("v-table-cell-wrapper")).get(1);
+        WebElement extraRow = driver
+                .findElements(By.className("v-table-cell-wrapper")).get(1);
         new Actions(driver).keyDown(Keys.CONTROL).click(extraRow)
                 .click(extraRow).keyUp(Keys.CONTROL).perform();
         driver.findElement(By.className("v-button")).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
index b33204cc44..f098e50bbf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to see if VScrollTable handles Push updates correctly.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AsyncPushUpdatesTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index 739851de2f..bcd9433e0c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
index 4a5947c145..418ff76a01 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
@@ -21,8 +21,8 @@ public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest {
         TableHeaderElement sourceCell = table.getHeaderCell(0);
         TableHeaderElement targetCell = table.getHeaderCell(10);
         drag(sourceCell, targetCell);
-        WebElement markedElement = table.findElement(By
-                .className("v-table-focus-slot-right"));
+        WebElement markedElement = table
+                .findElement(By.className("v-table-focus-slot-right"));
         String markedColumnName = markedElement.findElement(By.xpath(".."))
                 .getText();
         assertEquals("col-9", markedColumnName.toLowerCase());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
index 970b832e0c..ae16f72934 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest extends
-        MultiBrowserTest {
+public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest
+        extends MultiBrowserTest {
 
     @Test
     public void testColumnWidthAfterChangeTableColumnsOrder() {
@@ -62,11 +62,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest extends
     }
 
     private int getDescriptionColumnWidth() {
-        return driver
-                .findElement(
-                        By.xpath("//div[@class='v-table-cell-wrapper'"
-                                + " and text() = 'descr1']")).getSize()
-                .getWidth();
+        return driver.findElement(By.xpath("//div[@class='v-table-cell-wrapper'"
+                + " and text() = 'descr1']")).getSize().getWidth();
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
index e13238e10d..d248d22720 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
@@ -21,12 +21,12 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 public class ContainerSizeChangeTest extends MultiBrowserTest {
 
     @Test
-    public void tableShouldLoadCorrectItems() throws IOException,
-            InterruptedException {
+    public void tableShouldLoadCorrectItems()
+            throws IOException, InterruptedException {
         openTestURL();
 
-        ButtonElement decreaseSize = $(ButtonElement.class).caption(
-                "Decrease size").first();
+        ButtonElement decreaseSize = $(ButtonElement.class)
+                .caption("Decrease size").first();
         decreaseSize.click(); // decreasing container size from 50 to 40
         decreaseSize.click(); // decreasing container size from 40 to 30
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java
index e5e5163442..440f4d36dd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for context menu position and size.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ContextMenuSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
index add7db93f2..5b2bd2706c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -65,7 +65,8 @@ public class CtrlShiftMultiselectTest extends MultiBrowserTest {
     }
 
     private List<WebElement> getAllRows() {
-        WebElement table = vaadinElement("/VVerticalLayout[0]/VVerticalLayout[0]/VScrollTable[0]");
+        WebElement table = vaadinElement(
+                "/VVerticalLayout[0]/VVerticalLayout[0]/VScrollTable[0]");
         return table.findElements(By.cssSelector(".v-table-table tr"));
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
index f1df98fb38..763dbed304 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,8 +27,8 @@ public class CustomTableElement extends TableElement {
 
     public CollapseMenu openCollapseMenu() {
         getCollapseMenuToggle().click();
-        WebElement cm = getDriver().findElement(
-                By.xpath("//*[@id='PID_VAADIN_CM']"));
+        WebElement cm = getDriver()
+                .findElement(By.xpath("//*[@id='PID_VAADIN_CM']"));
         return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class);
     }
 
@@ -42,16 +42,16 @@ public class CustomTableElement extends TableElement {
     public static class ContextMenuElement extends AbstractElement {
 
         public WebElement getItem(int index) {
-            return findElement(By.xpath(".//table//tr[" + (index + 1)
-                    + "]//td/*"));
+            return findElement(
+                    By.xpath(".//table//tr[" + (index + 1) + "]//td/*"));
         }
 
     }
 
     public ContextMenuElement getContextMenu() {
         WebElement cm = getDriver().findElement(By.className("v-contextmenu"));
-        return wrapElement(cm, getCommandExecutor()).wrap(
-                ContextMenuElement.class);
+        return wrapElement(cm, getCommandExecutor())
+                .wrap(ContextMenuElement.class);
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index 73a5e68da9..c5838096bc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
@@ -91,8 +91,8 @@ public class DisabledSortingTableTest extends MultiBrowserTest {
             @Override
             public String toString() {
                 // Timed out after 10 seconds waiting for ...
-                return String
-                        .format("header to get class name '%s'", className);
+                return String.format("header to get class name '%s'",
+                        className);
             }
         });
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java
index 6fb0d446d3..70dd4c98b3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for empty table as a DnD target: it should not throws client side
  * exception.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
index 5ad99d3084..741d5d7b5b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.DndActionsTest;
 /**
  * Test for mouse details in AbstractSelectTargetDetails class when DnD target
  * is a table.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndTableTargetDetailsTest extends DndActionsTest {
@@ -45,8 +45,8 @@ public class DndTableTargetDetailsTest extends DndActionsTest {
     }
 
     protected WebElement getTarget() {
-        return findElement(By.className("target")).findElement(
-                By.className("v-table-cell-wrapper"));
+        return findElement(By.className("target"))
+                .findElement(By.className("v-table-cell-wrapper"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
index 56b30dcb7c..5e5bcb82fb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that editing and selecting work correctly.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class EditableModeChangeTest extends MultiBrowserTest {
@@ -54,8 +54,8 @@ public class EditableModeChangeTest extends MultiBrowserTest {
         sleep(100);
 
         // fetch the updated cell
-        WebElement textField = table.getCell(1, 0).findElement(
-                By.className("v-textfield"));
+        WebElement textField = table.getCell(1, 0)
+                .findElement(By.className("v-textfield"));
         assertEquals(
                 "original value not found, wrong cell or contents (1st column of the 2nd row expected)",
                 "Teppo", textField.getAttribute("value"));
@@ -73,13 +73,13 @@ public class EditableModeChangeTest extends MultiBrowserTest {
                 "baa", table.getCell(1, 0).getText());
 
         // check that selection got updated correctly
-        List<WebElement> selected = table.findElement(
-                By.className("v-table-body")).findElements(
-                By.className("v-selected"));
+        List<WebElement> selected = table
+                .findElement(By.className("v-table-body"))
+                .findElements(By.className("v-selected"));
         assertEquals(1, selected.size());
 
-        WebElement content = selected.get(0).findElement(
-                By.className("v-table-cell-wrapper"));
+        WebElement content = selected.get(0)
+                .findElement(By.className("v-table-cell-wrapper"));
         assertEquals(
                 "expected value not found, wrong cell or contents (1st column of the 1st row expected)",
                 "Teemu", content.getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java
index 2332815ed6..41cab317e7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
index 1602f1bae5..1b1478ef45 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class ExpandingContainerVisibleRowRaceConditionTest extends
-        MultiBrowserTest {
+public class ExpandingContainerVisibleRowRaceConditionTest
+        extends MultiBrowserTest {
 
     private static final int ROW_HEIGHT = 20;
 
@@ -76,15 +76,15 @@ public class ExpandingContainerVisibleRowRaceConditionTest extends
 
     private void assertScrollPositionIsNotVisible() {
         WebElement table = vaadinElementById(TABLE);
-        WebElement scrollPosition = table.findElement(By
-                .className("v-table-scrollposition"));
+        WebElement scrollPosition = table
+                .findElement(By.className("v-table-scrollposition"));
         assertFalse(scrollPosition.isDisplayed());
     }
 
     private List<WebElement> getCellsOfFirstColumn() {
         WebElement table = vaadinElementById(TABLE);
-        List<WebElement> firstCellOfRows = table.findElements(By
-                .cssSelector(".v-table-table tr > td"));
+        List<WebElement> firstCellOfRows = table
+                .findElements(By.cssSelector(".v-table-table tr > td"));
         return firstCellOfRows;
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
index 14a0718325..3e5ab930ad 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to see if the correct row gets the focus when the row is selected from
  * the serverside and forces the table to scroll down
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FocusOnSelectedItemTest extends MultiBrowserTest {
@@ -50,9 +50,9 @@ public class FocusOnSelectedItemTest extends MultiBrowserTest {
 
         supposedlyFocusedRow = $(TableElement.class).first().getCell(198, 0);
 
-        Assert.assertTrue("Incorrect row was selected", selectedRow
-                .getLocation().getY() == supposedlyFocusedRow.getLocation()
-                .getY());
+        Assert.assertTrue("Incorrect row was selected",
+                selectedRow.getLocation().getY() == supposedlyFocusedRow
+                        .getLocation().getY());
 
         Assert.assertTrue("No row had the focused style.",
                 isElementPresent(By.className("v-table-focus")));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
index 2e4df1c116..b591b369e5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index 11a6838234..75f630e203 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -204,8 +204,8 @@ public class FooterTest extends MultiBrowserTest {
             @Override
             public String toString() {
                 // Timed out after 10 seconds waiting for ...
-                return String.format("footer cell %s's text was'%s'",
-                        "" + cell, footerCell.getText());
+                return String.format("footer cell %s's text was'%s'", "" + cell,
+                        footerCell.getText());
             }
         });
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
index 2ad069540d..c9baf91713 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index 01fc173c9a..a06fce9869 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index 26847a692d..df1e8603c3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
index f5f8bcce2a..4868279722 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests whether right-click on a column header works after the column is
  * dragged.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class HeaderRightClickAfterDragTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index c9307f0849..0777e5d091 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index 7a3813599d..ea7aef4bd5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
index 4938ec4b81..8f95797df0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
index edeb358c08..b33ef8a355 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
index 25a3139489..d36c647c0c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests clicks on different types of Table contents.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class LabelEmbeddedClickThroughForTableTest extends MultiBrowserTest {
@@ -89,9 +89,9 @@ public class LabelEmbeddedClickThroughForTableTest extends MultiBrowserTest {
     }
 
     private void checkRowSelected(TableElement table, int rowIndex) {
-        List<WebElement> selectedRows = table.findElement(
-                By.className("v-table-body")).findElements(
-                By.className("v-selected"));
+        List<WebElement> selectedRows = table
+                .findElement(By.className("v-table-body"))
+                .findElements(By.className("v-selected"));
         assertEquals("unexpected table selection size", 1, selectedRows.size());
         assertEquals(
                 "contents of the selected row don't match contents of the row #"
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
index 3d613fd726..6ef7223172 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test class for issue #13399 : Left alignment should not be set explicitly
  * instead of relying on default behavior
- * 
+ *
  * @author Vaadin Ltd
  */
 public class LeftColumnAlignmentTest extends MultiBrowserTest {
@@ -39,17 +39,17 @@ public class LeftColumnAlignmentTest extends MultiBrowserTest {
         webElement.click();
 
         Assert.assertTrue("Table caption is not aligned to the left",
-                isElementPresent(By
-                        .className("v-table-caption-container-align-left")));
+                isElementPresent(
+                        By.className("v-table-caption-container-align-left")));
 
-        WebElement footer = driver.findElement(By
-                .className("v-table-footer-container"));
+        WebElement footer = driver
+                .findElement(By.className("v-table-footer-container"));
 
         Assert.assertEquals("Table footer is not aligned to the left", "left",
                 footer.getCssValue("text-align"));
 
-        WebElement cell = driver.findElement(By
-                .className("v-table-cell-wrapper"));
+        WebElement cell = driver
+                .findElement(By.className("v-table-cell-wrapper"));
 
         Assert.assertEquals("Table cell is not aligned to the left", "left",
                 cell.getCssValue("text-align"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
index e9f3bbb355..52cdd2d8ec 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
@@ -49,8 +49,8 @@ public class LongMultiselectTest extends MultiBrowserTest {
         scrollToBottom();
 
         new Actions(getDriver()).keyDown(Keys.SHIFT)
-                .click(getTable().getCell(LASTSELECTEDROW, 0))
-                .keyUp(Keys.SHIFT).build().perform();
+                .click(getTable().getCell(LASTSELECTEDROW, 0)).keyUp(Keys.SHIFT)
+                .build().perform();
     }
 
     private TableElement getTable() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index b254d27b58..114a052c19 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -31,10 +31,10 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test case creating and deleting table component in a loop, testing memory
  * lead in Table component. This test should not be used in auto testing.
- * 
+ *
  * To test memory consuption. Run test in debug mode. Take memory snapshot in
  * Profiler in browser before and after the loop. Compare memory consuption.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -84,8 +84,8 @@ public class MemoryLeakTableTest extends MultiBrowserTest {
     // Method scroll in TalbeElement class has a bug
     //
     private void scrollTable(TableElement tbl, int value) {
-        WebElement actualElement = tbl.findElement(By
-                .className("v-table-body-wrapper"));
+        WebElement actualElement = tbl
+                .findElement(By.className("v-table-body-wrapper"));
         JavascriptExecutor js = tbl.getCommandExecutor();
         js.executeScript("arguments[0].scrollTop = " + value, actualElement);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
index 2b053a6d1c..3685eb322c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
index c92e00ab29..e201b2ad96 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
@@ -64,8 +64,8 @@ public class ReloadWidgetsTest extends MultiBrowserTest {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
-                List<WebElement> elements = findElements(By
-                        .className("v-table-scrollposition"));
+                List<WebElement> elements = findElements(
+                        By.className("v-table-scrollposition"));
                 return elements.isEmpty() || !elements.get(0).isDisplayed();
             }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
index 504957e773..26578de160 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,8 +39,8 @@ public class SelectAllConstantViewportTest extends MultiBrowserTest {
         CheckBoxElement checkbox = $(CheckBoxElement.class).first();
 
         WebElement row = $(TableElement.class).first().getCell(190, 0);
-        final WebElement scrollPositionDisplay = getDriver().findElement(
-                By.className("v-table-scrollposition"));
+        final WebElement scrollPositionDisplay = getDriver()
+                .findElement(By.className("v-table-scrollposition"));
         waitUntilNot(new ExpectedCondition<Boolean>() {
 
             @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
index 28cf9b0718..3e003e1f0f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement;
 /**
  * Test to see if all items of the table can be selected by pressing shift and
  * selecting the first row, and then press shift then select last row (#13483)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SelectAllRowsShiftFirstTest extends SelectAllRowsTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
index 175cbac9d5..f85df2badf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,7 +38,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to see if all items of the table can be selected by selecting first row,
  * press shift then select last (#13008)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SelectAllRowsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index 8102f82834..767d8311bf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
index ebf53e9a6d..086fe07035 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SetPageFirstItemLoadsNeededRowsOnlyTest extends MultiBrowserTest {
@@ -31,11 +31,11 @@ public class SetPageFirstItemLoadsNeededRowsOnlyTest extends MultiBrowserTest {
     /*
      * expectedRowsRequested is related to VScrollTable's cache_rate and
      * pageLength. See for instance VScrollTable.ensureCacheFilled().
-     * 
+     *
      * This also takes into account if the visible rows are at the very start or
      * end of the table, if the user scrolled or the
      * Table.setCurrentPageFirstItemIndex(int) method was used.
-     * 
+     *
      * This value should not change if cache_rate and pageLength are not changed
      * as well, and if this test remains constant: the table is scrolled to the
      * very end (done in the actual UI: SetPageFirstItemLoadsNeededRowsOnly).
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
index 54b5cad9b2..e3c14f67f2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests sorting labels in table.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SortLabelsInTableTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
index 060b3a661a..ab70343d36 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
index 58628a9d56..c2c1db7f6b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests checks that column width is restored after removing expand ratios.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest {
@@ -47,10 +47,10 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest {
 
         List<WebElement> tables = driver.findElements(By.className("v-table"));
 
-        initialHeader = tables.get(0).findElement(
-                By.className("v-table-header-cell"));
-        expandedHeader = tables.get(1).findElement(
-                By.className("v-table-header-cell"));
+        initialHeader = tables.get(0)
+                .findElement(By.className("v-table-header-cell"));
+        expandedHeader = tables.get(1)
+                .findElement(By.className("v-table-header-cell"));
 
         expandButton = getDriver().findElement(By.id("expand-button"));
         unExpandButton = getDriver().findElement(By.id("unexpand-button"));
@@ -61,13 +61,13 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest {
 
         clickAndWait(expandButton);
         assertThat("Column widths should not be equal after expanding",
-                initialHeader.getSize().getWidth(), not(expandedHeader
-                        .getSize().getWidth()));
+                initialHeader.getSize().getWidth(),
+                not(expandedHeader.getSize().getWidth()));
 
         clickAndWait(unExpandButton);
         assertThat("Column widths should be equal after unexpanding",
-                initialHeader.getSize().getWidth(), is(expandedHeader.getSize()
-                        .getWidth()));
+                initialHeader.getSize().getWidth(),
+                is(expandedHeader.getSize().getWidth()));
     }
 
     @Test
@@ -80,8 +80,8 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest {
         clickAndWait(unExpandButton);
         assertThat(
                 "Column widths should be equal after adding item and unexpanding",
-                initialHeader.getSize().getWidth(), is(expandedHeader.getSize()
-                        .getWidth()));
+                initialHeader.getSize().getWidth(),
+                is(expandedHeader.getSize().getWidth()));
     }
 
     private void clickAndWait(WebElement elem) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
index e5d07abc22..776ffc79a2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
index edb0f3851a..aaf1c77154 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
index 8202b06362..1f4f4970a1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
index 4a9d17c02d..95d28c798c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import org.openqa.selenium.interactions.Actions;
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
  * dragging rows.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableClickAndDragOnIconAndComponentsTest extends MultiBrowserTest {
@@ -105,8 +105,8 @@ public class TableClickAndDragOnIconAndComponentsTest extends MultiBrowserTest {
     }
 
     private void assertThatFocusTextFieldHasText(String text) {
-        List<WebElement> focused = getTable().findElements(
-                By.className("v-textfield-focus"));
+        List<WebElement> focused = getTable()
+                .findElements(By.className("v-textfield-focus"));
 
         assertThat(focused.get(0).getAttribute("value"), is(text));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
index e42f86a975..6f83240301 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,8 +33,8 @@ public class TableColumnAddAndResizeTest extends MultiBrowserTest {
         openTestURL();
 
         $(ButtonElement.class).caption("Add and Resize").first().click();
-        assertFalse("Error notification present.", $(NotificationElement.class)
-                .exists());
+        assertFalse("Error notification present.",
+                $(NotificationElement.class).exists());
         assertEquals("Unexpected column width. ", 200, $(TableElement.class)
                 .first().getCell(0, 1).getSize().getWidth());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index 9072d13263..8c6815affe 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,7 +34,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that components within table cells get resized when their column gets
  * resized.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableColumnResizeContentsWidthTest extends MultiBrowserTest {
@@ -50,8 +50,8 @@ public class TableColumnResizeContentsWidthTest extends MultiBrowserTest {
 
         List<ButtonElement> buttons = $(ButtonElement.class).all();
 
-        WebElement resizer = getTable().findElement(
-                By.className("v-table-resizer"));
+        WebElement resizer = getTable()
+                .findElement(By.className("v-table-resizer"));
 
         assertEquals(100, getTextFieldWidth());
 
@@ -81,8 +81,8 @@ public class TableColumnResizeContentsWidthTest extends MultiBrowserTest {
 
     private int getTextFieldWidth() {
         TableElement table = getTable();
-        final WebElement textField = table.findElement(By
-                .className("v-textfield"));
+        final WebElement textField = table
+                .findElement(By.className("v-textfield"));
 
         return textField.getSize().width;
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
index 9c49b3d0b6..d0560be5cd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
index bd2d2ad28b..978e2b8405 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,12 +36,13 @@ public class TableDragColumnTest extends MultiBrowserTest {
     public void testDragColumn() {
         openTestURL();
 
-        selectMenuPath("Component", "Columns", "Property 1", "Icon", "ok 16x16");
+        selectMenuPath("Component", "Columns", "Property 1", "Icon",
+                "ok 16x16");
 
         TableElement table = $(TableElement.class).first();
         TableHeaderElement dragged = table.getHeaderCell(0);
-        String imgSrc = dragged.findElement(By.tagName("img")).getAttribute(
-                "src");
+        String imgSrc = dragged.findElement(By.tagName("img"))
+                .getAttribute("src");
         new Actions(getDriver()).moveToElement(dragged).clickAndHold()
                 .moveByOffset(-6, 0).perform();
 
@@ -50,22 +51,21 @@ public class TableDragColumnTest extends MultiBrowserTest {
 
         WebElement dragImage = findElement(By.className("v-table-header-drag"));
         String cellContent = dragged.getText();
-        Assert.assertEquals(
-                "Drag image had different content than header cell",
+        Assert.assertEquals("Drag image had different content than header cell",
                 cellContent, dragImage.getText());
-        Assert.assertEquals("Drag image had different icon", imgSrc, dragImage
-                .findElement(By.tagName("img")).getAttribute("src"));
+        Assert.assertEquals("Drag image had different icon", imgSrc,
+                dragImage.findElement(By.tagName("img")).getAttribute("src"));
 
         TableHeaderElement target = table.getHeaderCell(3);
         new Actions(getDriver())
-                .moveToElement(target, target.getSize().width - 5, 10)
-                .release().perform();
+                .moveToElement(target, target.getSize().width - 5, 10).release()
+                .perform();
 
         dragged = table.getHeaderCell(3);
         Assert.assertEquals("Column was not dropped where expected.",
                 cellContent, dragged.getText());
-        Assert.assertEquals("Drag image had different icon", imgSrc, dragged
-                .findElement(By.tagName("img")).getAttribute("src"));
+        Assert.assertEquals("Drag image had different icon", imgSrc,
+                dragged.findElement(By.tagName("img")).getAttribute("src"));
     }
 
     @Test
@@ -94,8 +94,7 @@ public class TableDragColumnTest extends MultiBrowserTest {
 
         WebElement dragImage = findElement(By.className("v-table-header-drag"));
         String cellContent = dragged.getText();
-        Assert.assertEquals(
-                "Drag image had different content than header cell",
+        Assert.assertEquals("Drag image had different content than header cell",
                 cellContent, dragImage.getText());
         Assert.assertTrue("Missing CSS class " + styleName,
                 hasCssClass(dragImage, styleName));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
index 82a66eba07..1cef1e2724 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
  *  
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
  * dragging rows.
- * 
+ *
  * @author Vaadin Ltd
  */
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 074958d671..2593f10258 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * For testing that UI scroll does not jump back to up when: 1. UI is in iframe
  * 2. the window scrolled down 3. and table is clicked
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -76,8 +76,9 @@ public class TableInIframeRowClickScrollJumpTest extends MultiBrowserTest {
 
         Long scrollPosition2 = getWindowsScrollPosition();
 
-        assertThat("Scroll position should stay about the same. Old was "
-                + scrollPosition + " and new one " + scrollPosition2,
+        assertThat(
+                "Scroll position should stay about the same. Old was "
+                        + scrollPosition + " and new one " + scrollPosition2,
                 Math.abs(scrollPosition - scrollPosition2) < 10);
     }
 
@@ -104,8 +105,8 @@ public class TableInIframeRowClickScrollJumpTest extends MultiBrowserTest {
         driver.switchTo().defaultContent();
 
         JavascriptExecutor executor = (JavascriptExecutor) driver;
-        Long value = (Long) executor
-                .executeScript("if (window.pageYOffset) return window.pageYOffset;else if (window.document.documentElement.scrollTop) return window.document.documentElement.scrollTop;else return window.document.body.scrollTop;");
+        Long value = (Long) executor.executeScript(
+                "if (window.pageYOffset) return window.pageYOffset;else if (window.document.documentElement.scrollTop) return window.document.documentElement.scrollTop;else return window.document.body.scrollTop;");
 
         // back to the iframe
         switchIntoIframe();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
index 555a38a91e..e7b420364c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.TooltipTest;
 
 /**
  * Tests Table tooltips with various settings.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableItemDescriptionGeneratorUITest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
index ea730ea30e..83ea518d8d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Regular click cases already covered by @LabelEmbeddedClickThroughForTableTest
  * Testing cases when mouse down and mouse up positions are different
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -140,8 +140,8 @@ public class TableMatchesMouseDownMouseUpElementTest extends MultiBrowserTest {
     }
 
     private List<WebElement> getSelectedRows() {
-        return table.findElement(By.className("v-table-body")).findElements(
-                By.className("v-selected"));
+        return table.findElement(By.className("v-table-body"))
+                .findElements(By.className("v-selected"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
index 30bddc2666..b2808afbbf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests if table focus is moved correctly to the selected item
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -40,8 +40,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
         getDriver().findElement(By.id("row-5")).click();
 
         // Ensure row 5 gets focused
-        WebElement row5TableRow = getDriver().findElement(
-                By.xpath("//div[@id='row-5']/../../.."));
+        WebElement row5TableRow = getDriver()
+                .findElement(By.xpath("//div[@id='row-5']/../../.."));
         String row5StyleName = row5TableRow.getAttribute("class");
         assertTrue(row5StyleName.contains("v-table-focus"));
     }
@@ -58,8 +58,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
         getDriver().findElement(By.id("row-7")).click();
 
         // Clicking a row should get the row focus
-        WebElement row7TableRow = getDriver().findElement(
-                By.xpath("//div[@id='row-7']/../../.."));
+        WebElement row7TableRow = getDriver()
+                .findElement(By.xpath("//div[@id='row-7']/../../.."));
         String row7StyleName = row7TableRow.getAttribute("class");
         assertTrue(row7StyleName.contains("v-table-focus"));
 
@@ -73,8 +73,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
         getDriver().findElement(By.id("test-table")).click();
 
         // Ensure row 7 is still focused
-        row7TableRow = getDriver().findElement(
-                By.xpath("//div[@id='row-7']/../../.."));
+        row7TableRow = getDriver()
+                .findElement(By.xpath("//div[@id='row-7']/../../.."));
         row7StyleName = row7TableRow.getAttribute("class");
         assertTrue(row7StyleName.contains("v-table-focus"));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index 4ab42a5f94..5c56dded86 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that navigation with PageDown/PageUp/Home/End in Table works
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableNavigationPageDownTest extends MultiBrowserTest {
@@ -116,8 +116,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
         // page downs.
         // Can't use v-table-body height because lower rows haven't been
         // fetched yet.
-        testBenchElement(wrapper).scroll(
-                ROW_NUMBER * rowHeight - (int) (2.8 * pageHeight));
+        testBenchElement(wrapper)
+                .scroll(ROW_NUMBER * rowHeight - (int) (2.8 * pageHeight));
         waitForScrollToFinish();
 
         getLastVisibleRow().click();
@@ -166,8 +166,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
-                List<WebElement> elements = findElements(By
-                        .className("v-table-scrollposition"));
+                List<WebElement> elements = findElements(
+                        By.className("v-table-scrollposition"));
                 return elements.isEmpty() || !elements.get(0).isDisplayed();
             }
 
@@ -183,8 +183,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest {
      * Returns row number from its first cell
      */
     private int getRowNumber(WebElement row) {
-        return Integer.valueOf(row.findElement(
-                By.className("v-table-cell-wrapper")).getText());
+        return Integer.valueOf(row
+                .findElement(By.className("v-table-cell-wrapper")).getText());
     }
 
     /**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
index 5fde9c385e..81f4518e0a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
index 968b742aa9..c2eec10888 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,8 +23,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class TableRemovedQuicklySendsInvalidRpcCallsTest extends
-        MultiBrowserTest {
+public class TableRemovedQuicklySendsInvalidRpcCallsTest
+        extends MultiBrowserTest {
 
     private static final String BUTTON_ID = TableRemovedQuicklySendsInvalidRpcCalls.BUTTON_ID;
     private static final String FAILURE_CAPTION = TableRemovedQuicklySendsInvalidRpcCalls.FAILURE_CAPTION;
@@ -35,18 +35,18 @@ public class TableRemovedQuicklySendsInvalidRpcCallsTest extends
         setDebug(true);
         openTestURL();
 
-        assertFalse("Test started with the error present.", button().getText()
-                .equals(FAILURE_CAPTION));
+        assertFalse("Test started with the error present.",
+                button().getText().equals(FAILURE_CAPTION));
         assertFalse("Test jumped the gun.",
                 button().getText().equals(SUCCESS_CAPTION));
 
         button().click();
         Thread.sleep(5000);
 
-        assertFalse("Test failed after trying to trigger the error.", button()
-                .getText().equals(FAILURE_CAPTION));
-        assertTrue("Test didn't end up in correct success state.", button()
-                .getText().equals(SUCCESS_CAPTION));
+        assertFalse("Test failed after trying to trigger the error.",
+                button().getText().equals(FAILURE_CAPTION));
+        assertTrue("Test didn't end up in correct success state.",
+                button().getText().equals(SUCCESS_CAPTION));
     }
 
     private WebElement button() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 4ca3ed406b..a7ca154d7a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,11 +27,11 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Scroll position should be restored when removing and re-adding all rows in
  * Table.
- * 
+ *
  * @author Vaadin Ltd
  */
-public class TableRepairsScrollPositionOnReAddingAllRowsTest extends
-        MultiBrowserTest {
+public class TableRepairsScrollPositionOnReAddingAllRowsTest
+        extends MultiBrowserTest {
 
     private int rowLocation0;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
index b94ddaee45..13cc7c082e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Checks that Table that has required flag set to true is also indicated as
  * such on the client side.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableRequiredIndicatorTest extends MultiBrowserTest {
@@ -32,8 +32,8 @@ public class TableRequiredIndicatorTest extends MultiBrowserTest {
     @Test
     public void testRequiredIndicatorIsVisible() {
         openTestURL();
-        Assert.assertTrue(isElementPresent(By
-                .className("v-required-field-indicator")));
+        Assert.assertTrue(
+                isElementPresent(By.className("v-required-field-indicator")));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
index 7074225311..c076515c25 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that rows are completely visible and clicking buttons doesn't change
  * anything.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableRowHeight2Test extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
index 0fad02b410..fbe07a9e24 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that adding long labels to a Table and scrolling to the bottom works as
  * intended.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableRowScrolledBottomTest extends MultiBrowserTest {
@@ -60,8 +60,8 @@ public class TableRowScrolledBottomTest extends MultiBrowserTest {
         button.click();
         sleep(500);
 
-        rows = table.findElement(By.className("v-table-body")).findElements(
-                By.tagName("tr"));
+        rows = table.findElement(By.className("v-table-body"))
+                .findElements(By.tagName("tr"));
 
         // check that the final row is the one intended
         finalRow = rows.get(rows.size() - 1);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
index d390b57823..c2b6b08345 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -65,8 +65,8 @@ public class TableScrollAfterAddRowTest extends MultiBrowserTest {
     }
 
     private void scrollUp() {
-        WebElement actualElement = getDriver().findElement(
-                By.className("v-table-body-wrapper"));
+        WebElement actualElement = getDriver()
+                .findElement(By.className("v-table-body-wrapper"));
         JavascriptExecutor js = new TestBenchCommandExecutor(getDriver(),
                 new ImageComparison(), new ReferenceNameGenerator());
         js.executeScript("arguments[0].scrollTop = " + 30, actualElement);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
index b2fde31b93..5c5d2b1719 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Test to see if Table appears to scroll up under an obscure set of conditions
  * (Scrolled down, set to expand, selecting updates a TextField that precedes
  * the Table in a VerticalLayout.) (#10106)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableScrollUpOnSelectTest extends MultiBrowserTest {
@@ -40,8 +40,8 @@ public class TableScrollUpOnSelectTest extends MultiBrowserTest {
 
         // WebElement table = driver.findElement(By.vaadin("//Table"));
         WebElement row = $(TableElement.class).first().getCell(49, 0);
-        final WebElement scrollPositionDisplay = getDriver().findElement(
-                By.className("v-table-scrollposition"));
+        final WebElement scrollPositionDisplay = getDriver()
+                .findElement(By.className("v-table-scrollposition"));
         waitUntilNot(new ExpectedCondition<Boolean>() {
 
             @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
index 01f75f7875..6f8acb3e7c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
index a984ed81e5..335be946e6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -43,8 +43,8 @@ public class TableSizeInTabsheetTest extends MultiBrowserTest {
     }
 
     private int getTableSheetContentHeight() {
-        WebElement tabsheetContent = vaadinElementById(TABSHEET).findElement(
-                By.className(TABSHEET_CONTENT_STYLENAME));
+        WebElement tabsheetContent = vaadinElementById(TABSHEET)
+                .findElement(By.className(TABSHEET_CONTENT_STYLENAME));
         return tabsheetContent.getSize().getHeight();
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
index 8453f5d67f..e587a37a71 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests if the sort indicator is visible after the table has been sorted from
  * the serverside.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableSortingIndicatorTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
index 57ebfb7040..caeb6dbd32 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that column keeps its header, icon, alignment after toggling visibility
  * (#6245, #12303).
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableToggleColumnVisibilityTest extends MultiBrowserTest {
@@ -36,10 +36,10 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest {
     public void testColumnWidthRestoredAfterTogglingVisibility() {
         openTestURL();
 
-        ButtonElement toggleVisibilityButton = $(ButtonElement.class).id(
-                "visib-toggler");
-        ButtonElement changeOrderButton = $(ButtonElement.class).id(
-                "order-toggler");
+        ButtonElement toggleVisibilityButton = $(ButtonElement.class)
+                .id("visib-toggler");
+        ButtonElement changeOrderButton = $(ButtonElement.class)
+                .id("order-toggler");
 
         checkHeaderAttributes(1);
 
@@ -65,16 +65,16 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest {
         TableHeaderElement headerCell = $(TableElement.class).first()
                 .getHeaderCell(columnNumber);
 
-        Assert.assertTrue("Column header text should be custom", headerCell
-                .getText().equalsIgnoreCase("Hello World"));
+        Assert.assertTrue("Column header text should be custom",
+                headerCell.getText().equalsIgnoreCase("Hello World"));
 
-        Assert.assertTrue("Column should have an icon", headerCell
-                .findElements(By.className("v-icon")).size() > 0);
+        Assert.assertTrue("Column should have an icon",
+                headerCell.findElements(By.className("v-icon")).size() > 0);
 
-        Assert.assertTrue(
-                "Column should have alignment to the right",
-                headerCell.findElements(
-                        By.className("v-table-caption-container-align-right"))
+        Assert.assertTrue("Column should have alignment to the right",
+                headerCell
+                        .findElements(By.className(
+                                "v-table-caption-container-align-right"))
                         .size() > 0);
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
index c89678d846..511bce3b34 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that column keeps its width after it is made invisible and visible
  * again (#12303).
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableToggleColumnVisibilityWidthTest extends MultiBrowserTest {
@@ -36,7 +36,7 @@ public class TableToggleColumnVisibilityWidthTest extends MultiBrowserTest {
 
         int secondColumnWidthInitial = findElements(
                 By.className("v-table-header-cell")).get(1).getSize()
-                .getWidth();
+                        .getWidth();
         ButtonElement toggleButton = $(ButtonElement.class).id("toggler");
 
         toggleButton.click();
@@ -48,7 +48,7 @@ public class TableToggleColumnVisibilityWidthTest extends MultiBrowserTest {
                 findElements(By.className("v-table-header-cell")).size(), 2);
         int secondColumnWidthRestored = findElements(
                 By.className("v-table-header-cell")).get(1).getSize()
-                .getWidth();
+                        .getWidth();
         Assert.assertEquals(
                 "Column width should be the same as it was before hiding",
                 secondColumnWidthInitial, secondColumnWidthRestored);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
index 2244365e00..fb9f14f14c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@ public class TableTooManyColumnsTest extends MultiBrowserTest {
     public void testDropdownTable() throws IOException {
         openTestURL();
 
-        WebElement element = findElement(By
-                .className("v-table-column-selector"));
+        WebElement element = findElement(
+                By.className("v-table-column-selector"));
 
         element.click();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
index 060b79f65f..87cd1c1b47 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests Table Footer ClickListener
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
index f96641be4c..d80e3496d9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test whether adding the first item to a table calculates the table width
  * correctly
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableWidthItemRemoveTest extends MultiBrowserTest {
@@ -33,14 +33,14 @@ public class TableWidthItemRemoveTest extends MultiBrowserTest {
     public void testWidthResizeOnItemAdd() {
         openTestURL();
 
-        WebElement populateButton = driver.findElement(By
-                .vaadin("//Button[caption=\"Populate\"]"));
-        WebElement table = driver.findElement(By
-                .vaadin("//Table[caption=\"My table\"]"));
+        WebElement populateButton = driver
+                .findElement(By.vaadin("//Button[caption=\"Populate\"]"));
+        WebElement table = driver
+                .findElement(By.vaadin("//Table[caption=\"My table\"]"));
         int original_width = table.getSize().getWidth();
         populateButton.click();
-        Assert.assertTrue("Width changed on item add.", original_width == table
-                .getSize().getWidth());
+        Assert.assertTrue("Width changed on item add.",
+                original_width == table.getSize().getWidth());
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
index 1eb5cad821..1193bb538a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,11 +28,11 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for a Table with a customised BeanItemContainer.
- * 
+ *
  * @author Vaadin Ltd
  */
-public class TableWithContainerRequiringEqualsForItemIdTest extends
-        MultiBrowserTest {
+public class TableWithContainerRequiringEqualsForItemIdTest
+        extends MultiBrowserTest {
 
     @Test
     public void testSorting() {
@@ -68,8 +68,8 @@ public class TableWithContainerRequiringEqualsForItemIdTest extends
     }
 
     private void checkFirstCell(TableElement table, String expected) {
-        assertEquals("unexpected contents", expected, table.getCell(0, 0)
-                .getText());
+        assertEquals("unexpected contents", expected,
+                table.getCell(0, 0).getText());
     }
 
     private void clickTableHeaderToSort(TableElement table) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index 14994f8b02..8c25918a9a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -62,8 +62,8 @@ public class TableWithPollingTest extends MultiBrowserTest {
     }
 
     private WebElement getColumnResizer(int column) {
-        return getHeaderCell(column).findElement(
-                By.className("v-table-resizer"));
+        return getHeaderCell(column)
+                .findElement(By.className("v-table-resizer"));
     }
 
     private void resizeColumn(int column, int by) throws InterruptedException {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
index 520ffa1aec..04b7c79638 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that a TextField with 100% width fills the expanded column.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TextFieldRelativeWidthTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
index 387882b6ca..81232d9e7c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that a text field's value isn't cleared after a label in the same
  * layout is changed.
- * 
+ *
  * @since 7.3
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
index f0325ed77b..5d545e3b97 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -56,9 +56,9 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest {
         zoomSetter.resetZoom();
         openTestURL();
         // IE sometimes has trouble waiting long enough.
-        new WebDriverWait(getDriver(), 30).until(ExpectedConditions
-                .presenceOfElementLocated(By
-                        .cssSelector(".v-table-body-wrapper")));
+        new WebDriverWait(getDriver(), 30)
+                .until(ExpectedConditions.presenceOfElementLocated(
+                        By.cssSelector(".v-table-body-wrapper")));
     }
 
     @Test
@@ -94,8 +94,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest {
         } catch (InterruptedException e) {
             Assert.fail();
         }
-        WebElement element = findElement(By
-                .cssSelector(".v-table-body-wrapper"));
+        WebElement element = findElement(
+                By.cssSelector(".v-table-body-wrapper"));
         assertNotNull("There must be a table", element);
         String overflow = element.getCssValue("overflow");
         // As long as the overflow is hidden, there will not be scroll bars.
@@ -110,7 +110,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest {
             String detectVerticalScroll = "return arguments[0].scrollHeight > arguments[0].clientHeight";
             Boolean vertical = (Boolean) ((TestBenchCommandExecutor) getDriver())
                     .executeScript(detectVerticalScroll, element);
-            assertEquals("there must be no vertical scrollbar", false, vertical);
+            assertEquals("there must be no vertical scrollbar", false,
+                    vertical);
         }
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
index fcd73f541d..ec998015af 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
index 6d0b78debd..f8c9450ed1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class EmptyTabSheetTest extends MultiBrowserTest {
     public void emptyTabSheetValo() {
         openTestURL("theme=valo");
 
-        WebElement deco = getDriver().findElement(
-                By.className("v-tabsheet-deco"));
+        WebElement deco = getDriver()
+                .findElement(By.className("v-tabsheet-deco"));
 
         Assert.assertEquals("none", deco.getCssValue("display"));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
index 99c47b1703..a96806bf37 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
@@ -16,8 +16,8 @@ public class FirstTabNotVisibleInTabsheetTest extends MultiBrowserTest {
 
         TabSheetElement tabSheet = $(TabSheetElement.class).first();
 
-        Assert.assertTrue("TabSheet should have first tab visible", tabSheet
-                .getTabCaptions().contains("first visible tab"));
+        Assert.assertTrue("TabSheet should have first tab visible",
+                tabSheet.getTabCaptions().contains("first visible tab"));
     }
 
     private void toggleFirstTabVisibility() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
index 4d72f3e6fb..139b9e0821 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
@@ -8,27 +8,27 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
-public class FirstTabNotVisibleWhenTabsheetNotClippedTest extends
-        MultiBrowserTest {
+public class FirstTabNotVisibleWhenTabsheetNotClippedTest
+        extends MultiBrowserTest {
     @Test
     public void testNotClippedTabIsVisible() throws InterruptedException {
         openTestURL();
 
-        ButtonElement toggleNotClipped = $(ButtonElement.class).caption(
-                "Toggle first not clipped tab").first();
+        ButtonElement toggleNotClipped = $(ButtonElement.class)
+                .caption("Toggle first not clipped tab").first();
 
         toggleNotClipped.click();
         TabSheetElement notClippedTabSheet = $(TabSheetElement.class).get(0);
-        WebElement firstTab = notClippedTabSheet.findElement(By
-                .className("v-tabsheet-tabitemcell-first"));
+        WebElement firstTab = notClippedTabSheet
+                .findElement(By.className("v-tabsheet-tabitemcell-first"));
         String caption = firstTab.findElement(By.className("v-captiontext"))
                 .getText();
         Assert.assertEquals("Tab with -first style should be Tab 1", "Tab 1",
                 caption);
 
         toggleNotClipped.click();
-        firstTab = notClippedTabSheet.findElement(By
-                .className("v-tabsheet-tabitemcell-first"));
+        firstTab = notClippedTabSheet
+                .findElement(By.className("v-tabsheet-tabitemcell-first"));
         caption = firstTab.findElement(By.className("v-captiontext")).getText();
         Assert.assertEquals("Tab with -first style should be Tab 0", "Tab 0",
                 caption);
@@ -41,20 +41,20 @@ public class FirstTabNotVisibleWhenTabsheetNotClippedTest extends
         $(ButtonElement.class).caption("show tab D").get(0).click();
         $(ButtonElement.class).caption("show tab C").get(0).click();
 
-        WebElement firstTab = $(TabSheetElement.class).get(2).findElement(
-                By.className("v-tabsheet-tabitemcell-first"));
-        String firstCaption = firstTab.findElement(
-                By.className("v-captiontext")).getText();
+        WebElement firstTab = $(TabSheetElement.class).get(2)
+                .findElement(By.className("v-tabsheet-tabitemcell-first"));
+        String firstCaption = firstTab
+                .findElement(By.className("v-captiontext")).getText();
 
         org.junit.Assert.assertEquals("tab C", firstCaption);
 
         $(ButtonElement.class).caption("show tab D").get(1).click();
         $(ButtonElement.class).caption("show tab C").get(1).click();
 
-        WebElement secondTab = $(TabSheetElement.class).get(3).findElement(
-                By.className("v-tabsheet-tabitemcell-first"));
-        String secondCaption = secondTab.findElement(
-                By.className("v-captiontext")).getText();
+        WebElement secondTab = $(TabSheetElement.class).get(3)
+                .findElement(By.className("v-tabsheet-tabitemcell-first"));
+        String secondCaption = secondTab
+                .findElement(By.className("v-captiontext")).getText();
 
         org.junit.Assert.assertEquals("tab C", secondCaption);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
index 41b7037b09..889c1a13c7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
index bffbc3ecdf..50cb028d54 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Automatic test of the default TabSheet selection algorithm when removing a
  * selected tab.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -69,18 +69,18 @@ public class NewSelectionAfterTabRemoveTest extends MultiBrowserTest {
      * Gets the selected state of the specified tab.
      */
     private boolean isTabSelected(TestBenchElement tab) {
-        return tab.getAttribute("class").contains(
-                "v-tabsheet-tabitemcell-selected")
-                && tab.getAttribute("class").contains(
-                        "v-tabsheet-tabitemcell-focus");
+        return tab.getAttribute("class")
+                .contains("v-tabsheet-tabitemcell-selected")
+                && tab.getAttribute("class")
+                        .contains("v-tabsheet-tabitemcell-focus");
     }
 
     /*
      * Scroll the tabsheet bar to the right.
      */
     private boolean scrollRight() {
-        List<WebElement> scrollElements = getDriver().findElements(
-                By.className("v-tabsheet-scrollerNext"));
+        List<WebElement> scrollElements = getDriver()
+                .findElements(By.className("v-tabsheet-scrollerNext"));
         if (!scrollElements.isEmpty()) {
             TestBenchElement rightScrollElement = (TestBenchElement) scrollElements
                     .get(0);
@@ -95,8 +95,8 @@ public class NewSelectionAfterTabRemoveTest extends MultiBrowserTest {
      * Provide the tab close button for the specified tab.
      */
     private TestBenchElement tabClose(TestBenchElement tab) {
-        return (TestBenchElement) tab.findElement(By
-                .className("v-tabsheet-caption-close"));
+        return (TestBenchElement) tab
+                .findElement(By.className("v-tabsheet-caption-close"));
     }
 
     /*
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
index dd0d8fb44f..4a515a01df 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,11 +32,13 @@ public class PreventTabChangeTest extends MultiBrowserTest {
         clickTab(2);
         Thread.sleep(2000);
         assertTabSelected(2);
-        Assert.assertEquals("Tab 3 contents", getSelectedTabContent().getText());
+        Assert.assertEquals("Tab 3 contents",
+                getSelectedTabContent().getText());
         clickTab(0);
         clickTab(2);
         assertTabSelected(0);
-        Assert.assertEquals("Tab 1 contents", getSelectedTabContent().getText());
+        Assert.assertEquals("Tab 1 contents",
+                getSelectedTabContent().getText());
     }
 
     private void assertTabSelected(int i) throws NoSuchElementException {
@@ -50,13 +52,13 @@ public class PreventTabChangeTest extends MultiBrowserTest {
     }
 
     private WebElement findTab(int i) {
-        return driver.findElement(com.vaadin.testbench.By
-                .vaadin("//TabSheet#tab[" + i + "]"));
+        return driver.findElement(
+                com.vaadin.testbench.By.vaadin("//TabSheet#tab[" + i + "]"));
     }
 
     private WebElement getSelectedTabContent() {
-        return driver.findElement(com.vaadin.testbench.By
-                .vaadin("//TabSheet#tabpanel"));
+        return driver.findElement(
+                com.vaadin.testbench.By.vaadin("//TabSheet#tabpanel"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
index a30a155c01..d67b8d13b0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
index 65307f9492..33cb148228 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
@@ -175,8 +175,8 @@ public class TabKeyboardNavigationTest extends MultiBrowserTest {
     private TestBenchElement tab(int index) {
         By by = By.className("v-tabsheet-tabitemcell");
 
-        TestBenchElement element = (TestBenchElement) getDriver().findElements(
-                by).get(index - 1);
+        TestBenchElement element = (TestBenchElement) getDriver()
+                .findElements(by).get(index - 1);
 
         String expected = "Tab " + index;
         Assert.assertEquals(expected,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
index 64aee8768b..946a50b24a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
@@ -64,8 +64,8 @@ public class TabSelectionRevertedByServerTest extends MultiBrowserTest {
         TestBenchElement tabWrong = tab(wrongIndex);
         String attributeClassWrong = tabWrong.getAttribute("class");
 
-        Assert.assertTrue("Tab " + wrongIndex
-                + " should be selected when click on Tab 4",
+        Assert.assertTrue(
+                "Tab " + wrongIndex + " should be selected when click on Tab 4",
                 !attributeClassWrong
                         .contains("v-tabsheet-tabitemcell-selected"));
     }
@@ -99,8 +99,8 @@ public class TabSelectionRevertedByServerTest extends MultiBrowserTest {
     private TestBenchElement tab(int index) {
         By by = By.className("v-tabsheet-tabitemcell");
 
-        TestBenchElement element = (TestBenchElement) getDriver().findElements(
-                by).get(index - 1);
+        TestBenchElement element = (TestBenchElement) getDriver()
+                .findElements(by).get(index - 1);
 
         String expected = "Tab " + index;
         Assert.assertEquals(expected,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
index 5314038d72..9d83d82297 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Tests that when closing the last tab on a TabSheet, another tab gets selected
  * with no error. Only the last tab should be visible, so the actual TabSheet
  * width should be small.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
index 5462ed2532..2e15c5bfaa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -73,18 +73,19 @@ public class TabSheetErrorTooltipTest extends MultiBrowserTest {
     }
 
     private WebElement getTab(int index) {
-        return vaadinElement("/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild["
-                + index + "]/domChild[0]");
+        return vaadinElement(
+                "/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild["
+                        + index + "]/domChild[0]");
     }
 
     private WebElement getCurrentTooltip() {
-        return getDriver().findElement(
-                By.xpath("//div[@class='v-tooltip-text']"));
+        return getDriver()
+                .findElement(By.xpath("//div[@class='v-tooltip-text']"));
     }
 
     private WebElement getCurrentErrorMessage() {
-        return getDriver().findElement(
-                By.xpath("//div[@class='v-errormessage']"));
+        return getDriver()
+                .findElement(By.xpath("//div[@class='v-errormessage']"));
     }
 
     private void assertTooltip(String tooltip) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
index 52003bbac9..fc9b9ef437 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -68,10 +68,9 @@ public class TabSheetFocusedTabTest extends MultiBrowserTest {
     }
 
     private WebElement getTab(int index) {
-        return getDriver()
-                .findElement(
-                        By.xpath("(//table[contains(@class, 'v-tabsheet-tabs')])[1]/tbody/tr/td["
-                                + (index + 1) + "]/div"));
+        return getDriver().findElement(By
+                .xpath("(//table[contains(@class, 'v-tabsheet-tabs')])[1]/tbody/tr/td["
+                        + (index + 1) + "]/div"));
     }
 
     private boolean isFocused(WebElement tab) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
index 62948bed06..ce07386ae9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,8 +37,7 @@ public class TabSheetFocusingTest extends MultiBrowserTest {
     }
 
     private WebElement getButton(String caption) {
-        return driver.findElement(By
-                .xpath("//span[@class='v-button-caption'][text()='" + caption
-                        + "']"));
+        return driver.findElement(By.xpath(
+                "//span[@class='v-button-caption'][text()='" + caption + "']"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
index 5070fd069c..b3b4e5dc1f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to check that TabsheetBaseConnector reacts on disabling its parent.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TabSheetInDisabledParentTest extends MultiBrowserTest {
@@ -39,8 +39,8 @@ public class TabSheetInDisabledParentTest extends MultiBrowserTest {
         // disable parent
         button.click();
 
-        List<WebElement> tabHeaders = getDriver().findElements(
-                By.className("v-tabsheet-tabitemcell"));
+        List<WebElement> tabHeaders = getDriver()
+                .findElements(By.className("v-tabsheet-tabitemcell"));
         tabHeaders.get(1).findElement(By.className("v-captiontext")).click();
 
         Assert.assertFalse(
@@ -52,8 +52,8 @@ public class TabSheetInDisabledParentTest extends MultiBrowserTest {
         button.click();
 
         // selected tab is still the same
-        tabHeaders = getDriver().findElements(
-                By.className("v-tabsheet-tabitemcell"));
+        tabHeaders = getDriver()
+                .findElements(By.className("v-tabsheet-tabitemcell"));
         Assert.assertTrue(
                 "Tabsheet has wrong selected tab after enabling its parent",
                 tabHeaders.get(0).getAttribute("class")
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
index 8070133bde..0c644c1f11 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@ public class TabSheetInSplitPanelTest extends MultiBrowserTest {
     public void ensureNoScrollbars() {
         openTestURL();
         TabSheetElement ts = $(TabSheetElement.class).first();
-        List<WebElement> scrollables = ts.findElements(By
-                .xpath("//*[contains(@class,'v-scrollable')]"));
+        List<WebElement> scrollables = ts
+                .findElements(By.xpath("//*[contains(@class,'v-scrollable')]"));
         for (WebElement scrollable : scrollables) {
             assertNoHorizontalScrollbar(scrollable,
                     "Element should not have a horizontal scrollbar");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
index 8247b436d0..0482a5073b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests removing tabs that have been scrolled out of view. This should cause no
  * change to the scroll position.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -42,8 +42,8 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
     public void testScrollPositionAfterClosing() throws Exception {
         openTestURL();
         TabSheetElement ts = $(TabSheetElement.class).first();
-        WebElement tabSheetScroller = ts.findElement(By
-                .className("v-tabsheet-scrollerNext"));
+        WebElement tabSheetScroller = ts
+                .findElement(By.className("v-tabsheet-scrollerNext"));
         // scroll to the right
         for (int i = 0; i < 4; i++) {
             tabSheetScroller.click();
@@ -73,7 +73,7 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
      * and only if shouldBeVisible is true. Used for checking that the leftmost
      * visible tab is the expected one when there should be tabs (hidden because
      * of scroll position) to the left of tabId.
-     * 
+     *
      * If there is no tab with the specified id, the tab is considered not to be
      * visible.
      */
@@ -102,7 +102,7 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
      * element is correct. If the element does not exist in the DOM, it is
      * considered not to be visible. If several elements match the locator, only
      * the visibility of the first matching element is considered.
-     * 
+     *
      * @param locator
      *            used to find the element
      * @param expectedVisibility
@@ -140,7 +140,7 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
 
     /**
      * An expectation for checking that the leftmost tab has id equal to tabId.
-     * 
+     *
      * @param tabSheet
      *            the tab sheet containing the tab
      * @param tabId
@@ -152,8 +152,8 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest {
             @Override
             public Boolean apply(WebDriver driver) {
                 try {
-                    WebElement leftElement = tabSheet.findElement(By
-                            .cssSelector(".v-tabsheet-tabitemcell"));
+                    WebElement leftElement = tabSheet.findElement(
+                            By.cssSelector(".v-tabsheet-tabitemcell"));
                     String leftId = leftElement.getAttribute("id");
                     return leftId.equals(tabId);
                 } catch (NoSuchElementException e) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
index c35248c1f4..fbd030105c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test if the page scroll when press space on a tabsheet's tab.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -38,8 +38,8 @@ public class TabSpaceNotScrollTest extends MultiBrowserTest {
     public void testScroll() throws InterruptedException, IOException {
         openTestURL();
 
-        TestBenchElement tab = (TestBenchElement) getDriver().findElement(
-                By.className("v-tabsheet-tabitemcell"));
+        TestBenchElement tab = (TestBenchElement) getDriver()
+                .findElement(By.className("v-tabsheet-tabitemcell"));
         tab.click(10, 10);
 
         Point oldLocation = tab.getLocation();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
index 990f545697..387306ff87 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,9 +25,9 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that tabsheet's scroll button are rendered correctly in Chameleon
  * theme.
- * 
+ *
  * Ticket #12154
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoViewTest.java
index 8f70b2b704..157c423d85 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoViewTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoViewTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
index 42c384dd78..b230e4a4f7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,7 +41,8 @@ public class TabsheetScrollingTest extends MultiBrowserTest {
     }
 
     private WebElement getTab(int index) {
-        return getDriver().findElement(By.vaadin("//TabSheet#tab["+index+"]"));
+        return getDriver()
+                .findElement(By.vaadin("//TabSheet#tab[" + index + "]"));
     }
 
     private String getHideButtonText() {
@@ -55,7 +56,9 @@ public class TabsheetScrollingTest extends MultiBrowserTest {
 
     private WebElement getTabByCaption(TabSheetElement ts, String caption) {
         WebElement tabBar = ts.findElement(By.className("v-tabsheet-tabs"));
-        return tabBar.findElement(By.xpath("./tbody/tr/td[./div/div/div[contains(., normalize-space('"+caption+"'))]]"));
+        return tabBar.findElement(By
+                .xpath("./tbody/tr/td[./div/div/div[contains(., normalize-space('"
+                        + caption + "'))]]"));
     }
 
     private boolean isTabVisible(TabSheetElement ts, String tabCaption) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
index a30299f683..305d5f1658 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
index 6365d00735..2850b3cf26 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
@@ -75,8 +75,9 @@ public class TextAreaSizeResettedTest extends MultiBrowserTest {
         new Actions(getDriver())
                 .moveToElement(getTextArea(),
                         TEXTAREAWIDTH - resizeHandlerOffset,
-                        TEXTAREAHEIGHT - resizeHandlerOffset).clickAndHold()
-                .moveByOffset(offset, offset).release().build().perform();
+                        TEXTAREAHEIGHT - resizeHandlerOffset)
+                .clickAndHold().moveByOffset(offset, offset).release().build()
+                .perform();
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
index 4d750d183f..cd8cbef71f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ public class AutomaticImmediateTest extends MultiBrowserTest {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.tb3.AbstractTB3Test#getUIClass()
      */
     @Override
@@ -40,17 +40,17 @@ public class AutomaticImmediateTest extends MultiBrowserTest {
     public void test() {
         openTestURL();
 
-        WebElement field = getDriver().findElement(
-                By.id(AutomaticImmediate.FIELD));
+        WebElement field = getDriver()
+                .findElement(By.id(AutomaticImmediate.FIELD));
 
-        WebElement toggle = getDriver().findElement(
-                By.xpath("//input[@type = 'checkbox']"));
+        WebElement toggle = getDriver()
+                .findElement(By.xpath("//input[@type = 'checkbox']"));
 
-        WebElement explicitFalseButton = getDriver().findElement(
-                By.id(AutomaticImmediate.EXPLICIT_FALSE));
+        WebElement explicitFalseButton = getDriver()
+                .findElement(By.id(AutomaticImmediate.EXPLICIT_FALSE));
 
-        WebElement hitServerButton = getDriver().findElement(
-                By.id(AutomaticImmediate.BUTTON));
+        WebElement hitServerButton = getDriver()
+                .findElement(By.id(AutomaticImmediate.BUTTON));
 
         String string = getRandomString();
         field.sendKeys(string + Keys.ENTER);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
index fe26fb7aad..0aca3a2011 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
index 3128ae3917..ab213d5ca3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,11 +30,11 @@ public class InputPromptGetTextTest extends MultiBrowserTest {
     public void test() {
         openTestURL();
 
-        WebElement field = getDriver().findElement(
-                By.id(InputPromptGetText.FIELD));
+        WebElement field = getDriver()
+                .findElement(By.id(InputPromptGetText.FIELD));
 
-        WebElement button = getDriver().findElement(
-                By.id(InputPromptGetText.BUTTON));
+        WebElement button = getDriver()
+                .findElement(By.id(InputPromptGetText.BUTTON));
 
         String string = getRandomString();
         field.sendKeys(string + "\n");
@@ -45,8 +45,8 @@ public class InputPromptGetTextTest extends MultiBrowserTest {
 
         button.click();
 
-        WebElement label = getDriver().findElement(
-                By.id(InputPromptGetText.LABEL2));
+        WebElement label = getDriver()
+                .findElement(By.id(InputPromptGetText.LABEL2));
 
         Assert.assertEquals("Your input was:", label.getText().trim());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
index c6ed6c1a58..0580922f86 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for .v-required style
- * 
+ *
  * @author Vaadin Ltd
  */
 public class RequiredTextFieldTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
index f4fa5d0dc5..cdc92e6be7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
index 66b0df5ff4..39da91b071 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
@@ -4,8 +4,8 @@ import org.junit.Test;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class TextFieldTruncatesUnderscoresInModalDialogsTest extends
-        MultiBrowserTest {
+public class TextFieldTruncatesUnderscoresInModalDialogsTest
+        extends MultiBrowserTest {
 
     @Test
     public void testWindowRepositioning() throws Exception {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
index c1b77df5e9..e82701f3a5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.components.table.DndTableTargetDetailsTest;
 /**
  * Test for mouse details in AbstractSelectTargetDetails class when DnD target
  * is a tree.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DndTreeTargetDetailsTest extends DndTableTargetDetailsTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
index 81d906bec3..ca483f8f07 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -123,8 +123,8 @@ public class TreeContextMenuAndIconsTest extends MultiBrowserTest {
     }
 
     private WebElement getTreeNodeByCaption(String caption) {
-        return getDriver().findElement(
-                By.xpath("//span[text() = '" + caption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//span[text() = '" + caption + "']"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
index 351eda6c90..fd5c0a730c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -54,8 +54,8 @@ public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
 
     private void assertTreeCaptionTexts(String... captions) {
         TreeElement tree = $(TreeElement.class).first();
-        List<WebElement> nodes = tree.findElements(By
-                .className("v-tree-node-caption"));
+        List<WebElement> nodes = tree
+                .findElements(By.className("v-tree-node-caption"));
 
         Assert.assertEquals(captions.length, nodes.size());
         for (int i = 0; i < captions.length; i++) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
index 2567fdb16d..6bb8248223 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,8 +27,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 public class TreeItemClickListeningTest extends MultiBrowserTest {
 
     private WebElement getTreeNode(String caption) {
-        return getDriver().findElement(
-                By.xpath("//span[text() = '" + caption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//span[text() = '" + caption + "']"));
     }
 
     @Test
@@ -43,8 +43,7 @@ public class TreeItemClickListeningTest extends MultiBrowserTest {
     }
 
     private void assertEventFired(String text) {
-        assertThat(
-                String.format("Couldn't find text '%s' from the log.", text),
+        assertThat(String.format("Couldn't find text '%s' from the log.", text),
                 logContainsText(text));
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
index 95a3f02d60..0e30e8402c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -47,8 +47,8 @@ public class TreeItemDoubleClickTest extends MultiBrowserTest {
     }
 
     private WebElement getTreeNodeByCaption(String caption) {
-        return getDriver().findElement(
-                By.xpath("//span[text() = '" + caption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//span[text() = '" + caption + "']"));
     }
 
     private void doubleClick(WebElement element) {
@@ -57,8 +57,7 @@ public class TreeItemDoubleClickTest extends MultiBrowserTest {
     }
 
     private void assertLogText(String text) {
-        assertThat(
-                String.format("Couldn't find text '%s' from the log.", text),
+        assertThat(String.format("Couldn't find text '%s' from the log.", text),
                 logContainsText(text));
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
index 2fb35b1680..6ea21bc31d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -43,19 +43,20 @@ public class TreeItemSelectionWithoutImmediateTest extends MultiBrowserTest {
             new Actions(getDriver()).moveToElement(treeItem).click().perform();
             Thread.sleep(100);
 
-            WebElement selectedElement = driver.findElement(By
-                    .className("v-tree-node-selected"));
+            WebElement selectedElement = driver
+                    .findElement(By.className("v-tree-node-selected"));
 
             treeItem = getTreeNode(String.format(
                     TreeItemSelectionWithoutImmediate.MENU_ITEM_TEMPLATE, i));
 
-            assertThat("Clicked element should be selected", selectedElement
-                    .getText().equals(treeItem.getText()), is(true));
+            assertThat("Clicked element should be selected",
+                    selectedElement.getText().equals(treeItem.getText()),
+                    is(true));
         }
     }
 
     private WebElement getTreeNode(String caption) {
-        return getDriver().findElement(
-                By.xpath("//span[text() = '" + caption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//span[text() = '" + caption + "']"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
index 98f1896b82..9ed019c2a3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for keyboard navigation in tree in case when there are no items to
  * navigate.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeKeyboardNavigationToNoneTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
index b8715ed505..4c26c1f376 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
@@ -1,12 +1,12 @@
 /* 
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @since 7.1.9
  * @author Vaadin Ltd
  */
@@ -38,8 +38,8 @@ public class TreeScrollingOnRightClickTest extends MultiBrowserTest {
         openTestURL();
 
         // Focus tree
-        WebElement tree = getDriver().findElement(
-                By.id(TreeScrollingOnRightClick.TREE_ID));
+        WebElement tree = getDriver()
+                .findElement(By.id(TreeScrollingOnRightClick.TREE_ID));
         tree.click();
 
         // Move selection down 50 items
@@ -63,7 +63,7 @@ public class TreeScrollingOnRightClickTest extends MultiBrowserTest {
     }
 
     private WebElement getTreeNode(String caption) {
-        return getDriver().findElement(
-                By.xpath("//span[text() = '" + caption + "']"));
+        return getDriver()
+                .findElement(By.xpath("//span[text() = '" + caption + "']"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
index e4d97b9de1..5b37751891 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that expanded cells with component contents aren't empty.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DisappearingComponentsTest extends MultiBrowserTest {
@@ -40,8 +40,8 @@ public class DisappearingComponentsTest extends MultiBrowserTest {
                 .findElement(By.className("v-treetable-treespacer")).click();
         sleep(100);
 
-        WebElement link = treeTable.getCell(2, 1).findElement(
-                By.className("v-link"));
+        WebElement link = treeTable.getCell(2, 1)
+                .findElement(By.className("v-link"));
         assertEquals("3", link.getText());
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
index 46c2f397b6..9b3323dc6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
index f767e5fd52..80585ae84f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,23 +28,24 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that TreeTable with ContainerHierarchicalWrapper is updated correctly
  * when the setParent() is called for the item just added
- * 
+ *
  * @author Vaadin Ltd
  */
-public class TreeTableContainerHierarchicalWrapperTest extends MultiBrowserTest {
+public class TreeTableContainerHierarchicalWrapperTest
+        extends MultiBrowserTest {
 
     @Test
     public void testStructure() throws InterruptedException {
         openTestURL();
 
         TreeTableElement treeTable = $(TreeTableElement.class).first();
-        WebElement findElement = treeTable.getCell(0, 0).findElement(
-                By.className("v-treetable-treespacer"));
+        WebElement findElement = treeTable.getCell(0, 0)
+                .findElement(By.className("v-treetable-treespacer"));
         findElement.click();
 
         TestBenchElement cell = treeTable.getCell(5, 0);
-        WebElement findElement2 = cell.findElement(By
-                .className("v-treetable-treespacer"));
+        WebElement findElement2 = cell
+                .findElement(By.className("v-treetable-treespacer"));
         assertEquals("Item 0-5", cell.getText());
         findElement2.click();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
index 849d19cafa..6365ae8fab 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.TooltipTest;
 
 /**
  * Tests TreeTable tooltips with various settings.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTableItemDescriptionGeneratorUITest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
index 0831232df7..72816a44b6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that opening the root node and clicking a generated component doesn't
  * cause out of sync (or any other system notifications).
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTableOutOfSyncTest extends MultiBrowserTest {
@@ -39,11 +39,12 @@ public class TreeTableOutOfSyncTest extends MultiBrowserTest {
         openTestURL();
 
         TreeTableElement treeTable = $(TreeTableElement.class).first();
-        List<WebElement> rows = treeTable.findElement(
-                By.className("v-table-body")).findElements(By.tagName("tr"));
+        List<WebElement> rows = treeTable
+                .findElement(By.className("v-table-body"))
+                .findElements(By.tagName("tr"));
 
-        WebElement treeSpacer = rows.get(0).findElement(
-                By.className("v-treetable-treespacer"));
+        WebElement treeSpacer = rows.get(0)
+                .findElement(By.className("v-treetable-treespacer"));
         treeSpacer.click();
 
         sleep(100);
@@ -53,8 +54,8 @@ public class TreeTableOutOfSyncTest extends MultiBrowserTest {
         WebElement button = rows.get(2).findElement(By.className("v-button"));
         button.click();
 
-        List<WebElement> notifications = findElements(By
-                .className("v-Notification-system"));
+        List<WebElement> notifications = findElements(
+                By.className("v-Notification-system"));
         assertTrue(notifications.isEmpty());
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
index d88c6ba7ca..04d6f5e511 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests expanding TreeTable rows when page length is zero.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTablePartialUpdatesPageLength0Test extends MultiBrowserTest {
@@ -39,17 +39,18 @@ public class TreeTablePartialUpdatesPageLength0Test extends MultiBrowserTest {
         openTestURL();
 
         TreeTableElement treeTable = $(TreeTableElement.class).first();
-        List<WebElement> rows = treeTable.findElement(
-                By.className("v-table-body")).findElements(By.tagName("tr"));
+        List<WebElement> rows = treeTable
+                .findElement(By.className("v-table-body"))
+                .findElements(By.tagName("tr"));
         assertEquals("unexpected row count", 4, rows.size());
-        assertEquals("unexpected contents", "root1", treeTable.getCell(0, 0)
-                .getText());
-        assertEquals("unexpected contents", "root2", treeTable.getCell(1, 0)
-                .getText());
-        assertEquals("unexpected contents", "root3", treeTable.getCell(2, 0)
-                .getText());
-        assertEquals("unexpected contents", "END", treeTable.getCell(3, 0)
-                .getText());
+        assertEquals("unexpected contents", "root1",
+                treeTable.getCell(0, 0).getText());
+        assertEquals("unexpected contents", "root2",
+                treeTable.getCell(1, 0).getText());
+        assertEquals("unexpected contents", "root3",
+                treeTable.getCell(2, 0).getText());
+        assertEquals("unexpected contents", "END",
+                treeTable.getCell(3, 0).getText());
 
         // expand first row, should have 10 children
         treeTable.getCell(0, 0)
@@ -61,14 +62,14 @@ public class TreeTablePartialUpdatesPageLength0Test extends MultiBrowserTest {
         assertEquals("unexpected row count", 14, rows.size());
 
         // expand root3, should have 200 children
-        assertEquals("unexpected contents", "root3", treeTable.getCell(12, 0)
-                .getText());
+        assertEquals("unexpected contents", "root3",
+                treeTable.getCell(12, 0).getText());
         treeTable.getCell(12, 0)
                 .findElement(By.className("v-treetable-treespacer")).click();
 
         // expand root2, should have 200 children
-        assertEquals("unexpected contents", "root2", treeTable.getCell(11, 0)
-                .getText());
+        assertEquals("unexpected contents", "root2",
+                treeTable.getCell(11, 0).getText());
         treeTable.getCell(11, 0)
                 .findElement(By.className("v-treetable-treespacer")).click();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
index 5a55df581c..d3eae2e653 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests partial updates of a TreeTable.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
@@ -42,8 +42,9 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
         openTestURL();
 
         TreeTableElement treeTable = $(TreeTableElement.class).first();
-        List<WebElement> rows = treeTable.findElement(
-                By.className("v-table-body")).findElements(By.tagName("tr"));
+        List<WebElement> rows = treeTable
+                .findElement(By.className("v-table-body"))
+                .findElements(By.tagName("tr"));
         assertEquals("unexpected row count", 4, rows.size());
 
         // expand the first root element
@@ -52,8 +53,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
         treeTable = $(TreeTableElement.class).first();
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
         rows = treeTable.findElement(By.className("v-table-body"))
                 .findElements(By.tagName("tr"));
@@ -61,28 +62,28 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
 
         // TODO: replace these with just treeTable.scroll(int) when #13826 has
         // been fixed
-        TestBenchElementCommands scrollable = testBenchElement(treeTable
-                .findElement(By.className("v-scrollable")));
+        TestBenchElementCommands scrollable = testBenchElement(
+                treeTable.findElement(By.className("v-scrollable")));
 
         // scroll far enough down to drop the first row from the cache
         // but not far enough to reach the last row
         scrollable.scroll(1692);
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[0]/col[0]")).size());
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[203]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[0]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[203]/col[0]")).size());
 
         // scroll 6000 to make sure to actually hit bottom
         scrollable.scroll(6000);
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
         // check the contents
         treeTable = $(TreeTableElement.class).first();
@@ -96,23 +97,24 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
         assertEquals("unexpected cell contents (first cached row expected)",
                 "158", treeTable.getCell(159, 0).getText());
 
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[158]/col[0]")).size());
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[204]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[158]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[204]/col[0]")).size());
 
         // check the actual visibility
         compareScreen("bottom");
     }
 
     @Test
-    public void testNegativeArraySize() throws IOException,
-            InterruptedException {
+    public void testNegativeArraySize()
+            throws IOException, InterruptedException {
         openTestURL();
 
         TreeTableElement treeTable = $(TreeTableElement.class).first();
-        List<WebElement> rows = treeTable.findElement(
-                By.className("v-table-body")).findElements(By.tagName("tr"));
+        List<WebElement> rows = treeTable
+                .findElement(By.className("v-table-body"))
+                .findElements(By.tagName("tr"));
         assertEquals("unexpected row count", 4, rows.size());
 
         // expand the first root element
@@ -120,8 +122,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
                 .findElement(By.className("v-treetable-treespacer")).click();
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
         treeTable = $(TreeTableElement.class).first();
         rows = treeTable.findElement(By.className("v-table-body"))
@@ -130,18 +132,18 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
 
         // TODO: replace these with just treeTable.scroll(int) when #13826 has
         // been fixed
-        TestBenchElementCommands scrollable = testBenchElement(treeTable
-                .findElement(By.className("v-scrollable")));
+        TestBenchElementCommands scrollable = testBenchElement(
+                treeTable.findElement(By.className("v-scrollable")));
 
         // scroll far enough down to reach the second root item again
         scrollable.scroll(3969);
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[0]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[0]/col[0]")).size());
         assertEquals("unexpected cell contents", "root2",
                 treeTable.getCell(201, 0).getText());
         assertEquals("unexpected cell contents", "END",
@@ -152,8 +154,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
                 .findElement(By.className("v-treetable-treespacer")).click();
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
         // ensure the last cached row isn't the final row
         treeTable = $(TreeTableElement.class).first();
@@ -169,8 +171,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
                 .findElement(By.className("v-treetable-treespacer")).click();
 
         // wait for the scrollposition element to disappear
-        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-table-scrollposition")));
+        waitUntilNot(ExpectedConditions.visibilityOfElementLocated(
+                By.className("v-table-scrollposition")));
 
         // check the contents
         treeTable = $(TreeTableElement.class).first();
@@ -184,10 +186,10 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest {
         assertEquals("unexpected cell contents (first cached row expected)",
                 "158", treeTable.getCell(159, 0).getText());
 
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[158]/col[0]")).size());
-        assertEquals("elements found where there should be none", 0, treeTable
-                .findElements(By.vaadin("#row[204]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[158]/col[0]")).size());
+        assertEquals("elements found where there should be none", 0,
+                treeTable.findElements(By.vaadin("#row[204]/col[0]")).size());
 
         // check the actual visibility
         compareScreen("bottom");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
index 84a2f7bbb3..b12e4b78c2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
index 0215c14aef..0bc98c39b9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for absence of empty row header for RowHeaderMode.ICON_ONLY
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTableRowHeaderModeTest extends MultiBrowserTest {
@@ -34,6 +34,7 @@ public class TreeTableRowHeaderModeTest extends MultiBrowserTest {
 
         Assert.assertFalse(
                 "Unexpected row header for icons is found in TreeTable",
-                isElementPresent(By.className("v-table-header-cell-rowheader")));
+                isElementPresent(
+                        By.className("v-table-header-cell-rowheader")));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
index 2e299d62ea..f70883ad96 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
index a17559cc81..047a8940c6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,8 +39,8 @@ public class TreeTableScrollOnExpandTest extends MultiBrowserTest {
         // Need to wait a bit to avoid accepting the case where the TreeTable is
         // in the desired state only for a short while.
         sleep(1000);
-        WebElement focusedRow = getDriver().findElement(
-                By.className("v-table-focus"));
+        WebElement focusedRow = getDriver()
+                .findElement(By.className("v-table-focus"));
         assertEquals("Item 21", focusedRow.getText());
     }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
index 760d2f39ea..a1f812d0f4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * Test class for issue #13477, where selecting a combobox item that is too long
  * would render the ending of an item instead of the beginning, which was
  * considered less than informative.
- * 
+ *
  * @author Vaadin Ltd
  */
 
@@ -66,17 +66,20 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest {
             String screenshotIdentifier) throws IOException {
         openTestURL();
 
-        WebElement comboBox = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
-                + indexToTest + "]/VFilterSelect[0]");
-        WebElement comboBoxFocus = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
-                + indexToFocus + "]/VFilterSelect[0]");
+        WebElement comboBox = vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
+                        + indexToTest + "]/VFilterSelect[0]");
+        WebElement comboBoxFocus = vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
+                        + indexToFocus + "]/VFilterSelect[0]");
 
         // Select an element from the first (to test) combobox.
 
         comboBox.findElement(By.className("v-filterselect-button")).click();
         waitForPopup(comboBox);
-        WebElement comboBoxPopup = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
-                + indexToTest + "]/VFilterSelect[0]#popup");
+        WebElement comboBoxPopup = vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
+                        + indexToTest + "]/VFilterSelect[0]#popup");
         comboBoxPopup.findElements(By.tagName("td")).get(2).click();
 
         // Select an element from the second (to focus) combobox to remove
@@ -85,8 +88,9 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest {
         comboBoxFocus.findElement(By.className("v-filterselect-button"))
                 .click();
         waitForPopup(comboBoxFocus);
-        comboBoxPopup = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
-                + indexToFocus + "]/VFilterSelect[0]#popup");
+        comboBoxPopup = vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot["
+                        + indexToFocus + "]/VFilterSelect[0]#popup");
         comboBoxPopup.findElements(By.tagName("td")).get(2).click();
 
         // click the button of the first combobox. This would reveal the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
index 4bab0e5237..e6e063fbd9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests if a component is included in a custom widgetset
  * (com.vaadin.tests.widgetset.TestingWidgetSet)
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComponentIncludedInCustomWidgetsetTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
index 429bcc0afc..3a2600df6f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for testing if a component is missing from a widgetset.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComponentMissingFromDefaultWidgetsetTest extends MultiBrowserTest {
@@ -33,10 +33,8 @@ public class ComponentMissingFromDefaultWidgetsetTest extends MultiBrowserTest {
     public void testComponentInTestingWidgetset() {
         openTestURL();
         WebElement component = vaadinElementById("missing-component");
-        assertTrue(component
-                .getText()
-                .startsWith(
-                        "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain implementation for com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent."));
+        assertTrue(component.getText().startsWith(
+                "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain implementation for com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent."));
 
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
index 55466130ad..73209cb6f8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,8 +42,8 @@ public class DynamicViewportEmptyTest extends MultiBrowserTest {
     public void testGeneratedEmptyViewport() {
         openTestURL();
 
-        List<WebElement> viewportElements = findElements(By
-                .cssSelector("meta[name=viewport]"));
+        List<WebElement> viewportElements = findElements(
+                By.cssSelector("meta[name=viewport]"));
 
         Assert.assertTrue("There should be no viewport tags",
                 viewportElements.isEmpty());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java
index f1d9efdbd1..8d5af3bb88 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,10 +28,10 @@ public class DynamicViewportTest extends SingleBrowserTest {
     public void testGeneratedViewport() {
         openTestURL();
 
-        WebElement viewportElement = findElement(By
-                .cssSelector("meta[name=viewport]"));
+        WebElement viewportElement = findElement(
+                By.cssSelector("meta[name=viewport]"));
 
-        Assert.assertTrue(viewportElement.getAttribute("content").contains(
-                "PhantomJS"));
+        Assert.assertTrue(
+                viewportElement.getAttribute("content").contains("PhantomJS"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
index f52797dd63..69f677a977 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
index 9d0aac49f7..6119a7dbd1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
index 10a297d47b..5470a8c229 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
@@ -20,8 +20,8 @@ public class RpcInvocationHandlerToStringTest extends MultiBrowserTest {
         $(ButtonElement.class)
                 .caption("Exec " + method + " for an invocation proxy").first()
                 .click();
-        Assert.assertFalse(method
-                + " for invocation proxy caused a notification",
+        Assert.assertFalse(
+                method + " for invocation proxy caused a notification",
                 $(NotificationElement.class).exists());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java
index 61b3c944c9..17e286a2c6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ public class StaticViewportTest extends SingleBrowserTest {
     public void testStaticViewport() {
         openTestURL();
 
-        WebElement viewportElement = findElement(By
-                .cssSelector("meta[name=viewport]"));
+        WebElement viewportElement = findElement(
+                By.cssSelector("meta[name=viewport]"));
 
         Assert.assertEquals("myViewport",
                 viewportElement.getAttribute("content"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index 43422feb58..2121bdfd73 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,7 +49,8 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest {
     }
 
     @Test
-    public void textAreaCtrlEnterEventPropagation() throws InterruptedException {
+    public void textAreaCtrlEnterEventPropagation()
+            throws InterruptedException {
         openTestURL();
 
         WebElement textArea = $(TextAreaElement.class).first();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
index 5de903e8d4..a21c31e3ed 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests that the TextArea widget correctly stops ENTER events from propagating.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TextAreaEventPropagationTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
index b5440b8f76..dd1bbc9fc0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -60,8 +60,8 @@ public class TimeoutRedirectResetsOnActivityTest extends MultiBrowserTest {
         assertThat(driver.getCurrentUrl(), is(getTestUrl()));
 
         testBench().disableWaitForVaadin();
-        Thread.sleep(actualExpireTime - originalExpireTime
-                + communicationOverhead);
+        Thread.sleep(
+                actualExpireTime - originalExpireTime + communicationOverhead);
 
         assertThat(driver.getCurrentUrl(), is(not(getTestUrl())));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
index 0e37aa36fb..acb043ae50 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,17 +40,21 @@ public class UIAccessTest extends MultiBrowserTest {
 
         $(ButtonElement.class).get(7).click();
 
-        waitForLogToContainText("0. Current UI matches in beforeResponse? true");
-        waitForLogToContainText("1. Current session matches in beforeResponse? true");
+        waitForLogToContainText(
+                "0. Current UI matches in beforeResponse? true");
+        waitForLogToContainText(
+                "1. Current session matches in beforeResponse? true");
     }
 
     @Test
     public void canBeAccessedFromUIThread() {
         $(ButtonElement.class).first().click();
 
-        assertTrue(logContainsText("0. Access from UI thread future is done? false"));
+        assertTrue(logContainsText(
+                "0. Access from UI thread future is done? false"));
         assertTrue(logContainsText("1. Access from UI thread is run"));
-        assertTrue(logContainsText("2. beforeClientResponse future is done? true"));
+        assertTrue(logContainsText(
+                "2. beforeClientResponse future is done? true"));
     }
 
     @Test
@@ -78,14 +82,16 @@ public class UIAccessTest extends MultiBrowserTest {
 
         assertTrue(logContainsText("0. Throwing exception in access"));
         assertTrue(logContainsText("1. firstFuture is done? true"));
-        assertTrue(logContainsText("2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can"));
+        assertTrue(logContainsText(
+                "2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can"));
     }
 
     @Test
     public void futureIsCancelledBeforeStarted() {
         $(ButtonElement.class).get(3).click();
 
-        assertTrue(logContainsText("0. future was cancelled, should not start"));
+        assertTrue(
+                logContainsText("0. future was cancelled, should not start"));
     }
 
     @Test
@@ -102,9 +108,12 @@ public class UIAccessTest extends MultiBrowserTest {
         $(ButtonElement.class).get(5).click();
 
         assertTrue(logContainsText("0. accessSynchronously has request? true"));
-        assertTrue(logContainsText("1. Test value in accessSynchronously: Set before accessSynchronosly"));
-        assertTrue(logContainsText("2. has request after accessSynchronously? true"));
-        assertTrue(logContainsText("3. Test value after accessSynchornously: Set in accessSynchronosly"));
+        assertTrue(logContainsText(
+                "1. Test value in accessSynchronously: Set before accessSynchronosly"));
+        assertTrue(logContainsText(
+                "2. has request after accessSynchronously? true"));
+        assertTrue(logContainsText(
+                "3. Test value after accessSynchornously: Set in accessSynchronosly"));
     }
 
     @Test
@@ -112,9 +121,11 @@ public class UIAccessTest extends MultiBrowserTest {
         $(ButtonElement.class).get(6).click();
 
         assertTrue(logContainsText("0. access has request? false"));
-        assertTrue(logContainsText("1. Test value in access: Set before access"));
+        assertTrue(
+                logContainsText("1. Test value in access: Set before access"));
         assertTrue(logContainsText("2. has request after access? true"));
-        assertTrue(logContainsText("3. Test value after access: Set before run pending"));
+        assertTrue(logContainsText(
+                "3. Test value after access: Set before run pending"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
index 73e0a7f6b9..2d0a55a4e6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import java.util.Locale;
 
 /**
  * Test to check auto-generated style name for UI div and overlays div.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UIAutoGeneratedStyleNameTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
index 1e69662935..641ac6d82a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
@@ -37,8 +37,9 @@ public class UIInitBrowserDetailsTest extends MultiBrowserTest {
     private void compareRequestAndBrowserValue(String paramName,
             String browserName, String errorValue) {
         assertTextNotEquals(browserName, errorValue);
-        Assert.assertEquals(String.format(
-                "Browser and request values differ in '%s',", browserName),
+        Assert.assertEquals(
+                String.format("Browser and request values differ in '%s',",
+                        browserName),
                 getLabelText(paramName), getLabelText(browserName));
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java
index d002642a74..c1d6aaa55b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java
@@ -9,7 +9,7 @@ public class UIInitExceptionTest extends MultiBrowserTest {
     @Test
     public void testExceptionOnUIInit() throws Exception {
         openTestURL();
-        Assert.assertTrue("Page does not contain the given text", driver
-                .getPageSource().contains("Catch me if you can"));
+        Assert.assertTrue("Page does not contain the given text",
+                driver.getPageSource().contains("Catch me if you can"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index c4a41d135a..0be0efae2b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
@@ -24,13 +24,13 @@ public class UIPollingTest extends MultiBrowserTest {
         getTextField().setValue("500");
         sleep(2000);
         /* Ensure polling has taken place */
-        Assert.assertTrue("Page does not contain the given text", driver
-                .getPageSource().contains("2. 1000ms has passed"));
+        Assert.assertTrue("Page does not contain the given text",
+                driver.getPageSource().contains("2. 1000ms has passed"));
         getTextField().setValue("-1");
         sleep(2000);
         /* Ensure polling has stopped */
-        Assert.assertFalse("Page contains the given text", driver
-                .getPageSource().contains("20. 10000ms has passed"));
+        Assert.assertFalse("Page contains the given text",
+                driver.getPageSource().contains("20. 10000ms has passed"));
     }
 
     public TextFieldElement getTextField() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java
index 7d701f4ae0..4dcb26647c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java
index 649f48c9ce..d4eb11aff5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java
@@ -21,10 +21,8 @@ public class UISerializationTest extends SingleBrowserTest {
 
         assertThat(getLogRow(0), startsWith("3. Diff states match, size: "));
         assertThat(getLogRow(1), startsWith("2. Deserialized UI in "));
-        assertThat(
-                getLogRow(2),
-                allOf(startsWith("1. Serialized UI in"),
-                        containsString(" into "), endsWith(" bytes")));
+        assertThat(getLogRow(2), allOf(startsWith("1. Serialized UI in"),
+                containsString(" into "), endsWith(" bytes")));
     }
 
     private void serialize() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
index 188a0aea3e..99894d40a8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
index 661db179e7..13f3b52655 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -38,8 +38,8 @@ public class UnnecessaryPaddingInResponsiveUITest extends SingleBrowserTest {
 
         String paddingTop = ui.getCssValue("padding-top");
 
-        Integer paddingHeight = Integer.parseInt(paddingTop.substring(0,
-                paddingTop.length() - 2));
+        Integer paddingHeight = Integer
+                .parseInt(paddingTop.substring(0, paddingTop.length() - 2));
 
         assertThat(paddingHeight, equalTo(0));
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
index 37766dd060..72108c5912 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.components.button.ButtonClick;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
index 93324f0792..ba82806cac 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -38,6 +38,7 @@ public class WindowAndUIShortcutsTest extends SingleBrowserTest {
         // Window should have been closed
         Assert.assertTrue($(WindowElement.class).all().isEmpty());
         // "Close page" should not have been clicked
-        Assert.assertTrue($(ButtonElement.class).caption("Close page").exists());
+        Assert.assertTrue(
+                $(ButtonElement.class).caption("Close page").exists());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java
index 6a7174bf99..e638abfcdd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
index 8c4349ad5f..b7da733cc4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
index 47c4c1baae..abaadb1475 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
index cdeb4b0606..4e94e98b21 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java
index 073ab27566..8a71a6ad99 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index 86847fc28e..b299332324 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -20,16 +20,16 @@ import com.vaadin.tests.tb3.newelements.WindowElement;
 public abstract class ThemeTest extends MultiBrowserTest {
 
     @ServerClass("com.vaadin.ui.DateField")
-    public static class DateFieldElement extends
-            com.vaadin.testbench.elements.DateFieldElement {
+    public static class DateFieldElement
+            extends com.vaadin.testbench.elements.DateFieldElement {
         public void openPopup() {
             findElement(By.tagName("button")).click();
         }
     }
 
     @ServerClass("com.vaadin.ui.TabSheet")
-    public static class TabSheetElement extends
-            com.vaadin.testbench.elements.TabSheetElement {
+    public static class TabSheetElement
+            extends com.vaadin.testbench.elements.TabSheetElement {
         @Override
         public void openTab(String tabCaption) {
             super.openTab(tabCaption);
@@ -137,7 +137,8 @@ public abstract class ThemeTest extends MultiBrowserTest {
         testNotification(3, "notification-tray");
     }
 
-    private void testNotification(int id, String identifier) throws IOException {
+    private void testNotification(int id, String identifier)
+            throws IOException {
         $(ButtonElement.class).id("notifButt" + id).click();
         compareScreen(identifier);
         $(FixedNotificationElement.class).first().close();
@@ -184,8 +185,8 @@ public abstract class ThemeTest extends MultiBrowserTest {
         if (searchComboBox.findElement(By.tagName("div")).isDisplayed()) {
             searchComboBox.openPopup();
         } else {
-            WebElement textBox = searchComboBox.findElement(By
-                    .vaadin("#textbox"));
+            WebElement textBox = searchComboBox
+                    .findElement(By.vaadin("#textbox"));
             textBox.click();
             textBox.sendKeys(Keys.ARROW_DOWN);
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java
index cf6a6ac821..6bee95f160 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests UI scrolling.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UIScrollingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java
index f1d5432344..f57e407416 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,8 +64,8 @@ public class TestFileUploadTest extends MultiBrowserTest {
     }
 
     private String md5(String string) throws NoSuchAlgorithmException {
-        byte[] digest = MessageDigest.getInstance("MD5").digest(
-                string.getBytes());
+        byte[] digest = MessageDigest.getInstance("MD5")
+                .digest(string.getBytes());
         BigInteger bigInt = new BigInteger(1, digest);
         String hashtext = bigInt.toString(16);
         return hashtext;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
index a0d6d471fb..18ef76caa3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo;
 import com.vaadin.ui.themes.*;
 import org.junit.Test;
 
-public class UploadImmediateButtonWidthChameleonTest extends
-        UploadImmediateButtonWidthTest {
+public class UploadImmediateButtonWidthChameleonTest
+        extends UploadImmediateButtonWidthTest {
 
     @Override
     protected String getTheme() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
index c22e416a25..ab2a15e181 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo;
 import com.vaadin.ui.themes.*;
 import org.junit.Test;
 
-public class UploadImmediateButtonWidthReindeerTest extends
-        UploadImmediateButtonWidthTest {
+public class UploadImmediateButtonWidthReindeerTest
+        extends UploadImmediateButtonWidthTest {
 
     @Override
     protected String getTheme() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
index 0ab4fbbc7e..ff5860ce33 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo;
 import com.vaadin.ui.themes.*;
 import org.junit.Test;
 
-public class UploadImmediateButtonWidthRunoTest extends
-        UploadImmediateButtonWidthTest {
+public class UploadImmediateButtonWidthRunoTest
+        extends UploadImmediateButtonWidthTest {
 
     @Override
     protected String getTheme() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
index b2a29c92e3..348bda822e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
index 9d8fe6ba9e..467acbffc5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo;
 import com.vaadin.ui.themes.*;
 import org.junit.Test;
 
-public class UploadImmediateButtonWidthValoTest extends
-        UploadImmediateButtonWidthTest {
+public class UploadImmediateButtonWidthValoTest
+        extends UploadImmediateButtonWidthTest {
 
     @Override
     protected String getTheme() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
index 30dbefc06b..6ad90c3a74 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,8 +42,8 @@ public class UploadNoSelectionTest extends MultiBrowserTest {
     }
 
     private WebElement getSubmitButton() {
-        WebElement element = getDriver().findElement(
-                By.id(UploadNoSelection.UPLOAD_ID));
+        WebElement element = getDriver()
+                .findElement(By.id(UploadNoSelection.UPLOAD_ID));
         WebElement submitButton = element.findElement(By.className("v-button"));
         return submitButton;
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
index 54ccf993ff..03ec474b46 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.TooltipTest;
 
 /**
  * Test for check visibility of browser-dependent tootlip for Upload component.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UploadTitleWithTooltipTest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
index e18b5b043a..e561d21c71 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -85,8 +85,8 @@ public class BackspaceKeyWithModalOpenedTest extends MultiBrowserTest {
         WebElement nextButton = driver.findElement(By.id(BTN_NEXT_ID));
         nextButton.click();
 
-        WebElement openModalButton = driver.findElement(By
-                .id(BTN_OPEN_MODAL_ID));
+        WebElement openModalButton = driver
+                .findElement(By.id(BTN_OPEN_MODAL_ID));
         openModalButton.click();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
index 3d0da2677b..5ed08363d8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,9 +28,9 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Automatic test for fix for #12943.
- * 
+ *
  * While testing without the fix, the test failed on both Chrome and PhantomJS.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -49,8 +49,8 @@ public class BottomComponentScrollsUpTest extends MultiBrowserTest {
                 .findElement(By.className("v-panel-content"));
         Dimension panelScrollableSize = panelScrollable.getSize();
 
-        WebElement verticalLayout = panelScrollable.findElement(By
-                .className("v-verticallayout"));
+        WebElement verticalLayout = panelScrollable
+                .findElement(By.className("v-verticallayout"));
         Dimension verticalLayoutSize = verticalLayout.getSize();
 
         panelScrollable.scroll(verticalLayoutSize.height);
@@ -63,8 +63,8 @@ public class BottomComponentScrollsUpTest extends MultiBrowserTest {
         // Loose the focus from the button.
         new Actions(getDriver())
                 .moveToElement(panelScrollable, panelScrollableSize.width / 2,
-                        panelScrollableSize.height / 2).click().build()
-                .perform();
+                        panelScrollableSize.height / 2)
+                .click().build().perform();
 
         compareScreen("window");
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
index aec0a7c9df..42d84a728e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,44 +32,44 @@ public class CloseModalSubWindowTest extends MultiBrowserTest {
         openTestURL();
 
         // assert that there's a button with a 'del-btn0' id
-        List<WebElement> buttons = getDriver().findElements(
-                By.id(CloseModalSubWindow.DELETE_BUTTON + "0"));
+        List<WebElement> buttons = getDriver()
+                .findElements(By.id(CloseModalSubWindow.DELETE_BUTTON + "0"));
         int deleteButtonCount = buttons.size();
         Assert.assertEquals(1, deleteButtonCount);
 
         // assert that there's no sub-windows open
-        List<WebElement> subWindows = getDriver().findElements(
-                By.id(CloseModalSubWindow.SUB_WINDOW));
+        List<WebElement> subWindows = getDriver()
+                .findElements(By.id(CloseModalSubWindow.SUB_WINDOW));
         Assert.assertEquals(0, subWindows.size());
 
         // click the first delete button
         getFirstDeteleButton(0).click();
 
         // assert that there's ONE sub-window open
-        subWindows = getDriver().findElements(
-                By.id(CloseModalSubWindow.SUB_WINDOW));
+        subWindows = getDriver()
+                .findElements(By.id(CloseModalSubWindow.SUB_WINDOW));
         Assert.assertEquals(1, subWindows.size());
 
-        WebElement confirm = getDriver().findElement(
-                By.id(CloseModalSubWindow.CONFIRM_BUTTON));
+        WebElement confirm = getDriver()
+                .findElement(By.id(CloseModalSubWindow.CONFIRM_BUTTON));
 
         // click the confirm button in the sub-window
         confirm.click();
 
         // assert that there's no sub-windows open
-        subWindows = getDriver().findElements(
-                By.id(CloseModalSubWindow.SUB_WINDOW));
+        subWindows = getDriver()
+                .findElements(By.id(CloseModalSubWindow.SUB_WINDOW));
         Assert.assertEquals(0, subWindows.size());
 
         // assert that there's no button with 'del-btn0' id anymore
-        buttons = getDriver().findElements(
-                By.id(CloseModalSubWindow.DELETE_BUTTON + "0"));
+        buttons = getDriver()
+                .findElements(By.id(CloseModalSubWindow.DELETE_BUTTON + "0"));
         Assert.assertEquals(0, buttons.size());
     }
 
     private WebElement getFirstDeteleButton(int index) {
-        WebElement button = getDriver().findElement(
-                By.id(CloseModalSubWindow.DELETE_BUTTON + index));
+        WebElement button = getDriver()
+                .findElement(By.id(CloseModalSubWindow.DELETE_BUTTON + index));
         return button;
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
index a80938ba32..8400d4ad0d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.newelements.WindowElement;
 
 /**
  * Tests that a ComboBox at the bottom of a Window remains visible when clicked.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ComboboxScrollableWindowTest extends MultiBrowserTest {
@@ -39,9 +39,10 @@ public class ComboboxScrollableWindowTest extends MultiBrowserTest {
         openTestURL();
 
         WindowElement window = $(WindowElement.class).id(WINDOW_ID);
-        WebElement scrollableElement = window.findElement(By
-                .className("v-scrollable"));
-        TestBenchElementCommands scrollable = testBenchElement(scrollableElement);
+        WebElement scrollableElement = window
+                .findElement(By.className("v-scrollable"));
+        TestBenchElementCommands scrollable = testBenchElement(
+                scrollableElement);
         scrollable.scroll(1000);
         ComboBoxElement comboBox = $(ComboBoxElement.class).id(COMBOBOX_ID);
         comboBox.openPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
index 4ec1dc5c98..4b0415d381 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests dialogs with WAI-ARIA.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -65,8 +65,8 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest {
         assertEquals(label.getAttribute("id"),
                 window.getAttribute("aria-describedby"));
 
-        List<WebElement> wButtons = window.findElements(By
-                .className("v-button"));
+        List<WebElement> wButtons = window
+                .findElements(By.className("v-button"));
         assertEquals("button", wButtons.get(0).getAttribute("role"));
         assertEquals("button", wButtons.get(1).getAttribute("role"));
 
@@ -95,8 +95,9 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest {
         // ensure correct attributes
         window = $(WindowElement.class).first();
         List<WebElement> labels = window.findElements(By.className("v-label"));
-        assertEquals(labels.get(0).getAttribute("id") + " "
-                + labels.get(1).getAttribute("id"),
+        assertEquals(
+                labels.get(0).getAttribute("id") + " "
+                        + labels.get(1).getAttribute("id"),
                 window.getAttribute("aria-describedby"));
 
         // close dialog
@@ -121,8 +122,8 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest {
         // ensure the assistive spans have been added to the header
         window = $(WindowElement.class).first();
         header = window.findElement(By.className("v-window-header"));
-        List<WebElement> assistiveElements = header.findElements(By
-                .className("v-assistive-device-only"));
+        List<WebElement> assistiveElements = header
+                .findElements(By.className("v-assistive-device-only"));
         assertEquals("Important",
                 assistiveElements.get(0).getAttribute("innerHTML"));
         assertEquals(" - do ASAP",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
index 301a7c60e4..b0844b225f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
index 17d4cf80e7..dec4aaff45 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,8 +23,8 @@ import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.tb3.newelements.WindowElement;
 
-public class MaximizeRestoreWindowWithManagedLayoutTest extends
-        MultiBrowserTest {
+public class MaximizeRestoreWindowWithManagedLayoutTest
+        extends MultiBrowserTest {
 
     // This tests a timing issue so if this test fails randomly, it is
     // likely that something is broken
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
index 75b6eaa15c..ebb0c5e05e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that a modal window is focused on creation and that on closing a window
  * focus is given to underlying modal window
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ModalWindowFocusTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java
index 1700100ae7..9e7c63e509 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MoveToTopTest extends MultiBrowserTest {
@@ -33,18 +33,18 @@ public class MoveToTopTest extends MultiBrowserTest {
     public void testBringToFrontViaHeader() throws IOException {
         openTestURL();
 
-        WebElement firstWindow = driver.findElement(By
-                .className("first-window"));
+        WebElement firstWindow = driver
+                .findElement(By.className("first-window"));
 
-        WebElement secondWindow = driver.findElement(By
-                .className("second-window"));
+        WebElement secondWindow = driver
+                .findElement(By.className("second-window"));
 
         secondWindow.click();
 
         compareScreen("second-window-over-first");
 
-        WebElement headerFirst = firstWindow.findElement(By
-                .className("v-window-outerheader"));
+        WebElement headerFirst = firstWindow
+                .findElement(By.className("v-window-outerheader"));
         headerFirst.click();
 
         compareScreen("first-window-over-second");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
index 5dba1c3285..2f1d67f8fa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,8 +39,8 @@ public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest {
         openTestURL();
         $(ButtonElement.class).id("open").click();
         // WindowElement window = $(WindowElement.class).first();
-        WebElement windowFocusElement = findElement(By
-                .xpath("//div[@class='v-window-contents']/div[@class='v-scrollable']"));
+        WebElement windowFocusElement = findElement(By.xpath(
+                "//div[@class='v-window-contents']/div[@class='v-scrollable']"));
 
         assertElementsEquals(windowFocusElement, getActiveElement());
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
index 9a3ccb3b31..5e64e4e21c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.testbench.commands.TestBenchElementCommands;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -33,8 +33,8 @@ public class ScrollingBodyElementWithModalOpenedTest extends MultiBrowserTest {
     public void testWindowScrollbars() throws Exception {
         openTestURL();
 
-        WebElement bodyElement = driver.findElement(By
-                .className("v-modal-window-open"));
+        WebElement bodyElement = driver
+                .findElement(By.className("v-modal-window-open"));
 
         TestBenchElementCommands scrollable = testBenchElement(bodyElement);
         scrollable.scroll(1000);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
index ec86f62a7c..e1a45b0781 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
index e0cc240d6d..fac7953d17 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for issue #12726, IE's make text selection when sub windows are
  * dragged(moved).
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -40,7 +40,7 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.tests.tb3.AbstractTB3Test#getUIClass()
      */
     @Override
@@ -58,8 +58,8 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest {
 
         openTestURL();
 
-        WebElement element = driver.findElement(By
-                .className("v-window-outerheader"));
+        WebElement element = driver
+                .findElement(By.className("v-window-outerheader"));
 
         Point location = element.getLocation();
 
@@ -72,8 +72,9 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest {
                 .moveByOffset(10, 2).moveByOffset(10, 0).moveByOffset(10, 0)
                 .moveByOffset(10, 0).release().perform();
 
-        String selection = ((JavascriptExecutor) getDriver()).executeScript(
-                "return document.getSelection().toString();").toString();
+        String selection = ((JavascriptExecutor) getDriver())
+                .executeScript("return document.getSelection().toString();")
+                .toString();
 
         Assert.assertTrue("Text selection was not empty:" + selection,
                 selection.isEmpty());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
index cb7c0bd504..88d85c3c56 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that the styles work correctly in tiny subwindows that have more
  * content than can fit.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TestTooSmallSubwindowSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java
index abe2bcbe36..1431e2b647 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2015 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,10 +35,11 @@ public class ToolTipInWindowTest extends MultiBrowserTest {
 
         openTestURL();
 
-        WebElement header = driver.findElement(By
-                .className("v-window-outerheader"));
-        new Actions(driver).moveToElement(
-                driver.findElement(By.className("v-ui")), 0, 0).perform();
+        WebElement header = driver
+                .findElement(By.className("v-window-outerheader"));
+        new Actions(driver)
+                .moveToElement(driver.findElement(By.className("v-ui")), 0, 0)
+                .perform();
         sleep(500);
         new Actions(driver).moveToElement(header).perform();
         sleep(1100);
@@ -54,10 +55,11 @@ public class ToolTipInWindowTest extends MultiBrowserTest {
 
         openTestURL();
 
-        WebElement header = driver.findElement(By
-                .className("v-window-contents"));
-        new Actions(driver).moveToElement(
-                driver.findElement(By.className("v-ui")), 0, 300).perform();
+        WebElement header = driver
+                .findElement(By.className("v-window-contents"));
+        new Actions(driver)
+                .moveToElement(driver.findElement(By.className("v-ui")), 0, 300)
+                .perform();
         sleep(500);
         new Actions(driver).moveToElement(header).perform();
         sleep(1000);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
index 4574e7b3eb..ee462eecf9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
index 4e9bffe3e8..60a865040f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
@@ -14,7 +14,7 @@ public class WindowBGColorChameleonIE8Test extends SingleBrowserTest {
 
     /*
      * We care about IE8 here only (Or any very very old browsers)
-     * 
+     *
      * @see com.vaadin.tests.tb3.SingleBrowserTest#getBrowsersToTest()
      */
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
index f580d7c501..244e027601 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
index ab247be25b..82aa182dc1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for Window attached to the UI with not content.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java
index dabc070d77..20ce899f48 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java
index 8d74e3a259..713d4e6ca3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java
@@ -23,8 +23,8 @@ public class WindowMoveListenerTest extends MultiBrowserTest {
 
         // I'd loved to use the header, but that doesn't work. Footer works
         // fine, though :)
-        WebElement windowFooter = getDriver().findElement(
-                By.className("v-window-footer"));
+        WebElement windowFooter = getDriver()
+                .findElement(By.className("v-window-footer"));
 
         final Point winPos = window.getLocation();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
index 3cc310eeb4..f0dcf9a50b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
@@ -34,8 +34,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 public class WindowShadowTest extends MultiBrowserTest {
 
     @Test
-    public void dragBackgroundWindow() throws AWTException, IOException,
-            InterruptedException {
+    public void dragBackgroundWindow()
+            throws AWTException, IOException, InterruptedException {
         openTestURL();
         WebElement wnd = getDriver().findElement(By.id("topwindow"));
         // There is some bug in Selenium. Can't move window using header
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
index 755a4242ed..179e904d0e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
@@ -23,7 +23,8 @@ public class WindowShouldRemoveActionHandlerTest extends MultiBrowserTest {
         removeActionHandler();
         removeActionHandler();
 
-        assertState("An UI with 3 action handlers - Removed handler - Removed handler");
+        assertState(
+                "An UI with 3 action handlers - Removed handler - Removed handler");
         addActionHandler();
 
         assertState("An UI with 2 action handlers");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java
index dc2dfca4f0..f58e4fa3b7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,10 +30,10 @@ public class WindowZIndexTest extends MultiBrowserTest {
     public void removingUpdatesZIndices() throws IOException {
         openTestURL();
 
-        WebElement addButton = driver.findElement(By
-                .xpath("//span[contains(text(),'Add window')]"));
-        WebElement closeButton = driver.findElement(By
-                .xpath("//span[contains(text(),'Close window')]"));
+        WebElement addButton = driver
+                .findElement(By.xpath("//span[contains(text(),'Add window')]"));
+        WebElement closeButton = driver.findElement(
+                By.xpath("//span[contains(text(),'Close window')]"));
 
         addButton.click();
         addButton.click();
@@ -52,8 +52,8 @@ public class WindowZIndexTest extends MultiBrowserTest {
 
         compareScreen("stacked");
 
-        WebElement window4 = driver.findElement(By
-                .xpath("//*[contains(text(), 'Window 4')]"));
+        WebElement window4 = driver
+                .findElement(By.xpath("//*[contains(text(), 'Window 4')]"));
         new Actions(driver).moveToElement(window4, 1, 9).click().perform();
 
         compareScreen("win4-on-top");
diff --git a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
index 172d83e645..c6f1409f9b 100644
--- a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
@@ -12,8 +12,8 @@ import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class TableQueryWithNonUniqueFirstPrimaryKeyTest extends
-        MultiBrowserTest {
+public class TableQueryWithNonUniqueFirstPrimaryKeyTest
+        extends MultiBrowserTest {
 
     private static final String[] DATA = { "TARUSCIO GIOVANNI",
             "RUSSO GAETANO AUTORICAMBI", "AMORUSO LUIGI SRL", "CARUSO ROCCO",
@@ -29,8 +29,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKeyTest extends
         List<String> result = new ArrayList<String>();
 
         // pick list items that are shown in suggestion popup
-        List<WebElement> elems = findElements(By
-                .cssSelector("td[role=\"listitem\"]"));
+        List<WebElement> elems = findElements(
+                By.cssSelector("td[role=\"listitem\"]"));
         Assert.assertEquals("not enough suggestions shown", DATA.length,
                 elems.size());
 
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java
index 7544caaf0a..96598d537a 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -88,7 +88,8 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest {
         Matcher matcher = defaultLog.matcher(getLogRow(0));
         Assert.assertTrue(
                 "Log row content did not match default listener output: "
-                        + getLogRow(0), matcher.find());
+                        + getLogRow(0),
+                matcher.find());
 
         int xCoord = Integer.parseInt(matcher.group(1));
         int yCoord = Integer.parseInt(matcher.group(2));
@@ -120,7 +121,7 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest {
      * Performs a context click on given element at coordinates 10, 10 followed
      * by a regular click. This prevents browser context menu from blocking
      * future operations.
-     * 
+     *
      * @param e
      *            web element
      */
@@ -132,7 +133,7 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest {
      * Performs a context click on given element at given coordinates followed
      * by a regular click. This prevents browser context menu from blocking
      * future operations.
-     * 
+     *
      * @param e
      *            web element
      * @param xCoord
@@ -141,8 +142,8 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest {
      *            y coordinate
      */
     protected void contextClick(WebElement e, int xCoord, int yCoord) {
-        new Actions(getDriver()).moveToElement(e, xCoord, yCoord)
-                .contextClick().moveByOffset(-5, -5).click().perform();
+        new Actions(getDriver()).moveToElement(e, xCoord, yCoord).contextClick()
+                .moveByOffset(-5, -5).click().perform();
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
index 6ee7a89178..b0d22b2406 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -94,10 +94,10 @@ public class GridContextClickTest extends AbstractContextClickTest {
      * Performs a context click on given element at coordinates 20, 10 followed
      * by a regular click. This prevents browser context menu from blocking
      * future operations.
-     * 
+     *
      * A smaller X offset might hit the resize handle of the previous cell that
      * overlaps with the next header cell.
-     * 
+     *
      * @param e
      *            web element
      */
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
index dd1d3ebd53..5395cfa4cb 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
index bfd8862440..af349f54ef 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
index e3f4647c33..e797aec881 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import com.vaadin.testbench.elements.TableElement;
 
-public abstract class TableContextClickTestBase extends
-        AbstractContextClickTest {
+public abstract class TableContextClickTestBase
+        extends AbstractContextClickTest {
 
     @Override
     protected Class<?> getUIClass() {
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
index 180349af63..53a12c72af 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class TreeContextClickTest extends AbstractContextClickTest {
 
         addOrRemoveTypedListener();
 
-        List<WebElement> nodes = $(TreeElement.class).first().findElements(
-                By.className("v-tree-node"));
+        List<WebElement> nodes = $(TreeElement.class).first()
+                .findElements(By.className("v-tree-node"));
 
         contextClick(nodes.get(1));
 
@@ -52,14 +52,14 @@ public class TreeContextClickTest extends AbstractContextClickTest {
 
         addOrRemoveTypedListener();
 
-        List<WebElement> nodes = $(TreeElement.class).first().findElements(
-                By.className("v-tree-node"));
+        List<WebElement> nodes = $(TreeElement.class).first()
+                .findElements(By.className("v-tree-node"));
 
         new Actions(getDriver()).moveToElement(nodes.get(1), 10, 10).click()
                 .perform();
 
-        nodes = $(TreeElement.class).first().findElements(
-                By.className("v-tree-node"));
+        nodes = $(TreeElement.class).first()
+                .findElements(By.className("v-tree-node"));
         contextClick(nodes.get(2));
 
         assertEquals("1. ContextClickEvent: Baz", getLogRow(0));
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
index f91750ce91..9446dae727 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.contextclick;
 
-
 public class TreeTableContextClickTest extends TableContextClickTest {
 
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
index 886e96700a..97c400c347 100644
--- a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
@@ -64,9 +64,8 @@ public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
 
             @Override
             public String toString() {
-                return String.format(
-                        "the field to have value '%s' (was: '%s')", expected,
-                        actual);
+                return String.format("the field to have value '%s' (was: '%s')",
+                        expected, actual);
             }
         });
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
index a669d32f2e..6b0d6cf8b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,8 +25,8 @@ import com.vaadin.testbench.elementsbase.ServerClass;
 public class CustomProgressBarElement extends ProgressBarElement {
 
     public double getValue() {
-        WebElement indicator = findElement(By
-                .className("v-progressbar-indicator"));
+        WebElement indicator = findElement(
+                By.className("v-progressbar-indicator"));
         String width = getStyleAttribute(indicator, "width");
         if (!width.endsWith("%")) {
             return 0;
diff --git a/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java
index e078bc4665..e9d7e510fe 100644
--- a/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for interrupting drag-and-drop.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DDInterruptTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
index d4f027a2c8..cbef7bc836 100644
--- a/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Check that analyze layouts does not find problems for a trivial application.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -37,13 +37,16 @@ public class HierarchyAfterAnalyzeLayoutsTest extends MultiBrowserTest {
         openTestURL();
 
         // select tab
-        pressDebugWindowButton(findByXpath("//button[@title = 'Examine component hierarchy']"));
+        pressDebugWindowButton(findByXpath(
+                "//button[@title = 'Examine component hierarchy']"));
 
         // click "analyze layouts"
-        pressDebugWindowButton(findByXpath("//button[@title = 'Check layouts for potential problems']"));
+        pressDebugWindowButton(findByXpath(
+                "//button[@title = 'Check layouts for potential problems']"));
 
         // check that no problems found
-        findByXpath("//div[text() = 'Layouts analyzed, no top level problems']");
+        findByXpath(
+                "//div[text() = 'Layouts analyzed, no top level problems']");
 
         // check that original label still there
         findByXpath("//div[text() = 'This is a label']");
diff --git a/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
index 01b73ded92..f51d38eb9e 100644
--- a/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,12 +28,12 @@ public class PreserveCustomDebugSectionOpenTest extends SingleBrowserTest {
         setDebug(true);
         openTestURL();
 
-        findElement(
-                By.cssSelector(".v-debugwindow-tabs button[title=\"Dummy debug window section\"]"))
-                .click();
+        findElement(By.cssSelector(
+                ".v-debugwindow-tabs button[title=\"Dummy debug window section\"]"))
+                        .click();
 
-        WebElement content = findElement(By
-                .cssSelector(".v-debugwindow-content"));
+        WebElement content = findElement(
+                By.cssSelector(".v-debugwindow-content"));
 
         // Sanity check
         Assert.assertEquals("Dummy debug window section", content.getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
index 659823e49a..29a0772e70 100644
--- a/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,8 +40,8 @@ public class ProfilerZeroOverheadTest extends SingleBrowserTest {
         int bodyStart = canaryMethodString.indexOf('{');
         int bodyEnd = canaryMethodString.lastIndexOf('}');
 
-        String methodBody = canaryMethodString
-                .substring(bodyStart + 1, bodyEnd);
+        String methodBody = canaryMethodString.substring(bodyStart + 1,
+                bodyEnd);
 
         // Method body shouldn't contain anything else than whitespace
         if (!methodBody.replaceAll("\\s", "").isEmpty()) {
diff --git a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
index 5fcda733ae..24780cc096 100644
--- a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.SingleBrowserTest;
 
 /**
  * Test for PUSH version string in debug window.
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("push")
@@ -59,8 +59,7 @@ public class PushVersionInfoTest extends SingleBrowserTest {
         Assert.assertTrue("Push row doesn't contain Atmosphere version",
                 pushRow.getText().contains(atmVersion));
         String jsString = getPushRowValue("Push client version").getText();
-        Assert.assertTrue(
-                "Push client version doesn't contain 'vaadin' string",
+        Assert.assertTrue("Push client version doesn't contain 'vaadin' string",
                 jsString.contains("vaadin"));
         Assert.assertTrue(
                 "Push client version doesn't contain 'javascript' string",
@@ -72,8 +71,8 @@ public class PushVersionInfoTest extends SingleBrowserTest {
 
             int size = findElements(By.className("v-debugwindow-tab")).size();
             for (int i = 0; i < size; i++) {
-                WebElement tab = findElement(By
-                        .className("v-debugwindow-tab-selected"));
+                WebElement tab = findElement(
+                        By.className("v-debugwindow-tab-selected"));
                 String title = tab.getAttribute("title");
                 if (title != null && title.startsWith("General information")) {
                     break;
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
index e5614b60a4..046e304506 100644
--- a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
@@ -21,9 +21,8 @@ public class IframeIsOpenedInNonIOSTest extends MultiBrowserTest {
         List<WebElement> iframes = driver.findElements(By.tagName("iframe"));
         boolean containsFileIframe = false;
         for (WebElement iframe : iframes) {
-            containsFileIframe = containsFileIframe
-                    | iframe.getAttribute("src").contains(
-                            IframeIsOpenedInNonIOS.FILE_NAME);
+            containsFileIframe = containsFileIframe | iframe.getAttribute("src")
+                    .contains(IframeIsOpenedInNonIOS.FILE_NAME);
         }
 
         Assert.assertTrue("page doesn't contain iframe with the file",
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java
index f7cbd9477c..d070c89b23 100644
--- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java
@@ -47,9 +47,9 @@ public class ResponsiveUITest extends MultiBrowserTest {
         openTestURL();
 
         // IE sometimes has trouble waiting long enough.
-        new WebDriverWait(getDriver(), 30).until(ExpectedConditions
-                .presenceOfElementLocated(By
-                        .cssSelector(".v-csslayout-grid.first")));
+        new WebDriverWait(getDriver(), 30)
+                .until(ExpectedConditions.presenceOfElementLocated(
+                        By.cssSelector(".v-csslayout-grid.first")));
 
         assertEquals("401px-600px",
                 $(".v-csslayout-grid.first").getAttribute("width-range"));
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
index 8086457c24..1d80a5ecd4 100644
--- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
@@ -41,9 +41,9 @@ public class ResponsiveWidthAndHeightTest extends MultiBrowserTest {
         openTestURL();
 
         // IE sometimes has trouble waiting long enough.
-        new WebDriverWait(getDriver(), 30).until(ExpectedConditions
-                .presenceOfElementLocated(By
-                        .cssSelector(".v-csslayout-width-and-height")));
+        new WebDriverWait(getDriver(), 30)
+                .until(ExpectedConditions.presenceOfElementLocated(
+                        By.cssSelector(".v-csslayout-width-and-height")));
 
         // Verify both width-range and height-range.
         assertEquals("600px-",
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
index 4089618635..83ef328ce7 100644
--- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
index 0d0b388541..d3591ecc5c 100644
--- a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -50,9 +50,9 @@ public class SetThemeAndResponsiveLayoutTest extends MultiBrowserTest {
     public void testWidthAndHeightRanges() throws Exception {
         openTestURL();
         // IE sometimes has trouble waiting long enough.
-        new WebDriverWait(getDriver(), 30).until(ExpectedConditions
-                .presenceOfElementLocated(By
-                        .cssSelector(".v-csslayout-width-and-height")));
+        new WebDriverWait(getDriver(), 30)
+                .until(ExpectedConditions.presenceOfElementLocated(
+                        By.cssSelector(".v-csslayout-width-and-height")));
         // set the theme programmatically
         $(ButtonElement.class).caption("Set theme").first().click();
         new WebDriverWait(getDriver(), 30).until(ExpectedConditions
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
index df250357d8..fe853831a3 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -107,7 +107,8 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
         new Actions(getDriver()).doubleClick(cell).perform();
 
         String attribute = grid.getEditor().getAttribute("style").toLowerCase();
-        assertFalse("Style should not contain top.", attribute.contains("top:"));
+        assertFalse("Style should not contain top.",
+                attribute.contains("top:"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
index 12bccdd065..acc3ba6faa 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,8 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
     @Test
     public void fieldsInitiallyEmpty() {
         openTestURL();
-        List<TextFieldElement> textFields = getFieldsLayout().$(
-                TextFieldElement.class).all();
+        List<TextFieldElement> textFields = getFieldsLayout()
+                .$(TextFieldElement.class).all();
 
         for (TextFieldElement e : textFields) {
             Assert.assertEquals("TextField should be empty", "", e.getValue());
@@ -50,8 +50,8 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
         // Select row
         $(GridElement.class).first().getCell(2, 2).click();
 
-        List<TextFieldElement> textFields = getFieldsLayout().$(
-                TextFieldElement.class).all();
+        List<TextFieldElement> textFields = getFieldsLayout()
+                .$(TextFieldElement.class).all();
 
         for (TextFieldElement e : textFields) {
             Assert.assertNotEquals("TextField should not be empty", "",
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
index 86441b09f9..c17ba0466a 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,8 +31,8 @@ public class BasicCrudTableTest extends SingleBrowserTest {
     @Test
     public void fieldsInitiallyEmpty() {
         openTestURL();
-        List<TextFieldElement> textFields = getFieldsLayout().$(
-                TextFieldElement.class).all();
+        List<TextFieldElement> textFields = getFieldsLayout()
+                .$(TextFieldElement.class).all();
 
         for (TextFieldElement e : textFields) {
             Assert.assertEquals("TextField should be empty", "", e.getValue());
@@ -50,8 +50,8 @@ public class BasicCrudTableTest extends SingleBrowserTest {
         // Select row
         $(TableElement.class).first().getCell(2, 2).click();
 
-        List<TextFieldElement> textFields = getFieldsLayout().$(
-                TextFieldElement.class).all();
+        List<TextFieldElement> textFields = getFieldsLayout()
+                .$(TextFieldElement.class).all();
 
         for (TextFieldElement e : textFields) {
             Assert.assertNotEquals("TextField should not be empty", "",
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index 2562412480..973233ec24 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -164,8 +164,8 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest {
 
     protected void assertLogText(String expected) {
         ++logCounter;
-        Assert.assertEquals("Unexpected log contents,", logCounter + ". "
-                + expected, getLogRow(0));
+        Assert.assertEquals("Unexpected log contents,",
+                logCounter + ". " + expected, getLogRow(0));
     }
 
     protected void assertDefaults() {
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
index f5c751cd49..ed930f3a6c 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.fieldgroup;
 
 import org.junit.Test;
 
-public class CommitWithValidationOrConversionErrorTest extends
-        BasicPersonFormTest {
+public class CommitWithValidationOrConversionErrorTest
+        extends BasicPersonFormTest {
 
     private static final String UPDATED_BEAN_VALUES = "Person [firstName=John, lastName=Doever, email=john@doe.com, age=123, sex=Male, address=Address [streetAddress=John street, postalCode=11223, city=John's town, country=USA], deceased=false, salary=null, salaryDouble=null, rent=null]";
     private static final String UPDATED_NAME_BEAN_VALUES = "Person [firstName=John, lastName=Doever, email=john@doe.com, age=64, sex=Male, address=Address [streetAddress=John street, postalCode=11223, city=John's town, country=USA], deceased=false, salary=null, salaryDouble=null, rent=null]";
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
index 32d8bcb603..56ec53724e 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
@@ -20,15 +20,15 @@ public class DateFormTest extends MultiBrowserTest {
                 getDateFieldValue());
         Assert.assertEquals("Unexpected PopupDateField value,", "1/20/84",
                 getPopupDateFieldValue());
-        WebElement day20 = getInlineDateFieldCalendarPanel().findElement(
-                By.vaadin("#day20"));
+        WebElement day20 = getInlineDateFieldCalendarPanel()
+                .findElement(By.vaadin("#day20"));
         Assert.assertTrue(
                 "Unexpected InlineDateField state, 20th not selected.",
                 hasCssClass(day20,
                         "v-inline-datefield-calendarpanel-day-selected"));
         Assert.assertEquals("Unexpected TextField contents,",
-                "Jan 20, 1984 4:34:49 PM", $(TextFieldElement.class).first()
-                        .getValue());
+                "Jan 20, 1984 4:34:49 PM",
+                $(TextFieldElement.class).first().getValue());
     }
 
     protected String getDateFieldValue() {
@@ -40,8 +40,8 @@ public class DateFormTest extends MultiBrowserTest {
     }
 
     protected WebElement getInlineDateFieldCalendarPanel() {
-        return $(InlineDateFieldElement.class).first().findElement(
-                By.className("v-inline-datefield-calendarpanel"));
+        return $(InlineDateFieldElement.class).first()
+                .findElement(By.className("v-inline-datefield-calendarpanel"));
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
index 14527cff04..de90237acc 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
@@ -33,11 +33,9 @@ public class MultipleValidationErrorsTest extends MultiBrowserTest {
         String validationErrors = $(LabelElement.class).id("validationErrors")
                 .getText();
 
-        assertThat(
-                validationErrors,
-                containsString(MultipleValidationErrors.FIRST_NAME_NOT_EMPTY_VALIDATION_MESSAGE));
-        assertThat(
-                validationErrors,
-                containsString(MultipleValidationErrors.LAST_NAME_NOT_EMPTY_VALIDATION_MESSAGE));
+        assertThat(validationErrors, containsString(
+                MultipleValidationErrors.FIRST_NAME_NOT_EMPTY_VALIDATION_MESSAGE));
+        assertThat(validationErrors, containsString(
+                MultipleValidationErrors.LAST_NAME_NOT_EMPTY_VALIDATION_MESSAGE));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
index 4cfcd8fa59..66843ba7ef 100644
--- a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java
index f035ef35f6..ec3227ecdc 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration;
  * Base class for integration tests. Integration tests use the
  * {@literal deployment.url} parameter to determine the base deployment url
  * (http://hostname:123)
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestNameSuffix(property = "server-name")
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index eb1b714776..20251879b8 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,12 +29,12 @@ import com.vaadin.testbench.elements.TableElement;
 /**
  * Base class for servlet integration tests. Automatically prepends "/demo" to
  * the deployment path
- * 
+ *
  * @author Vaadin Ltd
  */
 @RunWith(ParameterizedTB3Runner.class)
-public abstract class AbstractServletIntegrationTest extends
-        AbstractIntegrationTest {
+public abstract class AbstractServletIntegrationTest
+        extends AbstractIntegrationTest {
 
     private String contextPath = "/demo";
 
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
index 13503966ec..d474a8c698 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -79,8 +79,8 @@ public class JSPIntegrationTest extends PrivateTB3Configuration {
         List<UIData> uis = new ArrayList<UIData>();
 
         getDriver().get(jspUrl);
-        List<WebElement> rows = getDriver().findElements(
-                By.xpath("//tr[@class='uirow']"));
+        List<WebElement> rows = getDriver()
+                .findElements(By.xpath("//tr[@class='uirow']"));
         for (WebElement row : rows) {
             UIData data = new UIData();
             List<WebElement> tds = row.findElements(By.xpath("./td"));
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java
index 16c599641b..cfade0b5eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -101,7 +101,7 @@ public class LongPollingProxyServerTest extends AbstractIntegrationTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return Collections.singletonList(Browser.PHANTOMJS
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.PHANTOMJS.getDesiredCapabilities());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java b/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
index b051fb51db..5361a085b4 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@ import com.vaadin.tests.tb3.TB3Runner;
  * permutation for each value returned by {@code getThemes()}. The value is
  * automatically assigned to the test instance using {@code setTheme(String)}
  * before invoking the test method
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ParameterizedTB3Runner extends TB3Runner {
@@ -61,17 +61,13 @@ public class ParameterizedTB3Runner extends TB3Runner {
             }
 
             if (!m.getName().startsWith("get") || !m.getName().endsWith("s")) {
-                throw new IllegalStateException(
-                        "Method "
-                                + m.getName()
-                                + " is annotated with @Parameter but is not named getSomeThings() as it should");
+                throw new IllegalStateException("Method " + m.getName()
+                        + " is annotated with @Parameter but is not named getSomeThings() as it should");
             }
 
             if (m.getParameterTypes().length != 0) {
-                throw new IllegalStateException(
-                        "Method "
-                                + m.getName()
-                                + " annotated with @Parameter should not have any arguments");
+                throw new IllegalStateException("Method " + m.getName()
+                        + " annotated with @Parameter should not have any arguments");
             }
 
             if (!Modifier.isStatic(m.getModifiers())) {
@@ -90,9 +86,10 @@ public class ParameterizedTB3Runner extends TB3Runner {
                 setterMethod = getTestClass().getJavaClass().getMethod(setter,
                         String.class);
             } catch (Exception e) {
-                throw new IllegalStateException("No setter " + setter
-                        + " found in "
-                        + getTestClass().getJavaClass().getName(), e);
+                throw new IllegalStateException(
+                        "No setter " + setter + " found in "
+                                + getTestClass().getJavaClass().getName(),
+                        e);
             }
 
             Collection<String> values;
@@ -105,8 +102,9 @@ public class ParameterizedTB3Runner extends TB3Runner {
                     parameters.put(setterMethod, values);
                 }
             } catch (Exception e) {
-                throw new IllegalStateException("The setter " + m.getName()
-                        + " could not be invoked", e);
+                throw new IllegalStateException(
+                        "The setter " + m.getName() + " could not be invoked",
+                        e);
             }
         }
 
@@ -116,8 +114,8 @@ public class ParameterizedTB3Runner extends TB3Runner {
             for (FrameworkMethod m : methods) {
 
                 if (!(m instanceof TBMethod)) {
-                    System.err.println("Unknown method type: "
-                            + m.getClass().getName());
+                    System.err.println(
+                            "Unknown method type: " + m.getClass().getName());
                     newMethods.add(m);
                     continue;
                 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
index 2afc33cf82..8376a66c21 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.integration;
 
-public class ServletIntegrationDefaultPushUITest extends
-        AbstractServletIntegrationTest {
+public class ServletIntegrationDefaultPushUITest
+        extends AbstractServletIntegrationTest {
     // Uses the test method declared in the super class
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
index f118d38158..6d1c857740 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,14 @@
  */
 package com.vaadin.tests.integration;
 
-public class ServletIntegrationJSR356WebsocketUITest extends
-        AbstractServletIntegrationTest {
+public class ServletIntegrationJSR356WebsocketUITest
+        extends AbstractServletIntegrationTest {
     // Uses the test method declared in the super class
 
     @Override
     protected String getDeploymentPath(Class<?> uiClass) {
-        return super.getDeploymentPath(uiClass)
-                .replace("/run/", "/run-jsr356/");
+        return super.getDeploymentPath(uiClass).replace("/run/",
+                "/run-jsr356/");
     }
 
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
index 92307dbbaf..4f5abf7d8c 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.integration;
 
-public class ServletIntegrationLongPollingUITest extends
-        AbstractServletIntegrationTest {
+public class ServletIntegrationLongPollingUITest
+        extends AbstractServletIntegrationTest {
     // Uses the test method declared in the super class
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
index 1f42b10e66..9d3170235a 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.integration;
 
-public class ServletIntegrationStreamingUITest extends
-        AbstractServletIntegrationTest {
+public class ServletIntegrationStreamingUITest
+        extends AbstractServletIntegrationTest {
     // Uses the test method declared in the super class
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java
index bebe01578a..e9c3b07472 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
index d4fc3aef17..e32a90fe11 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.integration;
 
-public class ServletIntegrationWebsocketUITest extends
-        AbstractServletIntegrationTest {
+public class ServletIntegrationWebsocketUITest
+        extends AbstractServletIntegrationTest {
     // Uses the test method declared in the super class
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
index c8207efe9d..7975a5bdb7 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -62,8 +62,8 @@ public class WebSpherePortalIntegrationTest extends PrivateTB3Configuration {
             sftpChannel.disconnect();
         } else {
             sftpChannel.disconnect();
-            throw new AssertionError("Demo application not found at "
-                    + applicationPath);
+            throw new AssertionError(
+                    "Demo application not found at " + applicationPath);
         }
     }
 
@@ -73,8 +73,8 @@ public class WebSpherePortalIntegrationTest extends PrivateTB3Configuration {
         channel.setCommand(command);
         BufferedReader in;
         try {
-            in = new BufferedReader(new InputStreamReader(
-                    channel.getInputStream()));
+            in = new BufferedReader(
+                    new InputStreamReader(channel.getInputStream()));
 
             channel.connect();
 
@@ -130,8 +130,8 @@ public class WebSpherePortalIntegrationTest extends PrivateTB3Configuration {
 
     private void waitUntilPortletIsLoaded() {
         WebDriverWait wait = new WebDriverWait(driver, 15);
-        wait.until(ExpectedConditions.visibilityOfElementLocated(By
-                .className("v-app")));
+        wait.until(ExpectedConditions
+                .visibilityOfElementLocated(By.className("v-app")));
     }
 
     private boolean isLoggedIn() {
diff --git a/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
index 8c71d460bb..8c0f9f1149 100644
--- a/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
index 1821acdbfa..0df115ac0a 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
index df42e292e3..196577d303 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
index 33adb622c0..b1fb4e3f78 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
index 340c627dd4..ed56286146 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,8 +22,8 @@ import com.vaadin.testbench.elements.FormLayoutElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
 
-public class RelativeSizeInUndefinedCssLayoutTest extends
-        SingleBrowserTestPhantomJS2 {
+public class RelativeSizeInUndefinedCssLayoutTest
+        extends SingleBrowserTestPhantomJS2 {
 
     @Test
     public void relativeSizeInUndefinedCssLayout() {
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
index ea47ab4620..4b2f5faa0f 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Tests LayoutClickListener on different layouts.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
index f4ac7419f7..b369dbdde5 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
index ba3d0f06f1..6f09923dff 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
@@ -17,8 +17,8 @@ public class GridLayoutWidthChangeTest extends MultiBrowserTest {
 
         compareScreen("initial");
 
-        $(ButtonElement.class).caption("Reduce GridLayout parent width")
-                .first().click();
+        $(ButtonElement.class).caption("Reduce GridLayout parent width").first()
+                .click();
 
         compareScreen("buttonMoved");
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
index f2b86fb69b..430fbbc1b5 100644
--- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Tests that GridLayout handles elements spanning otherwise empty columns
  * correctly (#14335)
- * 
+ *
  * @since 7.2.5
  * @author markus
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
index 59f71f3724..546d79e322 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
@@ -24,8 +24,8 @@ public class NavigationTest extends SingleBrowserTest {
     public void testNavigateToSameViewWithDifferentParameters() {
         openTestURL();
 
-        ButtonElement listButton = $(ButtonElement.class).caption(
-                "Navigate to list").first();
+        ButtonElement listButton = $(ButtonElement.class)
+                .caption("Navigate to list").first();
         listButton.click();
 
         TableElement table = $(TableElement.class).first();
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
index d11ab790a8..cfb378dc3d 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,15 +40,13 @@ public class NavigatorListenerModifiesListenersTest extends SingleBrowserTest {
             button.click();
 
             // verify we are in another view and url is correct
-            waitForElementPresent(By
-                    .id(NavigatorListenerModifiesListeners.LABEL_ANOTHERVIEW_ID));
+            waitForElementPresent(By.id(
+                    NavigatorListenerModifiesListeners.LABEL_ANOTHERVIEW_ID));
             String currentUrl = driver.getCurrentUrl();
-            assertEquals(
-                    "Current URL should be equal to another view URL",
-                    initialUrl
-                            .replace(
-                                    NavigatorListenerModifiesListeners.MainView.NAME,
-                                    NavigatorListenerModifiesListeners.AnotherView.NAME),
+            assertEquals("Current URL should be equal to another view URL",
+                    initialUrl.replace(
+                            NavigatorListenerModifiesListeners.MainView.NAME,
+                            NavigatorListenerModifiesListeners.AnotherView.NAME),
                     currentUrl);
 
             // click back button
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
index 84abdca24b..73f16f28b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -50,8 +50,7 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest {
             waitForElementPresent(By
                     .id(NavigatorViewBlocksBackButtonAction.LABEL_MAINVIEW_ID));
             String currentUrl = driver.getCurrentUrl();
-            assertEquals(
-                    "Current URL should be equal to initial main view URL",
+            assertEquals("Current URL should be equal to initial main view URL",
                     initialUrl, currentUrl);
         }
     }
@@ -74,12 +73,11 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest {
         waitForElementPresent(By
                 .id(NavigatorViewBlocksBackButtonAction.LABEL_PROMPTEDVIEW_ID));
         String currentUrl = driver.getCurrentUrl();
-        assertEquals(
-                "Current URL should be equal to initial prompted view URL",
+        assertEquals("Current URL should be equal to initial prompted view URL",
                 initialPromptedUrl, currentUrl);
 
-        WebElement cancelButton = driver.findElement(By
-                .className("v-window-closebox"));
+        WebElement cancelButton = driver
+                .findElement(By.className("v-window-closebox"));
 
         // click cancel button
         cancelButton.click();
@@ -88,8 +86,7 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest {
         waitForElementPresent(By
                 .id(NavigatorViewBlocksBackButtonAction.LABEL_PROMPTEDVIEW_ID));
         currentUrl = driver.getCurrentUrl();
-        assertEquals(
-                "Current URL should be equal to initial prompted view URL",
+        assertEquals("Current URL should be equal to initial prompted view URL",
                 initialPromptedUrl, currentUrl);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java
index 7bd1de5803..f712f910ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,20 +28,19 @@ public class BarInUIDLTest extends MultiBrowserTest {
     public void sendBarInUIDL() {
         openTestURL();
         getButton().click();
-        Assert.assertEquals(
-                "Thank you for clicking | bar",
+        Assert.assertEquals("Thank you for clicking | bar",
                 vaadinElement(
                         "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]")
-                        .getText());
+                                .getText());
         getButton().click();
-        Assert.assertEquals(
-                "Thank you for clicking | bar",
+        Assert.assertEquals("Thank you for clicking | bar",
                 vaadinElement(
                         "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]")
-                        .getText());
+                                .getText());
     }
 
     private WebElement getButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java
index a060d5a57a..15cf4d6cc5 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,9 +21,8 @@ public class BasicPushLongPollingTest extends BasicPushTest {
 
     @Test
     public void pushAfterServerTimeout() throws InterruptedException {
-        getDriver().get(
-                getTestUrl().replace("/run/", "/run-push-timeout/")
-                        + "?debug=push");
+        getDriver().get(getTestUrl().replace("/run/", "/run-push-timeout/")
+                + "?debug=push");
         sleep(11000); // Wait for server timeout (10s)
 
         getServerCounterStartButton().click();
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java
index ceb0b28c76..dfc832bfe4 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java
index 157e3f74ae..7108fafc91 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -53,8 +53,8 @@ public abstract class BasicPushTest extends MultiBrowserTest {
     }
 
     public static int getClientCounter(AbstractTB3Test t) {
-        WebElement clientCounterElem = t.findElement(By
-                .id(BasicPush.CLIENT_COUNTER_ID));
+        WebElement clientCounterElem = t
+                .findElement(By.id(BasicPush.CLIENT_COUNTER_ID));
         return Integer.parseInt(clientCounterElem.getText());
     }
 
@@ -67,8 +67,8 @@ public abstract class BasicPushTest extends MultiBrowserTest {
     }
 
     public static int getServerCounter(AbstractTB3Test t) {
-        WebElement serverCounterElem = t.findElement(By
-                .id(BasicPush.SERVER_COUNTER_ID));
+        WebElement serverCounterElem = t
+                .findElement(By.id(BasicPush.SERVER_COUNTER_ID));
         return Integer.parseInt(serverCounterElem.getText());
     }
 
@@ -89,7 +89,8 @@ public abstract class BasicPushTest extends MultiBrowserTest {
 
             @Override
             public Boolean apply(WebDriver input) {
-                return BasicPushTest.getClientCounter(BasicPushTest.this) == expectedValue;
+                return BasicPushTest
+                        .getClientCounter(BasicPushTest.this) == expectedValue;
             }
         }, 10);
     }
@@ -100,7 +101,8 @@ public abstract class BasicPushTest extends MultiBrowserTest {
 
             @Override
             public Boolean apply(WebDriver input) {
-                return BasicPushTest.getServerCounter(BasicPushTest.this) > counter;
+                return BasicPushTest
+                        .getServerCounter(BasicPushTest.this) > counter;
             }
         }, 10);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java
index cd779a7318..bbbb4e3c19 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
index 430246d66a..45dc9da89e 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java
index 654108f8f9..2423269c96 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -52,23 +52,28 @@ public class EnableDisablePushTest extends MultiBrowserTest {
     }
 
     private WebElement getDisablePushButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
     }
 
     private WebElement getEnablePushButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
     }
 
     private WebElement getDisablePollButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
     }
 
     private WebElement getEnablePollButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
     }
 
     private WebElement getDisablePushButtonAndReenableFromBackground() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
index 13f601da7a..d34646605c 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.push;
 
-public class ExtremelyLongPushTimeLongPollingTest extends
-        ExtremelyLongPushTimeTest {
+public class ExtremelyLongPushTimeLongPollingTest
+        extends ExtremelyLongPushTimeTest {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
index 4af6179e81..2c1012cd3d 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.push;
 
-public class ExtremelyLongPushTimeStreamingTest extends
-        ExtremelyLongPushTimeTest {
+public class ExtremelyLongPushTimeStreamingTest
+        extends ExtremelyLongPushTimeTest {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
index 5dc15f8fc6..00c56bca70 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
index 54775d572d..151b67eeae 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -21,8 +21,8 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.tb3.WebsocketTest;
 
-public class ExtremelyLongPushTimeWebsocketTest extends
-        ExtremelyLongPushTimeTest {
+public class ExtremelyLongPushTimeWebsocketTest
+        extends ExtremelyLongPushTimeTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
index 143960f1b2..4f6a8cca04 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
index c5a909385f..119ac5e97f 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java
index 344f551f00..458af2871b 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
index 7559d22264..96e82c43a6 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java
index 096204ff75..5fca06c252 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,8 @@ public class ManualLongPollingPushUITest extends SingleBrowserTest {
         openTestURL();
         $(ButtonElement.class).caption("Double manual push after 1s").first()
                 .click();
-        waitUntilLogText("2. Second message logged after 1s, followed by manual push");
+        waitUntilLogText(
+                "2. Second message logged after 1s, followed by manual push");
         $(ButtonElement.class).caption("Manual push after 1s").first().click();
         waitUntilLogText("3. Logged after 1s, followed by manual push");
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
index 1d5ead7d98..15c8f48982 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java
index 202db8d6b7..66c3ae3802 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
index 14ef9e1144..f50a37e6cb 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -70,7 +70,8 @@ abstract class PushConfigurationTest extends MultiBrowserTest {
     }
 
     protected WebElement getServerCounterElement() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]");
     }
 
     protected void waitForServerCounterToUpdate() {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
index 501d946fcc..bbde27dfa9 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -45,8 +45,7 @@ public class PushConfigurationWebSocketTest extends PushConfigurationTest {
         // Use debug console to verify we used the correct transport type
         assertThat(driver.getPageSource(),
                 containsString("Push connection established using websocket"));
-        assertThat(
-                driver.getPageSource(),
-                not(containsString("Push connection established using streaming")));
+        assertThat(driver.getPageSource(), not(
+                containsString("Push connection established using streaming")));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java
index 2683868db5..678da91a0a 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,8 +44,8 @@ public class PushErrorHandlingTest extends MultiBrowserTest {
                 $(LabelElement.class).get(idx).getText());
 
         WebElement table = vaadinElementById("testtable");
-        WebElement row = table.findElement(By
-                .xpath("//div[text()='Click for NPE']"));
+        WebElement row = table
+                .findElement(By.xpath("//div[text()='Click for NPE']"));
         row.click();
 
         Assert.assertEquals("Internal error",
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java
index fe7ebebef1..f5326ed372 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
index 23255aadea..5592a70a24 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java
index 0c00cf116f..fef0c7907c 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
index da4999799d..6c8d38ed1e 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java
index bcf93b0aa9..3070d1efee 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java
@@ -18,7 +18,7 @@ public class PushRemoveConnectorsTest extends SingleBrowserTest {
         while (i++ < 10) {
             Thread.sleep(5000);
             int now = getMemoryUsage();
-            System.out.println("Memory usage: "+now);
+            System.out.println("Memory usage: " + now);
             if (last == now)
                 break;
 
@@ -30,7 +30,7 @@ public class PushRemoveConnectorsTest extends SingleBrowserTest {
     }
 
     private int getMemoryUsage() {
-        return Integer.parseInt(getLogRow(0).replaceFirst(
-                ".*Serialized session size: ", ""));
+        return Integer.parseInt(
+                getLogRow(0).replaceFirst(".*Serialized session size: ", ""));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java
index 16bc753272..c3322a6466 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 22d020b631..ff5411650b 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java
index 4a669e723c..541f9eb6d7 100755
--- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java
index 6a632f2667..15f891da60 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -98,7 +98,8 @@ public abstract class ReconnectTest extends MultiBrowserTestWithProxy {
 
             @Override
             public Boolean apply(WebDriver input) {
-                return BasicPushTest.getServerCounter(ReconnectTest.this) > counter;
+                return BasicPushTest
+                        .getServerCounter(ReconnectTest.this) > counter;
             }
         }, 30);
     }
@@ -108,7 +109,8 @@ public abstract class ReconnectTest extends MultiBrowserTestWithProxy {
 
             @Override
             public Boolean apply(WebDriver input) {
-                return BasicPushTest.getClientCounter(ReconnectTest.this) == expectedValue;
+                return BasicPushTest
+                        .getClientCounter(ReconnectTest.this) == expectedValue;
             }
         }, 5);
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java
index bad00eba47..5371b34412 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java
index 47773b87b6..d33f824f02 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
index c00f95a950..907378684f 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.push;
 
-public class SendMultibyteCharactersLongPollingTest extends
-        SendMultibyteCharactersTest {
+public class SendMultibyteCharactersLongPollingTest
+        extends SendMultibyteCharactersTest {
 
     @Override
     protected String getTransport() {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
index bc1debb9da..495791ff53 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.push;
 
-public class SendMultibyteCharactersStreamingTest extends
-        SendMultibyteCharactersTest {
+public class SendMultibyteCharactersStreamingTest
+        extends SendMultibyteCharactersTest {
 
     @Override
     protected String getTransport() {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
index f9ae472b99..5cc2395e71 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
@@ -4,8 +4,8 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.util.List;
 
-public class SendMultibyteCharactersWebSocketTest extends
-        SendMultibyteCharactersTest {
+public class SendMultibyteCharactersWebSocketTest
+        extends SendMultibyteCharactersTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java
index d93802125c..6ea1eb41b3 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -94,21 +94,24 @@ public class TogglePushTest extends MultiBrowserTest {
     }
 
     private WebElement getDirectCounterUpdateButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
     }
 
     private WebElement getPushToggle() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
     }
 
     private WebElement getDelayedCounterUpdateButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
     }
 
     private String getCounterText() {
         return vaadinElement(
                 "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                .getText();
+                        .getText();
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java
index 35d0f0ad5f..75083b006c 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ public class TrackMessageSizeUITest extends MultiBrowserTest {
     @Test
     public void runTests() {
         openTestURL();
-        Assert.assertEquals("1. All tests run", vaadinElementById("Log_row_0")
-                .getText());
+        Assert.assertEquals("1. All tests run",
+                vaadinElementById("Log_row_0").getText());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
index f762573a09..1b8d002236 100644
--- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
@@ -12,8 +12,8 @@ public class AppResource404Test extends MultiBrowserTest {
         openTestURL();
         $(LinkElement.class).first().click(5, 5);
         disableWaitingAndWait();
-        Assert.assertFalse("Page contains the given text", driver
-                .getPageSource().contains("404"));
+        Assert.assertFalse("Page contains the given text",
+                driver.getPageSource().contains("404"));
     }
 
     @Test
@@ -21,8 +21,7 @@ public class AppResource404Test extends MultiBrowserTest {
         openTestURL();
         $(LinkElement.class).get(1).click(5, 5);
         disableWaitingAndWait();
-        Assert.assertTrue(
-                "Page does not contain the given text",
+        Assert.assertTrue("Page does not contain the given text",
                 driver.getPageSource().contains(
                         "/APP/connector/0/4/asdfasdf can not be found"));
     }
@@ -32,10 +31,10 @@ public class AppResource404Test extends MultiBrowserTest {
         openTestURL();
         $(LinkElement.class).get(2).click(5, 5);
         disableWaitingAndWait();
-        Assert.assertTrue("Page does not contain the given text", driver
-                .getPageSource().contains("HTTP ERROR 404"));
-        Assert.assertTrue("Page does not contain the given text", driver
-                .getPageSource().contains("Problem accessing /run/APP/"));
+        Assert.assertTrue("Page does not contain the given text",
+                driver.getPageSource().contains("HTTP ERROR 404"));
+        Assert.assertTrue("Page does not contain the given text",
+                driver.getPageSource().contains("Problem accessing /run/APP/"));
     }
 
     @Test
@@ -43,8 +42,8 @@ public class AppResource404Test extends MultiBrowserTest {
         openTestURL();
         $(LinkElement.class).get(3).click(5, 5);
         disableWaitingAndWait();
-        Assert.assertFalse("Page contains the given text", driver
-                .getPageSource().contains("can not be found"));
+        Assert.assertFalse("Page contains the given text",
+                driver.getPageSource().contains("can not be found"));
     }
 
     protected void disableWaitingAndWait() {
diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
index f295ec5ba3..63ddea068c 100644
--- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for null values in communication error json object .
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CommunicationErrorTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
index 1f2c4d37f2..b92610deab 100644
--- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,21 +32,24 @@ public class UnsupportedBrowserHandlerUserAgents {
 
     @Test
     public void ie7NotSupported() {
-        String response = requestWithUserAgent("Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.2; WOW64; .NET CLR 2.0.50727)");
+        String response = requestWithUserAgent(
+                "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.2; WOW64; .NET CLR 2.0.50727)");
         Assert.assertTrue("IE7 should not be supported",
                 response.contains("your browser is not supported"));
     }
 
     @Test
     public void ie9Supported() {
-        String response = requestWithUserAgent("Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)");
+        String response = requestWithUserAgent(
+                "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)");
         Assert.assertFalse("IE9 should be supported",
                 response.contains("your browser is not supported"));
     }
 
     @Test
     public void unknownSupported() {
-        String response = requestWithUserAgent("Very strange user agent, like wat");
+        String response = requestWithUserAgent(
+                "Very strange user agent, like wat");
         Assert.assertFalse("Unkonwn user agent should be supported",
                 response.contains("your browser is not supported"));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
index e584ec73cc..a5c0dd9f64 100644
--- a/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
+++ b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -36,7 +36,8 @@ public class SpecialCharsInThemeResources extends SingleBrowserTest {
 
     @Test
     public void loadThemeResourceWithSpecialChars() {
-        loadResource("/VAADIN/themes/tests-tickets/folder%20with%20space/resource%20with%20special%20$chars@.txt");
+        loadResource(
+                "/VAADIN/themes/tests-tickets/folder%20with%20space/resource%20with%20special%20$chars@.txt");
         checkSource();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
index 662a033745..9be6b6d306 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
index 9c21ec1de4..183e87ac78 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java b/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java
index f3a5561e40..e95aa6a6b9 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
index bb312e3f3f..9eba8cebe8 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java
index b2eb0e6b01..80cbb446f5 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -70,14 +70,14 @@ public class SerializerTestTest extends MultiBrowserTest {
         Assert.assertEquals(
                 "sendDouble: 0.423310825130748, 5.859874482048838, [2.0, 1.7976931348623157E308, 4.9E-324]",
                 getLogRow(logRow++));
-        Assert.assertEquals(
-                "sendFloat: 1.0000001, 3.14159, [-12.0, 0.0, 57.0]",
+        Assert.assertEquals("sendFloat: 1.0000001, 3.14159, [-12.0, 0.0, 57.0]",
                 getLogRow(logRow++));
         Assert.assertEquals("sendLong: -57841235865, 577431841358, [57, 0]",
                 getLogRow(logRow++));
         Assert.assertEquals("sendInt: 2, 5, [2147483647, 0]",
                 getLogRow(logRow++));
-        Assert.assertEquals("sendChar: Å, ∫, [a, b, c, d]", getLogRow(logRow++));
+        Assert.assertEquals("sendChar: Å, ∫, [a, b, c, d]",
+                getLogRow(logRow++));
         Assert.assertEquals("sendByte: 5, -12, [3, 1, 2]", getLogRow(logRow++));
         Assert.assertEquals(
                 "sendBoolean: false, false, [false, false, true, false, true, true]",
@@ -93,7 +93,8 @@ public class SerializerTestTest extends MultiBrowserTest {
         Assert.assertEquals("state.jsonBoolean: false", getLogRow(logRow++));
         Assert.assertEquals("state.jsonString: a string", getLogRow(logRow++));
         Assert.assertEquals("state.jsonNull: NULL", getLogRow(logRow++));
-        Assert.assertEquals("state.stringArray: [null, ‡]", getLogRow(logRow++));
+        Assert.assertEquals("state.stringArray: [null, ‡]",
+                getLogRow(logRow++));
         Assert.assertEquals("state.string: This is a tesing string ‡",
                 getLogRow(logRow++));
         Assert.assertEquals(
@@ -105,10 +106,10 @@ public class SerializerTestTest extends MultiBrowserTest {
                 getLogRow(logRow++));
         Assert.assertEquals("state.floatArray: [57, 0, -12]",
                 getLogRow(logRow++));
-        Assert.assertTrue(getLogRow(logRow++).startsWith(
-                "state.floatObjectValue: 1.0000001"));
-        Assert.assertTrue(getLogRow(logRow++).startsWith(
-                "state.floatValue: 3.14159"));
+        Assert.assertTrue(getLogRow(logRow++)
+                .startsWith("state.floatObjectValue: 1.0000001"));
+        Assert.assertTrue(
+                getLogRow(logRow++).startsWith("state.floatValue: 3.14159"));
         Assert.assertEquals("state.longArray: [-57841235865, 57]",
                 getLogRow(logRow++));
         Assert.assertEquals("state.longObjectValue: 577431841360",
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index 992a1376c8..3de3b517a6 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -81,17 +81,18 @@ import elemental.json.impl.JsonUtil;
 /**
  * Base class for TestBench 3+ tests. All TB3+ tests in the project should
  * extend this class.
- * 
+ *
  * Provides:
  * <ul>
  * <li>Helpers for browser selection</li>
  * <li>Hub connection setup and teardown</li>
  * <li>Automatic generation of URL for a given test on the development server
  * using {@link #getUIClass()} or by automatically finding an enclosing UI class
- * and based on requested features, e.g. {@link #isDebug()}, {@link #isPush()}</li>
+ * and based on requested features, e.g. {@link #isDebug()},
+ * {@link #isPush()}</li>
  * <li>Generic helpers for creating TB3+ tests</li>
  * </ul>
- * 
+ *
  * @author Vaadin Ltd
  */
 @RunWith(TB3Runner.class)
@@ -119,11 +120,11 @@ public abstract class AbstractTB3Test extends ParallelTest {
     private static final int BROWSER_TIMEOUT_IN_MS = 30 * 1000;
 
     protected static DesiredCapabilities PHANTOMJS2() {
-        DesiredCapabilities phantomjs2 = new VaadinBrowserFactory().create(
-                Browser.PHANTOMJS, "2");
+        DesiredCapabilities phantomjs2 = new VaadinBrowserFactory()
+                .create(Browser.PHANTOMJS, "2");
         // Hack for the test cluster
-        phantomjs2
-                .setCapability("phantomjs.binary.path", "/usr/bin/phantomjs2");
+        phantomjs2.setCapability("phantomjs.binary.path",
+                "/usr/bin/phantomjs2");
         return phantomjs2;
     }
 
@@ -139,7 +140,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Connect to the hub using a remote web driver, set the canvas size and
      * opens the initial URL as specified by {@link #getTestUrl()}
-     * 
+     *
      * @throws Exception
      */
     @Override
@@ -175,8 +176,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
     }
 
     protected WebElement getTooltipErrorElement() {
-        WebElement tooltip = getDriver().findElement(
-                com.vaadin.testbench.By.className("v-tooltip"));
+        WebElement tooltip = getDriver()
+                .findElement(com.vaadin.testbench.By.className("v-tooltip"));
         return tooltip.findElement(By.className("v-errormessage"));
     }
 
@@ -203,7 +204,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
         waitForDebugMessage(expectedMessage, 30);
     }
 
-    protected void waitForDebugMessage(final String expectedMessage, int timeout) {
+    protected void waitForDebugMessage(final String expectedMessage,
+            int timeout) {
         waitUntil(new ExpectedCondition<Boolean>() {
 
             @Override
@@ -214,12 +216,13 @@ public abstract class AbstractTB3Test extends ParallelTest {
     }
 
     protected void clearDebugMessages() {
-        driver.findElement(
-                By.xpath("//button[@class='v-debugwindow-button' and @title='Clear log']"))
+        driver.findElement(By
+                .xpath("//button[@class='v-debugwindow-button' and @title='Clear log']"))
                 .click();
     }
 
-    protected void waitUntilRowIsVisible(final TableElement table, final int row) {
+    protected void waitUntilRowIsVisible(final TableElement table,
+            final int row) {
         waitUntil(new ExpectedCondition<Object>() {
             @Override
             public Object apply(WebDriver input) {
@@ -286,7 +289,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Returns the full URL to be used for the test
-     * 
+     *
      * @return the full URL for the test
      */
     protected String getTestUrl() {
@@ -295,7 +298,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Returns the full URL to be used for the test for the provided UI class.
-     * 
+     *
      * @return the full URL for the test
      */
     protected String getTestURL(Class<?> uiClass) {
@@ -305,14 +308,14 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Used to determine what URL to initially open for the test
-     * 
+     *
      * @return the host name of development server
      */
     protected abstract String getDeploymentHostname();
 
     /**
      * Used to determine what port the test is running on
-     * 
+     *
      * @return The port teh test is running on, by default 8888
      */
     protected abstract int getDeploymentPort();
@@ -324,23 +327,23 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * ran and before running that,
      * {@link #setDesiredCapabilities(DesiredCapabilities)} is invoked with the
      * value returned by this method.
-     * 
+     *
      * This method is not static to allow overriding it in sub classes. By
      * default runs the test only on Firefox
-     * 
+     *
      * @return The browsers to run the test on
      */
     @BrowserConfiguration
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return Collections.singletonList(Browser.FIREFOX
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.FIREFOX.getDesiredCapabilities());
     }
 
     /**
      * Finds an element based on the part of a TB2 style locator following the
      * :: (e.g. vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
      * PID_Scheckboxaction-Enabled/domChild[0]).
-     * 
+     *
      * @param vaadinLocator
      *            The part following :: of the vaadin locator string
      * @return
@@ -351,7 +354,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Uses JavaScript to determine the currently focused element.
-     * 
+     *
      * @return Focused element or null
      */
     protected WebElement getFocusedElement() {
@@ -365,7 +368,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Executes the given Javascript
-     * 
+     *
      * @param script
      *            the script to execute
      * @return whatever
@@ -378,7 +381,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Find a Vaadin element based on its id given using Component.setId
-     * 
+     *
      * @param id
      *            The id to locate
      * @return
@@ -392,7 +395,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * following the :: (e.g.
      * vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
      * PID_Scheckboxaction-Enabled/domChild[0]).
-     * 
+     *
      * @param vaadinLocator
      *            The part following :: of the vaadin locator string
      * @return
@@ -406,7 +409,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Constructs a {@link By} locator for the id given using Component.setId
-     * 
+     *
      * @param id
      *            The id to locate
      * @return a locator for the given id
@@ -418,7 +421,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Waits up to 10s for the given condition to become true. Use e.g. as
      * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
-     * 
+     *
      * @param condition
      *            the condition to wait for to become true
      */
@@ -428,9 +431,9 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Waits the given number of seconds for the given condition to become true.
-     * Use e.g. as {@link
-     * #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
-     * 
+     * Use e.g. as
+     * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
+     *
      * @param condition
      *            the condition to wait for to become true
      */
@@ -443,7 +446,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * Waits up to 10s for the given condition to become false. Use e.g. as
      * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
      * text))}
-     * 
+     *
      * @param condition
      *            the condition to wait for to become false
      */
@@ -453,9 +456,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Waits the given number of seconds for the given condition to become
-     * false. Use e.g. as {@link
-     * #waitUntilNot(ExpectedConditions.textToBePresentInElement(by, text))}
-     * 
+     * false. Use e.g. as
+     * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
+     * text))}
+     *
      * @param condition
      *            the condition to wait for to become false
      */
@@ -483,10 +487,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Checks if the given element has the given class name.
-     * 
+     *
      * Matches only full class names, i.e. has ("foo") does not match
      * class="foobar"
-     * 
+     *
      * @param element
      * @param className
      * @return
@@ -509,7 +513,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * For tests extending {@link AbstractTestUIWithLog}, returns the element
      * for the Nth log row
-     * 
+     *
      * @param rowNr
      *            The log row to retrieve
      * @return the Nth log row
@@ -521,7 +525,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * For tests extending {@link AbstractTestUIWithLog}, returns the text in
      * the Nth log row
-     * 
+     *
      * @param rowNr
      *            The log row to retrieve text for
      * @return the text in the log row
@@ -532,7 +536,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that {@literal a} is &gt;= {@literal b}
-     * 
+     *
      * @param message
      *            The message to include in the {@link AssertionError}
      * @param a
@@ -551,7 +555,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that {@literal a} is &gt; {@literal b}
-     * 
+     *
      * @param message
      *            The message to include in the {@link AssertionError}
      * @param a
@@ -569,7 +573,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that {@literal a} is &lt;= {@literal b}
-     * 
+     *
      * @param message
      *            The message to include in the {@link AssertionError}
      * @param a
@@ -588,7 +592,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that {@literal a} is &lt; {@literal b}
-     * 
+     *
      * @param message
      *            The message to include in the {@link AssertionError}
      * @param a
@@ -596,8 +600,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * @throws AssertionError
      *             If comparison fails
      */
-    public static final <T> void assertLessThan(String message,
-            Comparable<T> a, T b) throws AssertionError {
+    public static final <T> void assertLessThan(String message, Comparable<T> a,
+            T b) throws AssertionError {
         if (a.compareTo(b) < 0) {
             return;
         }
@@ -613,12 +617,12 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Returns the path that should be used for the test. The path contains the
      * full path (appended to hostname+port) and must start with a slash.
-     * 
+     *
      * @param push
      *            true if "?debug" should be added
      * @param debug
      *            true if /run-push should be used instead of /run
-     * 
+     *
      * @return The URL path to the UI class to test
      */
     protected String getDeploymentPath() {
@@ -635,13 +639,13 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * Returns the UI class the current test is connected to (or in special
      * cases UIProvider or LegacyApplication). Uses the enclosing class if the
      * test class is a static inner class to a UI class.
-     * 
+     *
      * Test which are not enclosed by a UI class must implement this method and
      * return the UI class they want to test.
-     * 
+     *
      * Note that this method will update the test name to the enclosing class to
      * be compatible with TB2 screenshot naming
-     * 
+     *
      * @return the UI class the current test is connected to
      */
     protected Class<?> getUIClass() {
@@ -679,7 +683,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Returns whether to run the test in debug mode (with the debug console
      * open) or not
-     * 
+     *
      * @return true to run with the debug window open, false by default
      */
     protected final boolean isDebug() {
@@ -689,7 +693,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Sets whether to run the test in debug mode (with the debug console open)
      * or not.
-     * 
+     *
      * @param debug
      *            true to open debug window, false otherwise
      */
@@ -701,7 +705,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * Returns whether to run the test with push enabled (using /run-push) or
      * not. Note that push tests can and should typically be created using @Push
      * on the UI instead of overriding this method
-     * 
+     *
      * @return true if /run-push is used, false otherwise
      */
     protected final boolean isPush() {
@@ -712,7 +716,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * Sets whether to run the test with push enabled (using /run-push) or not.
      * Note that push tests can and should typically be created using @Push on
      * the UI instead of overriding this method
-     * 
+     *
      * @param push
      *            true to use /run-push in the test, false otherwise
      */
@@ -724,10 +728,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * Returns the path for the given UI class when deployed on the test server.
      * The path contains the full path (appended to hostname+port) and must
      * start with a slash.
-     * 
+     *
      * This method takes into account {@link #isPush()} and {@link #isDebug()}
      * when the path is generated.
-     * 
+     *
      * @param uiClass
      * @param push
      *            true if "?debug" should be added
@@ -754,7 +758,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Used to determine what URL to initially open for the test
-     * 
+     *
      * @return The base URL for the test. Does not include a trailing slash.
      */
     protected String getBaseURL() {
@@ -764,7 +768,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Generates the application id based on the URL in a way compatible with
      * VaadinServletService.
-     * 
+     *
      * @param pathWithQueryParameters
      *            The path part of the URL, possibly still containing query
      *            parameters
@@ -772,8 +776,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
      */
     private String getApplicationId(String pathWithQueryParameters) {
         // Remove any possible URL parameters
-        String pathWithoutQueryParameters = pathWithQueryParameters.replaceAll(
-                "\\?.*", "");
+        String pathWithoutQueryParameters = pathWithQueryParameters
+                .replaceAll("\\?.*", "");
         if ("".equals(pathWithoutQueryParameters)) {
             return "ROOT";
         }
@@ -785,7 +789,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Sleeps for the given number of ms but ensures that the browser connection
      * does not time out.
-     * 
+     *
      * @param timeoutMillis
      *            Number of ms to wait
      * @throws InterruptedException
@@ -804,7 +808,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Called by the test runner whenever there is an exception in the test that
      * will cause termination of the test
-     * 
+     *
      * @param t
      *            the throwable which caused the termination
      */
@@ -815,7 +819,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Returns the mouse object for doing mouse commands
-     * 
+     *
      * @return Returns the mouse
      */
     public Mouse getMouse() {
@@ -824,7 +828,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Returns the keyboard object for controlling keyboard events
-     * 
+     *
      * @return Return the keyboard
      */
     public Keyboard getKeyboard() {
@@ -860,10 +864,9 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     protected void assertNoDebugMessage(Level level) {
         // class="v-debugwindow-row Level.getName()"
-        List<WebElement> logElements = driver
-                .findElements(By.xpath(String
-                        .format("//div[@class='v-debugwindow-row %s']/span[@class='v-debugwindow-message']",
-                                level.getName())));
+        List<WebElement> logElements = driver.findElements(By.xpath(String
+                .format("//div[@class='v-debugwindow-row %s']/span[@class='v-debugwindow-message']",
+                        level.getName())));
         if (!logElements.isEmpty()) {
             String logRows = "";
             for (WebElement e : logElements) {
@@ -879,7 +882,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * RequireWindowFocus makes tests more stable but seems to be broken with
      * certain commands such as sendKeys. Therefore it is not enabled by default
      * for all tests
-     * 
+     *
      * @return true, to use the "require window focus" feature, false otherwise
      */
     protected boolean requireWindowFocusForIE() {
@@ -888,7 +891,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Should the "enable persistent hover" be enabled for Internet Explorer.
-     * 
+     *
      * Persistent hovering causes continuous firing of mouse over events at the
      * last location the mouse cursor has been moved to. This is to avoid
      * problems where the real mouse cursor is inside the browser window and
@@ -896,7 +899,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * (http://
      * jimevansmusic.blogspot.fi/2012/06/whats-wrong-with-internet-explorer
      * .html)
-     * 
+     *
      * @return true, to use the "persistent hover" feature, false otherwise
      */
     protected boolean usePersistentHoverForIE() {
@@ -908,7 +911,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * <p>
      * Native events sometimes cause failure in clicking on buttons/checkboxes
      * but are possibly needed for some operations.
-     * 
+     *
      * @return true, to use "native events", false to use generated Javascript
      *         events
      */
@@ -1009,8 +1012,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
     }
 
     protected boolean isLoadingIndicatorVisible() {
-        WebElement loadingIndicator = findElement(By
-                .className("v-loading-indicator"));
+        WebElement loadingIndicator = findElement(
+                By.className("v-loading-indicator"));
 
         return loadingIndicator.isDisplayed();
     }
@@ -1035,7 +1038,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Selects a menu item. By default, this will click on the menu item.
-     * 
+     *
      * @param menuCaption
      *            caption of the menu item
      */
@@ -1045,7 +1048,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Selects a menu item.
-     * 
+     *
      * @param menuCaption
      *            caption of the menu item
      * @param click
@@ -1055,8 +1058,9 @@ public abstract class AbstractTB3Test extends ParallelTest {
     protected void selectMenu(String menuCaption, boolean click) {
         WebElement menuElement = getMenuElement(menuCaption);
         Dimension size = menuElement.getSize();
-        new Actions(getDriver()).moveToElement(menuElement, size.width - 10,
-                size.height / 2).perform();
+        new Actions(getDriver())
+                .moveToElement(menuElement, size.width - 10, size.height / 2)
+                .perform();
         if (click) {
             new Actions(getDriver()).click().perform();
         }
@@ -1064,7 +1068,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Finds the menu item from the DOM based on menu item caption.
-     * 
+     *
      * @param menuCaption
      *            caption of the menu item
      * @return the found menu item
@@ -1080,7 +1084,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     /**
      * Selects a submenu described by a path of menus from the first MenuBar in
      * the UI.
-     * 
+     *
      * @param menuCaptions
      *            array of menu captions
      */
@@ -1088,8 +1092,9 @@ public abstract class AbstractTB3Test extends ParallelTest {
         selectMenu(menuCaptions[0], true);
 
         // Move to the menu item opened below the menu bar.
-        new Actions(getDriver()).moveByOffset(0,
-                getMenuElement(menuCaptions[0]).getSize().getHeight())
+        new Actions(getDriver())
+                .moveByOffset(0,
+                        getMenuElement(menuCaptions[0]).getSize().getHeight())
                 .perform();
 
         for (int i = 1; i < menuCaptions.length - 1; i++) {
@@ -1101,7 +1106,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that an element is present
-     * 
+     *
      * @param by
      *            the locatore for the element
      */
@@ -1111,7 +1116,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     /**
      * Asserts that an element is not present
-     * 
+     *
      * @param by
      *            the locatore for the element
      */
@@ -1172,7 +1177,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
         Assert.assertFalse(
                 "The element should not have a horizontal scrollbar (scrollWidth: "
                         + scrollWidth + ", clientWidth: " + clientWidth + "): "
-                        + errorMessage, hasScrollbar);
+                        + errorMessage,
+                hasScrollbar);
     }
 
     protected void assertNoVerticalScrollbar(WebElement element,
@@ -1187,7 +1193,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
         Assert.assertFalse(
                 "The element should not have a vertical scrollbar (scrollHeight: "
                         + scrollHeight + ", clientHeight: " + clientHeight
-                        + "): " + errorMessage, hasScrollbar);
+                        + "): " + errorMessage,
+                hasScrollbar);
     }
 
     protected int getScrollHeight(WebElement element) {
@@ -1252,8 +1259,8 @@ public abstract class AbstractTB3Test extends ParallelTest {
 
     protected void waitForThemeToChange(final String theme) {
 
-        final WebElement rootDiv = findElement(By
-                .xpath("//div[contains(@class,'v-app')]"));
+        final WebElement rootDiv = findElement(
+                By.xpath("//div[contains(@class,'v-app')]"));
         waitUntil(new ExpectedCondition<Boolean>() {
 
             @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
index 9dfae77ca5..d65eba278b 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java
index 128214de1e..44370e6516 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java
@@ -12,7 +12,7 @@ import com.vaadin.tests.tb3.AffectedTB3Tests.AffectedTB3TestSuite;
  * similar package name compare the the changes files in the current workspace.
  * If there are no changes in the workspace, it will run the changes to test
  * classes introduced in the HEAD commit.
- * 
+ *
  * @author Vaadin Ltd
  */
 @RunWith(AffectedTB3TestSuite.class)
@@ -20,8 +20,8 @@ public class AffectedTB3Tests {
 
     public static class AffectedTB3TestSuite extends TB3TestSuite {
 
-        public AffectedTB3TestSuite(Class<?> klass) throws InitializationError,
-                IOException {
+        public AffectedTB3TestSuite(Class<?> klass)
+                throws InitializationError, IOException {
             super(klass, AbstractTB3Test.class, "com.vaadin.tests",
                     new String[] { "com.vaadin.tests.integration" },
                     new AffectedTB3TestLocator());
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java
index 338855ba1c..a705b02bc5 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.AllTB3Tests.AllTB3TestsSuite;
 /**
  * Test consisting of all TB3 tests except integration tests (classes extending
  * AbstractTB3Test, excludes package com.vaadin.test.integration).
- * 
+ *
  * @author Vaadin Ltd
  */
 @RunWith(AllTB3TestsSuite.class)
@@ -34,8 +34,8 @@ public class AllTB3Tests {
 
     public static class AllTB3TestsSuite extends TB3TestSuite {
 
-        public AllTB3TestsSuite(Class<?> klass) throws InitializationError,
-                IOException {
+        public AllTB3TestsSuite(Class<?> klass)
+                throws InitializationError, IOException {
             super(klass, AbstractTB3Test.class, "com.vaadin.tests",
                     new String[] { "com.vaadin.tests.integration" });
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
index a6f2e5191a..2629d1dded 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,7 +40,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.util.io.DisabledOutputStream;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -74,7 +74,8 @@ public class ChangedTB3TestLocator extends TB3TestLocator {
                     .findGitDir() // scan up the file system tree
                     .build();
 
-            List<DiffEntry> diffsInWorkingTree = getDiffsInWorkingTree(repository);
+            List<DiffEntry> diffsInWorkingTree = getDiffsInWorkingTree(
+                    repository);
 
             if (diffsInWorkingTree.isEmpty()) {
                 return getDiffsInHead(repository);
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java
index 3c7030b1e9..98573d1544 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,15 +26,15 @@ import com.vaadin.tests.tb3.ChangedTB3Tests.ChangedTB3TestsSuite;
  * Test suite that runs tests from test classes which have changes in the
  * current workspace. If there are no changes in the workspace, it will run the
  * changes to test classes introduced in the HEAD commit.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
 @RunWith(ChangedTB3TestsSuite.class)
 public class ChangedTB3Tests {
     public static class ChangedTB3TestsSuite extends TB3TestSuite {
-        public ChangedTB3TestsSuite(Class<?> klass) throws InitializationError,
-                IOException {
+        public ChangedTB3TestsSuite(Class<?> klass)
+                throws InitializationError, IOException {
             super(klass, AbstractTB3Test.class, "com.vaadin.tests",
                     new String[] { "com.vaadin.tests.integration" },
                     new ChangedTB3TestLocator());
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
index 00d7788f8b..291d0bbadc 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,10 +37,10 @@ import com.vaadin.testbench.screenshot.ImageFileUtil;
 
 /**
  * Internal hack to support capturing screenshots for elements.
- * 
+ *
  * Most parts are from TestBenchCommandExecutor and the feature should be
  * integrated into TB4.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CustomTestBenchCommandExecutor {
@@ -54,7 +54,7 @@ public class CustomTestBenchCommandExecutor {
 
     /**
      * Compares the screenshot of the given element with the reference.
-     * 
+     *
      * Copied from TestBenchCommandExecutor
      */
     public boolean compareScreen(WebElement element, File reference,
@@ -71,28 +71,27 @@ public class CustomTestBenchCommandExecutor {
 
     /**
      * Compares the screenshot of the given element with the reference.
-     * 
+     *
      * Copied from TestBenchCommandExecutor and added cropToElement
      */
     public boolean compareScreen(WebElement element, BufferedImage reference,
             String referenceName, boolean isIE8) throws IOException {
-        for (int times = 0; times < Parameters.getMaxScreenshotRetries(); times++) {
+        for (int times = 0; times < Parameters
+                .getMaxScreenshotRetries(); times++) {
             BufferedImage screenshotImage = cropToElement(element,
                     ImageIO.read(new ByteArrayInputStream(
                             ((TakesScreenshot) actualDriver)
-                                    .getScreenshotAs(OutputType.BYTES))), isIE8);
+                                    .getScreenshotAs(OutputType.BYTES))),
+                    isIE8);
             if (reference == null) {
                 // Store the screenshot in the errors directory and fail the
                 // test
                 ImageFileUtil.createScreenshotDirectoriesIfNeeded();
                 ImageIO.write(screenshotImage, "png",
                         ImageFileUtil.getErrorScreenshotFile(referenceName));
-                getLogger().severe(
-                        "No reference found for "
-                                + referenceName
-                                + " in "
-                                + ImageFileUtil
-                                        .getScreenshotReferenceDirectory());
+                getLogger().severe("No reference found for " + referenceName
+                        + " in "
+                        + ImageFileUtil.getScreenshotReferenceDirectory());
                 return false;
             }
             if (imageComparison.imageEqualToReference(screenshotImage,
@@ -108,7 +107,7 @@ public class CustomTestBenchCommandExecutor {
     /**
      * Crops the image to show only the element. If the element is partly off
      * screen, crops to show the part of the element which is in the screenshot
-     * 
+     *
      * @param element
      *            the element to retain in the screenshot
      * @param fullScreen
@@ -136,8 +135,8 @@ public class CustomTestBenchCommandExecutor {
             // Get the part of the element which is on screen
             w = Math.min(fullScreen.getWidth() - x, w);
         } else {
-            throw new IOException("Element x is outside the screenshot (x: "
-                    + x + ", y: " + y + ")");
+            throw new IOException("Element x is outside the screenshot (x: " + x
+                    + ", y: " + y + ")");
         }
 
         if (y >= 0 && y < fullScreen.getHeight()) {
@@ -145,8 +144,8 @@ public class CustomTestBenchCommandExecutor {
             // Get the part of the element which is on screen
             h = Math.min(fullScreen.getHeight() - y, h);
         } else {
-            throw new IOException("Element y is outside the screenshot (x: "
-                    + x + ", y: " + y + ")");
+            throw new IOException("Element y is outside the screenshot (x: " + x
+                    + ", y: " + y + ")");
         }
 
         return fullScreen.getSubimage(x, y, w, h);
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
index 71d6b6fab4..0bbaf60c3c 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.testbench.parallel.BrowserUtil;
 /**
  * Base class for TestBench 3+ tests that use DnD. This class contains utility
  * methods for DnD operations.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Ignore
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
index dd061646be..8b92496433 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
  * Marker interface for a TB3+ test class which will exclude the test from any
  * test suite which automatically scans for test classes. Mostly useful for long
  * tests which should not be run in every build.
- * 
+ *
  * @since 7.1.10
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
index 789422c0c6..f058fc2d61 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * {@code property} has the given {@code value}.
  * <p>
  * Used by {@link TB3TestLocator}
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index ec40510d96..daa5149084 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,16 +27,16 @@ import com.vaadin.testbench.parallel.Browser;
  * Base class for tests which should be run on all supported browsers. The test
  * is automatically launched for multiple browsers in parallel by the test
  * runner.
- * 
+ *
  * Sub classes can, but typically should not, restrict the browsers used by
  * implementing a
- * 
+ *
  * <pre>
  * &#064;Parameters
  * public static Collection&lt;DesiredCapabilities&gt; getBrowsersForTest() {
  * }
  * </pre>
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class MultiBrowserTest extends PrivateTB3Configuration {
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index 460006b7f8..64a8482895 100755
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
index 9a02b29bc2..e9df2284d7 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
index 26ed8288d1..0fecc5cf81 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import com.vaadin.tests.integration.ParameterizedTB3Runner;
 
 @RunWith(ParameterizedTB3Runner.class)
-public abstract class MultiBrowserThemeTestWithProxy extends
-        MultiBrowserTestWithProxy {
+public abstract class MultiBrowserThemeTestWithProxy
+        extends MultiBrowserTestWithProxy {
 
     private String theme;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
index ef9ee382d0..daea6138f3 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import org.junit.runners.model.RunnerScheduler;
 /**
  * JUnit scheduler capable of running multiple tets in parallel. Each test is
  * run in its own thread. Uses an {@link ExecutorService} to manage the threads.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ParallelScheduler implements RunnerScheduler {
@@ -37,7 +37,7 @@ public class ParallelScheduler implements RunnerScheduler {
     /**
      * Creates a parallel scheduler which will use the given executor service
      * when submitting test jobs.
-     * 
+     *
      * @param service
      *            The service to use for tests
      */
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 85104c784b..abee2c1c2c 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -40,14 +40,14 @@ import com.vaadin.testbench.parallel.BrowserUtil;
  * Provides values for parameters which depend on where the test is run.
  * Parameters should be configured in work/eclipse-run-selected-test.properties.
  * A template is available in uitest/.
- * 
+ *
  * @author Vaadin Ltd
  */
 @RunOnHub("tb3-hub.intra.itmill.com")
 @BrowserFactory(VaadinBrowserFactory.class)
 public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     /**
-     * 
+     *
      */
     public static final String SCREENSHOT_DIRECTORY = "com.vaadin.testbench.screenshot.directory";
     private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
@@ -69,8 +69,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
                 if (properties.containsKey(RUN_LOCALLY_PROPERTY)) {
                     System.setProperty("useLocalWebDriver", "true");
                     DesiredCapabilities localBrowser = getRunLocallyCapabilities();
-                    System.setProperty(
-                            "browsers.include",
+                    System.setProperty("browsers.include",
                             localBrowser.getBrowserName()
                                     + localBrowser.getVersion());
                 }
@@ -93,15 +92,17 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
         String allowRunLocally = getProperty(ALLOW_RUN_LOCALLY_PROPERTY);
         if ((allowRunLocally == null || !allowRunLocally.equals("" + true))
                 && getClass().getAnnotation(RunLocally.class) != null) {
-            Assert.fail("@RunLocally annotation is not allowed by default in framework tests. "
-                    + "See file uitest/eclipse-run-selected-test.properties for more information.");
+            Assert.fail(
+                    "@RunLocally annotation is not allowed by default in framework tests. "
+                            + "See file uitest/eclipse-run-selected-test.properties for more information.");
         }
 
         super.setup();
     }
 
     @Override
-    public void setDesiredCapabilities(DesiredCapabilities desiredCapabilities) {
+    public void setDesiredCapabilities(
+            DesiredCapabilities desiredCapabilities) {
         super.setDesiredCapabilities(desiredCapabilities);
 
         if (BrowserUtil.isIE(desiredCapabilities)) {
@@ -123,17 +124,15 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
         desiredCapabilities.setCapability("project", "Vaadin Framework");
         desiredCapabilities.setCapability("build", String.format("%s / %s",
                 getDeploymentHostname(), Calendar.getInstance().getTime()));
-        desiredCapabilities.setCapability(
-                "name",
-                String.format("%s.%s", getClass().getCanonicalName(),
-                        testName.getMethodName()));
+        desiredCapabilities.setCapability("name", String.format("%s.%s",
+                getClass().getCanonicalName(), testName.getMethodName()));
     }
 
     protected static DesiredCapabilities getRunLocallyCapabilities() {
         VaadinBrowserFactory factory = new VaadinBrowserFactory();
         try {
-            return factory.create(Browser.valueOf(properties.getProperty(
-                    RUN_LOCALLY_PROPERTY).toUpperCase()));
+            return factory.create(Browser.valueOf(properties
+                    .getProperty(RUN_LOCALLY_PROPERTY).toUpperCase()));
         } catch (Exception e) {
             System.err.println(e.getMessage());
             System.err.println("Falling back to FireFox");
@@ -154,9 +153,8 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     protected String getScreenshotDirectory() {
         String screenshotDirectory = getProperty(SCREENSHOT_DIRECTORY);
         if (screenshotDirectory == null) {
-            throw new RuntimeException(
-                    "No screenshot directory defined. Use -D"
-                            + SCREENSHOT_DIRECTORY + "=<path>");
+            throw new RuntimeException("No screenshot directory defined. Use -D"
+                    + SCREENSHOT_DIRECTORY + "=<path>");
         }
         return screenshotDirectory;
     }
@@ -207,7 +205,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
 
     /**
      * Gets the hostname that tests are configured to use.
-     * 
+     *
      * @return the host name configuration value
      */
     public static String getConfiguredDeploymentHostname() {
@@ -227,7 +225,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
 
     /**
      * Gets the port that tests are configured to use.
-     * 
+     *
      * @return the port configuration value
      */
     public static int getConfiguredDeploymentPort() {
@@ -244,7 +242,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     /**
      * Tries to automatically determine the IP address of the machine the test
      * is running on.
-     * 
+     *
      * @return An IP address of one of the network interfaces in the machine.
      * @throws RuntimeException
      *             if there was an error or no IP was found
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
index 7a1656a0d2..66a1b7d46f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,10 +39,10 @@ public class RetryOnFail implements TestRule {
                         return;
                     } catch (Throwable t) {
                         caughtThrowable = t;
-                        System.err.println(String.format(
-                                "%s: run %s/%s failed.",
-                                description.getDisplayName(), i + 1,
-                                retryCount + 1));
+                        System.err
+                                .println(String.format("%s: run %s/%s failed.",
+                                        description.getDisplayName(), i + 1,
+                                        retryCount + 1));
                         System.err.println(t.getMessage());
                     }
                 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index d94e05efdb..285a9622a0 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,7 +42,7 @@ import com.vaadin.testbench.screenshot.ImageFileUtil;
 /**
  * Base class which provides functionality for tests which use the automatic
  * screenshot comparison function.
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class ScreenshotTB3Test extends AbstractTB3Test {
@@ -102,21 +102,21 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         screenshotFailures = new ArrayList<String>();
 
         Parameters.setScreenshotErrorDirectory(getScreenshotErrorDirectory());
-        Parameters
-                .setScreenshotReferenceDirectory(getScreenshotReferenceDirectory());
+        Parameters.setScreenshotReferenceDirectory(
+                getScreenshotReferenceDirectory());
     }
 
     /**
      * Grabs a screenshot and compares with the reference image with the given
      * identifier. Supports alternative references and will succeed if the
      * screenshot matches at least one of the references.
-     * 
+     *
      * In case of a failed comparison this method stores the grabbed screenshots
      * in the error directory as defined by
      * {@link #getScreenshotErrorDirectory()}. It will also generate a html file
      * in the same directory, comparing the screenshot with the first found
      * reference.
-     * 
+     *
      * @param identifier
      * @throws IOException
      */
@@ -127,7 +127,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
     protected void compareScreen(WebElement element, String identifier)
             throws IOException {
         if (identifier == null || identifier.isEmpty()) {
-            throw new IllegalArgumentException("Empty identifier not supported");
+            throw new IllegalArgumentException(
+                    "Empty identifier not supported");
         }
 
         File mainReference = getScreenshotReferenceFile(identifier);
@@ -207,8 +208,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         return customTestBench;
     }
 
-    private void enableAutoswitch(File htmlFile) throws FileNotFoundException,
-            IOException {
+    private void enableAutoswitch(File htmlFile)
+            throws FileNotFoundException, IOException {
         if (htmlFile == null || !htmlFile.exists()) {
             return;
         }
@@ -233,17 +234,17 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
     /**
      * Returns a new File which points to a .html file instead of the given .png
      * file
-     * 
+     *
      * @param png
      * @return
      */
     private static File htmlFromPng(File png) {
-        return new File(png.getParentFile(), png.getName().replaceAll(
-                "\\.png$", ".png.html"));
+        return new File(png.getParentFile(),
+                png.getName().replaceAll("\\.png$", ".png.html"));
     }
 
     /**
-     * 
+     *
      * @param referenceFile
      *            The reference image file (in the directory defined by
      *            {@link #getScreenshotReferenceDirectory()})
@@ -270,7 +271,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
     /**
      * Finds alternative references for the given files
-     * 
+     *
      * @param reference
      * @return all references which should be considered when comparing with the
      *         given files, including the given reference
@@ -365,7 +366,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
     /**
      * Checks if any screenshot comparisons failures occurred during the test
      * and combines all comparison errors into one exception
-     * 
+     *
      * @throws IOException
      *             If there were failures during the test
      */
@@ -399,7 +400,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
     /**
      * Returns the name of the reference file based on the given parameters.
-     * 
+     *
      * @param testName
      * @param capabilities
      * @param identifier
@@ -413,7 +414,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
      * Returns the name of the reference file based on the given parameters. The
      * version given in {@literal capabilities} is used unless it is overridden
      * by the {@literal versionOverride} parameter.
-     * 
+     *
      * @param testName
      * @param capabilities
      * @param identifier
@@ -444,9 +445,9 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
         if (versionOverride != null) {
             // Windows_Firefox_17_bufferingdemo_valo
-            parameters = parameters.replaceFirst("_"
-                    + getDesiredCapabilities().getVersion(), "_"
-                    + versionOverride);
+            parameters = parameters.replaceFirst(
+                    "_" + getDesiredCapabilities().getVersion(),
+                    "_" + versionOverride);
         }
         return parameters;
     }
@@ -459,9 +460,10 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
      * running this test.
      */
     private String getScreenshotErrorBaseName() {
-        return getScreenshotReferenceName("dummy", null).replace(
-                getScreenshotReferenceDirectory(),
-                getScreenshotErrorDirectory()).replace("_dummy.png", "");
+        return getScreenshotReferenceName("dummy", null)
+                .replace(getScreenshotReferenceDirectory(),
+                        getScreenshotErrorDirectory())
+                .replace("_dummy.png", "");
     }
 
     /**
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java
index b06044446e..7b41eb2a37 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
index b5389d3eec..e8e8089edf 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
@@ -28,7 +28,7 @@ public abstract class SingleBrowserTest extends PrivateTB3Configuration {
         if (isRunLocally()) {
             return Collections.singletonList(getRunLocallyCapabilities());
         }
-        return Collections.singletonList(Browser.PHANTOMJS
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.PHANTOMJS.getDesiredCapabilities());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
index 7447a3c056..b785865790 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
@@ -20,8 +20,8 @@ import java.util.List;
 
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-public abstract class SingleBrowserTestPhantomJS2 extends
-        PrivateTB3Configuration {
+public abstract class SingleBrowserTestPhantomJS2
+        extends PrivateTB3Configuration {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         return Collections.singletonList(PHANTOMJS2());
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
index 4917e398cf..d3d4397644 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
@@ -32,7 +32,7 @@ import com.vaadin.testbench.parallel.ParallelRunner;
  * (http://tedyoung.me/2011/01/23/junit-runtime-tests-custom-runners/). The
  * generated test names give information about the parameters used (unlike
  * {@link Parameterized}).
- * 
+ *
  * @since 7.1
  */
 public class TB3Runner extends ParallelRunner {
@@ -57,7 +57,8 @@ public class TB3Runner extends ParallelRunner {
                 public HttpClient getGridHttpClient(int connection_timeout,
                         int socket_timeout) {
 
-                    if (socket_timeout == 0 || socket_timeout > SOCKET_TIMEOUT) {
+                    if (socket_timeout == 0
+                            || socket_timeout > SOCKET_TIMEOUT) {
                         return super.getGridHttpClient(connection_timeout,
                                 SOCKET_TIMEOUT);
                     }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
index eb0861757e..c8e3ea9646 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ public class TB3TestLocator {
      * specified by 'basePackage'. Collects all classes inside the location
      * which can be assigned to 'baseClass' except for classes inside packages
      * listed in 'ignoredPackages'.
-     * 
+     *
      * @param baseClass
      * @param basePackage
      * @param ignorePackages
@@ -58,7 +58,7 @@ public class TB3TestLocator {
      * specified by 'basePackage'. Collects all classes inside the location
      * which can be assigned to 'baseClass' except for classes inside packages
      * listed in 'ignoredPackages'.
-     * 
+     *
      * @param baseClass
      * @param basePackage
      * @param ignoredPackages
@@ -74,8 +74,8 @@ public class TB3TestLocator {
             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);
@@ -103,7 +103,7 @@ public class TB3TestLocator {
      * Traverses the given directory and collects all classes which are inside
      * the given 'javaPackage' and can be assigned to the given 'baseClass'. The
      * found classes are added to 'result'.
-     * 
+     *
      * @param parent
      *            The directory to traverse
      * @param javaPackage
@@ -141,7 +141,7 @@ public class TB3TestLocator {
      * Traverses a Jar file using the given connection and collects all classes
      * which are inside the given 'javaPackage' and can be assigned to the given
      * 'baseClass'. The found classes are added to 'result'.
-     * 
+     *
      * @param javaPackage
      *            The java package containing the classes (classes may be in a
      *            sub package)
@@ -171,7 +171,7 @@ public class TB3TestLocator {
      * Verifies that the class represented by 'fullyQualifiedClassName' can be
      * loaded, assigned to 'baseClass' and is not an abstract or anonymous
      * class.
-     * 
+     *
      * @param result
      *            The collection to add to
      * @param fullyQualifiedClassName
@@ -193,7 +193,8 @@ public class TB3TestLocator {
                 return;
             }
 
-            if (!Modifier.isAbstract(c.getModifiers()) && !c.isAnonymousClass()) {
+            if (!Modifier.isAbstract(c.getModifiers())
+                    && !c.isAnonymousClass()) {
                 result.add((Class<? extends T>) c);
             }
         } catch (Exception e) {
@@ -217,8 +218,8 @@ public class TB3TestLocator {
                 .getAnnotation(IncludeIfProperty.class);
         if (includeIfProperty != null) {
             String includeValue = includeIfProperty.value();
-            String systemPropertyValue = System.getProperty(includeIfProperty
-                    .property());
+            String systemPropertyValue = System
+                    .getProperty(includeIfProperty.property());
             if (!includeValue.equals(systemPropertyValue)) {
                 return false;
             }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
index c68d59a4eb..d0a475528f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.testbench.parallel.ParallelTestSuite;
 /**
  * Test suite which consists of all the TB3 tests passed in the constructor.
  * Runs the tests in parallel using a {@link ParallelScheduler}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TB3TestSuite extends ParallelTestSuite {
@@ -41,8 +41,7 @@ public class TB3TestSuite extends ParallelTestSuite {
             Class<? extends AbstractTB3Test> baseClass, String basePackage,
             String[] ignorePackages, TB3TestLocator locator)
             throws InitializationError, IOException {
-        super(klass, locator
-                .findClasses(baseClass, basePackage, ignorePackages).toArray(
-                        new Class<?>[] {}));
+        super(klass, locator.findClasses(baseClass, basePackage, ignorePackages)
+                .toArray(new Class<?>[] {}));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java
index e455abc9f0..d58eca573f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.testbench.By;
 /**
  * Base class for TestBench 3+ tests that use tooltips. This class contains
  * utility methods for testing tooltip use.
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class TooltipTest extends MultiBrowserTest {
@@ -63,16 +63,18 @@ public abstract class TooltipTest extends MultiBrowserTest {
         WebElement body = findElement(By.cssSelector("body"));
         WebElement tooltip = getTooltip();
         Assert.assertEquals(value, tooltip.getText());
-        Assert.assertTrue("Tooltip overflowed to the left", tooltip
-                .getLocation().getX() >= 0);
+        Assert.assertTrue("Tooltip overflowed to the left",
+                tooltip.getLocation().getX() >= 0);
         Assert.assertTrue("Tooltip overflowed up",
                 tooltip.getLocation().getY() >= 0);
-        Assert.assertTrue("Tooltip overflowed to the right", tooltip
-                .getLocation().getX() + tooltip.getSize().getWidth() < body
-                .getSize().getWidth());
-        Assert.assertTrue("Tooltip overflowed down", tooltip.getLocation()
-                .getY() + tooltip.getSize().getHeight() < body.getSize()
-                .getHeight());
+        Assert.assertTrue("Tooltip overflowed to the right",
+                tooltip.getLocation().getX()
+                        + tooltip.getSize().getWidth() < body.getSize()
+                                .getWidth());
+        Assert.assertTrue("Tooltip overflowed down",
+                tooltip.getLocation().getY()
+                        + tooltip.getSize().getHeight() < body.getSize()
+                                .getHeight());
 
     }
 
@@ -95,7 +97,8 @@ public abstract class TooltipTest extends MultiBrowserTest {
                         + tooltip.getText() + " at " + tooltip.getLocation());
             }
         } catch (NoSuchElementException e) {
-            Assert.fail("Tooltip element was removed completely, causing extra events to accessibility tools");
+            Assert.fail(
+                    "Tooltip element was removed completely, causing extra events to accessibility tools");
         }
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
index 2389811ff0..fa35526f4d 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
@@ -42,9 +42,8 @@ public class VaadinBrowserFactory extends DefaultBrowserFactory {
                             .getClassLoader().loadClass(browserFactoryClass)
                             .newInstance();
                 } catch (Exception e) {
-                    getLogger().warning(
-                            "Failed to instantiate browser factory "
-                                    + browserFactoryClass);
+                    getLogger().warning("Failed to instantiate browser factory "
+                            + browserFactoryClass);
                     throw new RuntimeException(e);
                 }
             }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java
index ee8cab22fd..4246799827 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.tests.tb3;
 
@@ -28,7 +28,7 @@ import com.vaadin.testbench.parallel.TestCategory;
 /**
  * A {@link MultiBrowserTest} which restricts the tests to the browsers which
  * support websocket
- * 
+ *
  * @author Vaadin Ltd
  */
 @TestCategory("push")
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
index 40475afd3c..8e07b61e26 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
@@ -8,8 +8,8 @@ import com.vaadin.testbench.By;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
 @ServerClass("com.vaadin.ui.Calendar")
-public class CalendarElement extends
-        com.vaadin.testbench.elements.CalendarElement {
+public class CalendarElement
+        extends com.vaadin.testbench.elements.CalendarElement {
     public List<WebElement> getWeekNumbers() {
         return findElements(By.className("v-calendar-week-number"));
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
index 4a84c2bbc1..f1f16d3e00 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
@@ -7,8 +7,8 @@ import com.vaadin.testbench.By;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
 @ServerClass("com.vaadin.ui.ComboBox")
-public class ComboBoxElement extends
-        com.vaadin.testbench.elements.ComboBoxElement {
+public class ComboBoxElement
+        extends com.vaadin.testbench.elements.ComboBoxElement {
 
     private static org.openqa.selenium.By bySuggestionPopup = By
             .vaadin("#popup");
@@ -39,7 +39,7 @@ public class ComboBoxElement extends
     /**
      * Use this method to simulate typing into an element, which may set its
      * value.
-     * 
+     *
      * @param delay
      *            delay after sending each individual key (mainly needed for
      *            PhantomJS)
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
index 8f8dd82d9f..b10ea2bed8 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
@@ -21,7 +21,8 @@ public class FixedNotificationElement extends NotificationElement {
     public void close() {
         click(5, 5);
         WebDriverWait wait = new WebDriverWait(getDriver(), 10);
-        wait.until(ExpectedConditions.not(ExpectedConditions
-                .presenceOfAllElementsLocatedBy(By.className("v-Notification"))));
+        wait.until(ExpectedConditions
+                .not(ExpectedConditions.presenceOfAllElementsLocatedBy(
+                        By.className("v-Notification"))));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index 1814aa99df..b10c51573f 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
@@ -78,8 +78,8 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
             return;
         }
         EmbeddedElement e = $(EmbeddedElement.class).first();
-        WebElement movieParam = e.findElement(By
-                .xpath(".//param[@name='movie']"));
+        WebElement movieParam = e
+                .findElement(By.xpath(".//param[@name='movie']"));
         WebElement embed = e.findElement(By.xpath(".//embed"));
         assertAttributePrefix(movieParam, "value", theme);
         assertAttributePrefix(embed, "src", theme);
@@ -101,16 +101,16 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
         assertAttributePrefix(selectedImage, "src", theme);
 
         cb.openPopup();
-        WebElement popup = findElement(By
-                .className("v-filterselect-suggestpopup"));
+        WebElement popup = findElement(
+                By.className("v-filterselect-suggestpopup"));
         WebElement itemImage = popup.findElement(By.xpath(".//img"));
         assertAttributePrefix(itemImage, "src", theme);
     }
 
     private void assertMenubarTheme(String theme) {
         // The runoImage must always come from Runo
-        WebElement runoImage = $(MenuBarElement.class).first().findElement(
-                By.xpath(".//span[text()='runo']/img"));
+        WebElement runoImage = $(MenuBarElement.class).first()
+                .findElement(By.xpath(".//span[text()='runo']/img"));
         String runoImageSrc = runoImage.getAttribute("src");
 
         // Something in Selenium normalizes the image so it becomes
@@ -120,22 +120,22 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
                 runoImageSrc);
 
         // The other image should change with the theme
-        WebElement themeImage = $(MenuBarElement.class).first().findElement(
-                By.xpath(".//span[text()='selectedtheme']/img"));
+        WebElement themeImage = $(MenuBarElement.class).first()
+                .findElement(By.xpath(".//span[text()='selectedtheme']/img"));
         assertAttributePrefix(themeImage, "src", theme);
 
-        WebElement subMenuItem = $(MenuBarElement.class).first().findElement(
-                By.xpath(".//span[text()='sub menu']"));
+        WebElement subMenuItem = $(MenuBarElement.class).first()
+                .findElement(By.xpath(".//span[text()='sub menu']"));
         subMenuItem.click();
 
         WebElement subMenu = findElement(By.className("v-menubar-popup"));
-        WebElement subMenuRuno = subMenu.findElement(By
-                .xpath(".//span[text()='runo']/img"));
+        WebElement subMenuRuno = subMenu
+                .findElement(By.xpath(".//span[text()='runo']/img"));
         String subMenuRunoImageSrc = subMenuRuno.getAttribute("src");
         Assert.assertEquals(getThemeURL("runo") + "icons/16/ok.png",
                 subMenuRunoImageSrc);
-        WebElement subMenuThemeImage = subMenu.findElement(By
-                .xpath(".//span[text()='selectedtheme']/img"));
+        WebElement subMenuThemeImage = subMenu
+                .findElement(By.xpath(".//span[text()='selectedtheme']/img"));
         assertAttributePrefix(subMenuThemeImage, "src", theme);
     }
 
@@ -143,8 +143,9 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
             String theme) {
         String value = element.getAttribute(attribute);
         String expectedPrefix = getThemeURL(theme);
-        Assert.assertTrue("Attribute " + attribute + "='" + value
-                + "' does not start with " + expectedPrefix,
+        Assert.assertTrue(
+                "Attribute " + attribute + "='" + value
+                        + "' does not start with " + expectedPrefix,
                 value.startsWith(expectedPrefix));
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
index cb5e9d07c7..166cc5440c 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -34,8 +34,8 @@ public class ThemeChangeFaviconTest extends SingleBrowserTest {
     public List<DesiredCapabilities> getBrowsersToTest() {
         // Seems like stylesheet onload is not fired on PhantomJS
         // https://github.com/ariya/phantomjs/issues/12332
-        return Collections.singletonList(Browser.FIREFOX
-                .getDesiredCapabilities());
+        return Collections
+                .singletonList(Browser.FIREFOX.getDesiredCapabilities());
     }
 
     @Test
@@ -59,14 +59,15 @@ public class ThemeChangeFaviconTest extends SingleBrowserTest {
     private void assertFavicon(String theme) {
         String faviconUrl = "/VAADIN/themes/" + theme + "/favicon.ico";
 
-        List<WebElement> elements = findElements(By
-                .cssSelector("link[rel~=\"icon\"]"));
+        List<WebElement> elements = findElements(
+                By.cssSelector("link[rel~=\"icon\"]"));
 
         Assert.assertEquals(2, elements.size());
 
         for (WebElement element : elements) {
-            Assert.assertTrue(element.getAttribute("href")
-                    + " does not end with " + faviconUrl,
+            Assert.assertTrue(
+                    element.getAttribute("href") + " does not end with "
+                            + faviconUrl,
                     element.getAttribute("href").endsWith(faviconUrl));
         }
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
index caf264abf1..ba2fd41778 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
@@ -90,8 +90,8 @@ public class ThemeChangeOnTheFlyTest extends MultiBrowserTest {
     }
 
     private void assertOverlayTheme(String theme) {
-        final WebElement overlayContainerDiv = findElement(By
-                .xpath("//div[contains(@class,'v-overlay-container')]"));
+        final WebElement overlayContainerDiv = findElement(
+                By.xpath("//div[contains(@class,'v-overlay-container')]"));
         String overlayClass = overlayContainerDiv.getAttribute("class").trim();
 
         assertThat(overlayClass, containsString(theme));
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
index 3a5ddf5f3b..f261730930 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
@@ -18,14 +18,14 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest {
     public void disabledMenuItemShouldHaveOpacity() throws IOException {
         openTestURL();
 
-        WebElement element = driver.findElement(By
-                .className("v-menubar-menuitem-disabled"));
+        WebElement element = driver
+                .findElement(By.className("v-menubar-menuitem-disabled"));
 
-        if (Browser.IE9.getDesiredCapabilities().equals(
-                getDesiredCapabilities())) {
+        if (Browser.IE9.getDesiredCapabilities()
+                .equals(getDesiredCapabilities())) {
             assertThat(element.getCssValue("filter"), is("alpha(opacity=50)"));
-        } else if (Browser.IE8.getDesiredCapabilities().equals(
-                getDesiredCapabilities())) {
+        } else if (Browser.IE8.getDesiredCapabilities()
+                .equals(getDesiredCapabilities())) {
             WebElement icon = element.findElement(By.tagName("img"));
             assertThat(icon.getCssValue("filter"), is("alpha(opacity=50)"));
         } else {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
index 02ef886721..6c2b0b92aa 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for centered image icon in button with 'icon-align-top' style.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AlignTopIconInButtonTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
index 6e01e01996..f910354a39 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test for non-collapsible column opacity for item in column configuration
  * menu.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CollapsibleTableColumnTest extends MultiBrowserTest {
@@ -48,8 +48,9 @@ public class CollapsibleTableColumnTest extends MultiBrowserTest {
         String nonCollapsibleColumnOpacity = items.get(1)
                 .getCssValue("opacity");
 
-        Assert.assertNotEquals("Opacity value is the same for collapsible "
-                + "and non-collapsible column item", collapsibleColumnOpacity,
-                nonCollapsibleColumnOpacity);
+        Assert.assertNotEquals(
+                "Opacity value is the same for collapsible "
+                        + "and non-collapsible column item",
+                collapsibleColumnOpacity, nonCollapsibleColumnOpacity);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
index 38d93ab633..39271f8092 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for default contrast color variable in valo-font-color function.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ContrastFontColorTest extends MultiBrowserTest {
@@ -35,6 +35,7 @@ public class ContrastFontColorTest extends MultiBrowserTest {
         String color = $(TextFieldElement.class).first().getCssValue("color");
         Assert.assertEquals(
                 "Unexpected text color value using 0.1 as defualt contrast value :"
-                        + color, "rgba(230, 230, 230, 1)", color);
+                        + color,
+                "rgba(230, 230, 230, 1)", color);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/DisabledLabelTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/DisabledLabelTest.java
index dfbaaa5849..76fb0cec48 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/DisabledLabelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/DisabledLabelTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for disabled label opacity.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DisabledLabelTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
index 2a1664fbcf..a129550298 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
@@ -16,7 +16,8 @@ public class FormLayoutInsideTableTest extends MultiBrowserTest {
     public void nestedItemHasBorderTop() {
         openTestURL();
 
-        List<WebElement> formLayoutRows = findElements(By.cssSelector("tr.v-formlayout-row"));
+        List<WebElement> formLayoutRows = findElements(
+                By.cssSelector("tr.v-formlayout-row"));
         WebElement secondNestedRow = formLayoutRows.get(1);
 
         WebElement td = secondNestedRow.findElement(By.tagName("td"));
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
index 137b845e52..7036e9991e 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test to see if upload immediate mode hides the native file input.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ImmediateUploadTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java
index 0b21d4f34c..11b98174ba 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java
@@ -23,8 +23,8 @@ public class ModalWindowTest extends SingleBrowserTest {
 
         openModalWindow();
 
-        WebElement modalityCurtain = findElement(By
-                .className("v-window-modalitycurtain"));
+        WebElement modalityCurtain = findElement(
+                By.className("v-window-modalitycurtain"));
 
         assertThat(modalityCurtain.getCssValue("-webkit-animation-name"),
                 is("none"));
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java
index 5f9542b6f3..41b59f6f22 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,7 +31,7 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Test for H1 and P elements styles in Notifications.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NotificationStyleTest extends MultiBrowserTest {
@@ -46,13 +46,14 @@ public class NotificationStyleTest extends MultiBrowserTest {
         waitUntil(notificationPresentCondition(), 2);
 
         WebElement notification = findElement(By.className("v-Notification"));
-        List<WebElement> headers = notification.findElements(By
-                .tagName(ValoTheme.LABEL_H1));
+        List<WebElement> headers = notification
+                .findElements(By.tagName(ValoTheme.LABEL_H1));
         String textAlign = headers.get(0).getCssValue("text-align");
         String textAlignInnerHeader = headers.get(1).getCssValue("text-align");
-        Assert.assertNotEquals("Styles for notification defined h1 tag "
-                + "and custom HTML tag are the same", textAlign,
-                textAlignInnerHeader);
+        Assert.assertNotEquals(
+                "Styles for notification defined h1 tag "
+                        + "and custom HTML tag are the same",
+                textAlign, textAlignInnerHeader);
     }
 
     @Test
@@ -65,13 +66,15 @@ public class NotificationStyleTest extends MultiBrowserTest {
         waitUntil(notificationPresentCondition(), 2);
 
         WebElement notification = findElement(By.className("v-Notification"));
-        WebElement description = notification.findElement(By
-                .className("v-Notification-description"));
+        WebElement description = notification
+                .findElement(By.className("v-Notification-description"));
         String display = description.getCssValue("display");
         String displayP2 = notification.findElement(By.className("tested-p"))
                 .getCssValue("display");
-        Assert.assertNotEquals("Styles for notification defined 'p' tag "
-                + "and custom HTML tag are the same", display, displayP2);
+        Assert.assertNotEquals(
+                "Styles for notification defined 'p' tag "
+                        + "and custom HTML tag are the same",
+                display, displayP2);
     }
 
     private ExpectedCondition<Boolean> notificationPresentCondition() {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
index 8f01de350e..5de3b5aaa7 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -39,15 +39,15 @@ public class ResponsiveStylesTest extends MultiBrowserTest {
     /**
      * Tests that valo-menu-responsive can be used in any element on the page,
      * not just as top-level component.
-     * 
+     *
      * @throws Exception
      */
     @Test
     public void testValoMenuResponsiveParentSize() throws Exception {
         openTestURL();
 
-        List<WebElement> menus = findElements(com.vaadin.testbench.By
-                .className(MENU_STYLENAME));
+        List<WebElement> menus = findElements(
+                com.vaadin.testbench.By.className(MENU_STYLENAME));
 
         WebElement narrowMenu = menus.get(NARROW_ELEMENT_INDEX);
         int narrowWidth = narrowMenu.getSize().width;
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
index 04de8b498c..3e897c79b7 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,8 +30,8 @@ public class TableWithEmptyCaptionTest extends MultiBrowserTest {
 
         // Wait for the loading bar to disappear before taking the screenshot.
         try {
-            waitUntil(ExpectedConditions.invisibilityOfElementLocated(By
-                    .className("v-loading-indicator")), 5);
+            waitUntil(ExpectedConditions.invisibilityOfElementLocated(
+                    By.className("v-loading-indicator")), 5);
         } catch (TimeoutException e) {
             // Just take the screenshot, PhantomJS always times out.
         }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
index efe194d28a..5f52c53393 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Test for $v-textfield-bevel value when $v-bevel is unset.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TextFieldBevelTest extends MultiBrowserTest {
@@ -51,11 +51,9 @@ public class TextFieldBevelTest extends MultiBrowserTest {
     }
 
     private void openTestUrlWithoutBevel() {
-        getDriver().get(
-                getTestUrl()
-                        + "$"
-                        + TextFieldBevel.ValoDefaultTextFieldBevel.class
-                                .getSimpleName() + "?restartApplication");
+        getDriver().get(getTestUrl() + "$"
+                + TextFieldBevel.ValoDefaultTextFieldBevel.class.getSimpleName()
+                + "?restartApplication");
     }
 
     private String getBoxShadow() {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index 7651b641de..5c22d1dbb0 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import com.vaadin.tests.components.colorpicker.DefaultCaptionWidthTest;
 
 /**
  * Test for default caption behavior in color picker using Valo theme.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ValoDefaultCaptionWidthTest extends DefaultCaptionWidthTest {
@@ -50,7 +50,9 @@ public class ValoDefaultCaptionWidthTest extends DefaultCaptionWidthTest {
         int width = $(ColorPickerElement.class).first().getSize().getWidth();
         // Width should be 150px but let's just check that it's not which is
         // used when default caption is used and at least >= 150-1
-        assertThat("Width of color picker is overriden by "
-                + "default caption feature", width, is(greaterThan(149)));
+        assertThat(
+                "Width of color picker is overriden by "
+                        + "default caption feature",
+                width, is(greaterThan(149)));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 3c28b1f9eb..c5e0f446a1 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -285,9 +285,8 @@ public class ValoThemeUITest extends MultiBrowserTest {
         LabelElement captionElem = content.$(LabelElement.class).first();
         if (!captionElem.getText().equals(caption)) {
             // IE ... why you fail clicks
-            System.err.println("Extra click needed on '" + link
-                    + "' on remote " + getDesiredCapabilities() + " "
-                    + getRemoteControlName());
+            System.err.println("Extra click needed on '" + link + "' on remote "
+                    + getDesiredCapabilities() + " " + getRemoteControlName());
 
             open(link, caption, tries - 1);
         } else {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
index 555168f155..788c420ce7 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * Test to see if tooltips obey quickOpenDelay when moving between directly
  * adjacent elements.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AdjacentElementsWithTooltipsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
index d913c8cc12..b4d9ed57b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,8 +22,8 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.TooltipTest;
 
 /**
- * 
- * 
+ *
+ *
  * @author Vaadin Ltd
  */
 public class DragAndDropWrapperTooltipsTest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java
index 191ce6ffec..fed7b3940f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.tests.util.LoremIpsum;
 
 /**
  * Test to see if long tooltips behave appropriately
- * 
+ *
  * @author Vaadin Ltd
  */
 public class LongTooltipTest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
index 9b2f7d13d6..8ae3b53f11 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
@@ -17,15 +17,12 @@ public class MenuBarTooltipTest extends MultiBrowserTest {
 
     @Test
     public void toolTipShouldBeOnTopOfMenuItem() {
-        String[] themes = new String[] {
-                ValoTheme.THEME_NAME,
-                Reindeer.THEME_NAME,
-                Runo.THEME_NAME,
-                ChameleonTheme.THEME_NAME
-        };
-
-        for(String theme : themes) {
-           assertZIndices(theme);
+        String[] themes = new String[] { ValoTheme.THEME_NAME,
+                Reindeer.THEME_NAME, Runo.THEME_NAME,
+                ChameleonTheme.THEME_NAME };
+
+        for (String theme : themes) {
+            assertZIndices(theme);
         }
     }
 
@@ -35,7 +32,8 @@ public class MenuBarTooltipTest extends MultiBrowserTest {
         $(MenuBarElement.class).first().clickItem("Menu item");
 
         assertThat(String.format("Invalid z-index for theme %s.", theme),
-                getZIndex("v-tooltip"), greaterThan(getZIndex("v-menubar-popup")));
+                getZIndex("v-tooltip"),
+                greaterThan(getZIndex("v-menubar-popup")));
     }
 
     private int getZIndex(String className) {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java
index 743b7c2ab5..58c052a473 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -23,7 +23,7 @@ import com.vaadin.tests.tb3.TooltipTest;
 
 /**
  * Test that sliders can have tooltips
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SliderTooltipTest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
index cc9309ac2c..4cd06f16b0 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
@@ -30,8 +30,8 @@ public class TooltipAndJavascriptTest extends MultiBrowserTest {
     public void ensureTooltipInOverlay() throws InterruptedException {
         openTestURL();
         $(ButtonElement.class).first().showTooltip();
-        WebElement tooltip = findElement(By
-                .cssSelector(".v-overlay-container .v-tooltip"));
+        WebElement tooltip = findElement(
+                By.cssSelector(".v-overlay-container .v-tooltip"));
         WebElement overlayContainer = getParent(tooltip);
         Assert.assertTrue("v-overlay-container did not receive theme",
                 hasClass(overlayContainer, "reindeer"));
@@ -48,7 +48,7 @@ public class TooltipAndJavascriptTest extends MultiBrowserTest {
     }
 
     private WebElement getParent(WebElement element) {
-        return (WebElement) ((JavascriptExecutor) getDriver()).executeScript(
-                "return arguments[0].parentNode;", element);
+        return (WebElement) ((JavascriptExecutor) getDriver())
+                .executeScript("return arguments[0].parentNode;", element);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
index 8f84444400..b69ee48b39 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java
index 1c50bf5486..dd1d5c03db 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java
@@ -61,6 +61,7 @@ public class TooltipInWindowTest extends TooltipTest {
         int tooltipX = getTooltipContainerElement().getLocation().getX();
         assertLessThanOrEqual(
                 "Tooltip should be positioned outside of viewport (was at "
-                        + tooltipX + ")", tooltipX, -1000);
+                        + tooltipX + ")",
+                tooltipX, -1000);
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
index 150d0e070e..26ea7fd338 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2013 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,7 +40,8 @@ public class TooltipWidthUpdatingTest extends TooltipTest {
         testBenchElement(btnShortTooltip).showTooltip();
 
         assertThat(getDriver().findElement(By.className("popupContent"))
-                .getSize().getWidth(), lessThan(TooltipWidthUpdating.MAX_WIDTH));
+                .getSize().getWidth(),
+                lessThan(TooltipWidthUpdating.MAX_WIDTH));
     }
 
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
index 9603b1df36..ecd5dbcadf 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
@@ -22,7 +22,7 @@ import com.vaadin.tests.tb3.TooltipTest;
 
 /**
  * Test to see if validators create error tooltips correctly.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ValidatorCaptionTooltipTest extends TooltipTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
index 01ea890cec..942b13460e 100644
--- a/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
  * Back and Forward buttons in browser should work correctly during UI update
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FragmentHandlingAndAsynchUIUpdateTest extends MultiBrowserTest {
@@ -45,8 +45,10 @@ public class FragmentHandlingAndAsynchUIUpdateTest extends MultiBrowserTest {
         for (int i = 0; i < 10; i++) {
             // here we wait for setting fragment in URI. If not to do it -
             // history will be "loss"
-            getDriver().findElement(
-                    By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID)).click();
+            getDriver()
+                    .findElement(
+                            By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID))
+                    .click();
             assertFragment(String.format(FRAG_NAME_TPL, START_FRAG_ID + i));
         }
 
@@ -97,8 +99,9 @@ public class FragmentHandlingAndAsynchUIUpdateTest extends MultiBrowserTest {
             @Override
             public void run() {
                 for (int i = 0; i < 10; i++) {
-                    getDriver().findElement(
-                            By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID))
+                    getDriver()
+                            .findElement(
+                                    By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID))
                             .click();
                 }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
index 4fed0b2602..1d570de3bf 100644
--- a/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 /**
  * UI test: setting null as URI fragment clear (remove) the fragment in the
  * browser
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SettingNullFragmentTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
index 2af015b406..b1d4faed7b 100644
--- a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,8 +41,8 @@ public class WidgetUtilTest extends MultiBrowserTest {
     @Test
     public void testBlockElementRequiredSizeComputedStyle() {
         openTestURL();
-        WebElement testComponent = findElement(By
-                .className("v-widget-util-test"));
+        WebElement testComponent = findElement(
+                By.className("v-widget-util-test"));
         testComponent.click();
 
         int padding = (int) Math.ceil(2.4 + 3.5);
@@ -60,14 +60,14 @@ public class WidgetUtilTest extends MultiBrowserTest {
             border = 1 * 2;
         }
 
-        assertExpectedSize(testComponent, "noBorderPadding", baseWidth + "x"
-                + baseHeight);
+        assertExpectedSize(testComponent, "noBorderPadding",
+                baseWidth + "x" + baseHeight);
 
-        assertExpectedSize(testComponent, "border", (baseWidth + border) + "x"
-                + (baseHeight + border));
+        assertExpectedSize(testComponent, "border",
+                (baseWidth + border) + "x" + (baseHeight + border));
 
-        assertExpectedSize(testComponent, "padding", (baseWidth + padding)
-                + "x" + (baseHeight + padding));
+        assertExpectedSize(testComponent, "padding",
+                (baseWidth + padding) + "x" + (baseHeight + padding));
 
         assertExpectedSize(testComponent, "borderPadding",
                 (baseWidth + border + padding) + "x"
@@ -86,8 +86,8 @@ public class WidgetUtilTest extends MultiBrowserTest {
         // Note that this is how the Windows browsers in the test cluster work.
         // On Mac, Firefox works slightly differently (rounds border to 1.5px).
         return (BrowserUtil.isChrome(capabilities)
-                || BrowserUtil.isPhantomJS(capabilities) || BrowserUtil
-                    .isFirefox(capabilities));
+                || BrowserUtil.isPhantomJS(capabilities)
+                || BrowserUtil.isFirefox(capabilities));
     }
 
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
index 7ff8291494..7bf5a57b7b 100644
--- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,8 +28,8 @@ public class ClientRpcClassTest extends MultiBrowserTest {
     public void pauseDisplayed() {
         openTestURL();
 
-        WebElement element = getDriver().findElement(
-                By.id(ClientRpcClass.TEST_COMPONENT_ID));
+        WebElement element = getDriver()
+                .findElement(By.id(ClientRpcClass.TEST_COMPONENT_ID));
         Assert.assertEquals("pause", element.getText());
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
index 614eaa063e..ec0739966a 100644
--- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,8 +29,8 @@ import com.vaadin.tests.widgetset.client.csrf.CsrfButtonConnector;
 
 public abstract class AbstractCsrfTokenUITest extends MultiBrowserTest {
 
-    static final Logger LOGGER = Logger.getLogger(AbstractCsrfTokenUITest.class
-            .getName());
+    static final Logger LOGGER = Logger
+            .getLogger(AbstractCsrfTokenUITest.class.getName());
 
     @Test
     public void testTokens() {
diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
index 504425fead..37b26c4833 100644
--- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,7 +19,7 @@ import com.vaadin.shared.ApplicationConstants;
 
 /**
  * Test the CSRF Token issue.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
index 1d51f1c372..a6072c6919 100644
--- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,7 +17,7 @@ package com.vaadin.tests.widgetset.server.csrf.ui;
 
 /**
  * Test the CSRF Token issue.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -34,8 +34,7 @@ public class CsrfTokenEnabledTest extends AbstractCsrfTokenUITest {
                 // No token sent yet to the server.
                 && isUndefined(tokenGroup1.tokenSentToServer)
                 // Token is sent to the server.
-                && tokenGroup2.clientToken
-                        .equals(tokenGroup2.tokenSentToServer)
+                && tokenGroup2.clientToken.equals(tokenGroup2.tokenSentToServer)
                 // And no more token received from the server.
                 && isUndefined(tokenGroup2.tokenReceivedFromServer);
     }