Disable automatic removal of trailing whitespace and reformatted using Luna

Automatic removal of trailing whitespaces in Eclipse does not work even
in a nearly consistent way across platforms, versions or even on the same
maching within the same workspaces. Saving the same file multiple times
even alternates between adding and removing a whitespace on empty block
comment lines when saving.

Change-Id: I0efd307fd48869ea688eb79aa77c9ba38de5a4a6

38 files changed, 81 insertions, 69 deletions

diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 095a6ca1ed..3717876356 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -17,10 +17,12 @@ sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -36,7 +38,8 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=false
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
@@ -49,10 +52,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=true
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 5fcb2070ec..b569c0b17c 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -809,7 +809,8 @@ public class ApplicationConnection implements HasHandlers {
         startRequest();
 
         JSONObject payload = new JSONObject();
-        if (!getCsrfToken().equals(ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE)) {
+        if (!getCsrfToken().equals(
+                ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE)) {
             payload.put(ApplicationConstants.CSRF_TOKEN, new JSONString(
                     getCsrfToken()));
         }
diff --git a/client/src/com/vaadin/client/communication/Heartbeat.java b/client/src/com/vaadin/client/communication/Heartbeat.java
index 1ff0825f0e..b9493d4520 100644
--- a/client/src/com/vaadin/client/communication/Heartbeat.java
+++ b/client/src/com/vaadin/client/communication/Heartbeat.java
@@ -124,7 +124,9 @@ public class Heartbeat {
 
             @Override
             public void onError(Request request, Throwable exception) {
-                getLogger().severe("Exception sending heartbeat: " + exception.getMessage());
+                getLogger().severe(
+                        "Exception sending heartbeat: "
+                                + exception.getMessage());
                 // Notify network observers about response status
                 connection.fireEvent(new ConnectionStatusEvent(0));
                 // Don't break the loop
diff --git a/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java b/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java
index 6eb732bf46..15a156a815 100644
--- a/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java
+++ b/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java
@@ -87,8 +87,7 @@ public interface LocatorStrategy {
      * @return The DOM element identified by {@code path} or null if the element
      *         could not be located.
      */
-    Element getElementByPathStartingAt(String path,
-            Element root);
+    Element getElementByPathStartingAt(String path, Element root);
 
     /**
      * Locates all elements that match a String locator (path) which identifies
@@ -119,6 +118,5 @@ public interface LocatorStrategy {
      *         found.
      */
 
-    List<Element> getElementsByPathStartingAt(
-            String path, Element root);
+    List<Element> getElementsByPathStartingAt(String path, Element root);
 }
diff --git a/client/src/com/vaadin/client/debug/internal/HierarchySection.java b/client/src/com/vaadin/client/debug/internal/HierarchySection.java
index 1eacf286e8..404ac430df 100644
--- a/client/src/com/vaadin/client/debug/internal/HierarchySection.java
+++ b/client/src/com/vaadin/client/debug/internal/HierarchySection.java
@@ -108,16 +108,14 @@ public class HierarchySection implements Section {
 
         hierarchyPanel.addListener(new SelectConnectorListener() {
             @Override
-            public void select(ServerConnector connector,
-                    Element element) {
+            public void select(ServerConnector connector, Element element) {
                 printState(connector, true);
             }
         });
 
         analyzeLayoutsPanel.addListener(new SelectConnectorListener() {
             @Override
-            public void select(ServerConnector connector,
-                    Element element) {
+            public void select(ServerConnector connector, Element element) {
                 printState(connector, true);
             }
         });
diff --git a/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java b/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java
index c3652c78e8..46c8070b30 100644
--- a/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java
+++ b/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java
@@ -33,6 +33,5 @@ public interface SelectConnectorListener {
      * @param element
      *            selected element of the connector or null if unknown
      */
-    public void select(ServerConnector connector,
-            Element element);
+    public void select(ServerConnector connector, Element element);
 }
diff --git a/client/src/com/vaadin/client/ui/VOverlay.java b/client/src/com/vaadin/client/ui/VOverlay.java
index d2c3ee2dae..c62e2c9824 100644
--- a/client/src/com/vaadin/client/ui/VOverlay.java
+++ b/client/src/com/vaadin/client/ui/VOverlay.java
@@ -444,7 +444,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
      * A "thread local" of sorts, set temporarily so that VOverlayImpl knows
      * which VOverlay is using it, so that it can be attached to the correct
      * overlay container.
-     *
+     * 
      * TODO this is a strange pattern that we should get rid of when possible.
      */
     protected static VOverlay current;
@@ -971,7 +971,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see com.google.gwt.user.client.ui.PopupPanel#hide()
      */
     @Override
@@ -981,7 +981,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see com.google.gwt.user.client.ui.PopupPanel#hide(boolean)
      */
     @Override
diff --git a/client/src/com/vaadin/client/ui/dd/DDUtil.java b/client/src/com/vaadin/client/ui/dd/DDUtil.java
index dfdafe1352..77de1f9b1a 100644
--- a/client/src/com/vaadin/client/ui/dd/DDUtil.java
+++ b/client/src/com/vaadin/client/ui/dd/DDUtil.java
@@ -58,8 +58,7 @@ public class DDUtil {
     }
 
     public static HorizontalDropLocation getHorizontalDropLocation(
-            Element element, NativeEvent event,
-            double leftRightRatio) {
+            Element element, NativeEvent event, double leftRightRatio) {
         int clientX = Util.getTouchOrMouseClientX(event);
 
         // Event coordinates are relative to the viewport, element absolute
diff --git a/client/src/com/vaadin/client/ui/dd/DragImageModifier.java b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
index f08c082a70..45ab5d9bb3 100644
--- a/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
+++ b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
@@ -20,7 +20,8 @@ import com.google.gwt.dom.client.Element;
 /**
  * Interface implemented by widgets if the drag image used for drag'n'drop
  * requires additional initialization/configuration. The method
- * {@link #modifyDragImage(Element)} is called for each element in the automatically generated drag image.
+ * {@link #modifyDragImage(Element)} is called for each element in the
+ * automatically generated drag image.
  * 
  * @since 7.2
  * @author Vaadin Ltd
diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index d58ba548e3..3acea97c0f 100644
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -636,7 +636,8 @@ public class Page implements Serializable {
     }
 
     public void init(VaadinRequest request) {
-        // NOTE: UI.refresh makes assumptions about the semantics of this method.
+        // NOTE: UI.refresh makes assumptions about the semantics of this
+        // method.
         // It should be kept in sync if this method is changed.
 
         // Extract special parameter sent by vaadinBootstrap.js
diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java
index 2ab8c52dad..f93cb8e070 100644
--- a/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/com/vaadin/server/VaadinSession.java
@@ -114,7 +114,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
              * deadlocks unless implemented very carefully. get(long, TimeUnit)
              * does not have the same detection since a sensible timeout should
              * avoid completely locking up the application.
-             *
+             * 
              * Even though no deadlock could occur after the runnable has been
              * run, the check is always done as the deterministic behavior makes
              * it easier to detect potential problems.
diff --git a/server/src/com/vaadin/server/communication/ClientRpcWriter.java b/server/src/com/vaadin/server/communication/ClientRpcWriter.java
index 181bfbb882..1090fdbab9 100644
--- a/server/src/com/vaadin/server/communication/ClientRpcWriter.java
+++ b/server/src/com/vaadin/server/communication/ClientRpcWriter.java
@@ -81,9 +81,9 @@ public class ClientRpcWriter implements Serializable {
                     // + parameterType.getName());
                     // }
                     // }
-                    EncodeResult encodeResult = JsonCodec.encode(invocation.getParameters()[i],
-                            referenceParameter, parameterType,
-                            ui.getConnectorTracker());
+                    EncodeResult encodeResult = JsonCodec.encode(
+                            invocation.getParameters()[i], referenceParameter,
+                            parameterType, ui.getConnectorTracker());
                     paramJson.put(encodeResult.getEncodedValue());
                 }
                 invocationJson.put(paramJson);
diff --git a/server/src/com/vaadin/ui/NotificationConfiguration.java b/server/src/com/vaadin/ui/NotificationConfiguration.java
index faab329f88..925c888a51 100644
--- a/server/src/com/vaadin/ui/NotificationConfiguration.java
+++ b/server/src/com/vaadin/ui/NotificationConfiguration.java
@@ -173,7 +173,8 @@ class NotificationConfigurationImpl implements NotificationConfiguration {
         NotificationTypeConfiguration styleSetup = getTypeConf(type);
         if (styleSetup == null) {
             styleSetup = new NotificationTypeConfiguration();
-            ui.getState().notificationConfigurations.put(type.getStyle(), styleSetup);
+            ui.getState().notificationConfigurations.put(type.getStyle(),
+                    styleSetup);
         }
 
         return styleSetup;
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index 2fdb3b40a7..8b13ecf1a4 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -317,7 +317,8 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      *            the position at where the the tab should be added.
      * @return the created {@link Tab}
      */
-    public Tab addTab(Component tabComponent, String caption, Resource icon, int position) {
+    public Tab addTab(Component tabComponent, String caption, Resource icon,
+            int position) {
         if (tabComponent == null) {
             return null;
         } else if (tabs.containsKey(tabComponent)) {
@@ -1070,8 +1071,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
 
         @Override
         public Resource getIcon() {
-            return getResource(ComponentConstants.ICON_RESOURCE
-                    + tabState.key);
+            return getResource(ComponentConstants.ICON_RESOURCE + tabState.key);
         }
 
         @Override
@@ -1211,8 +1211,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
 
         @Override
         public void setIcon(Resource icon, String iconAltText) {
-            setResource(ComponentConstants.ICON_RESOURCE + tabState.key,
-                    icon);
+            setResource(ComponentConstants.ICON_RESOURCE + tabState.key, icon);
             tabState.iconAltText = iconAltText;
         }
     }
diff --git a/server/src/com/vaadin/util/CurrentInstance.java b/server/src/com/vaadin/util/CurrentInstance.java
index 6f2c0a2eca..d11fa175ac 100644
--- a/server/src/com/vaadin/util/CurrentInstance.java
+++ b/server/src/com/vaadin/util/CurrentInstance.java
@@ -112,7 +112,7 @@ public class CurrentInstance implements Serializable {
                  * ThreadLocal should only outlive the referenced object on
                  * threads that are not doing anything related to Vaadin, which
                  * should thus never invoke CurrentInstance.get().
-                 *
+                 * 
                  * At this point, there might also be other values that have
                  * been collected, so we'll scan the entire map and remove stale
                  * CurrentInstance objects. Using a ReferenceQueue could make
@@ -250,7 +250,7 @@ public class CurrentInstance implements Serializable {
                  * CurrentInstance. Without this a reference to an already
                  * collected instance may be left in the CurrentInstance when it
                  * really should be restored to null.
-                 *
+                 * 
                  * One example case that this fixes:
                  * VaadinService.runPendingAccessTasks() clears all current
                  * instances and then sets everything but the UI. This makes
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java b/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
index 6e40c57718..bf2b809529 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
@@ -42,7 +42,8 @@ public class VaadinPortletRequestTests {
 
     @Test
     public void defaultValueForPortletPreferenceIsNull() {
-        when(preferences.getValue(anyString(), isNull(String.class))).thenReturn(null);
+        when(preferences.getValue(anyString(), isNull(String.class)))
+                .thenReturn(null);
 
         String value = sut.getPortletPreference("foo");
 
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
index ce99c4a3d5..8500fbe18d 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
@@ -43,7 +43,8 @@ public class PrimaryStyleTest extends MultiBrowserTest {
         $(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/com/vaadin/tests/components/button/ButtonToggleIcons.java b/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java
index 25dd469903..cee71fdf4e 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java
@@ -35,4 +35,4 @@ public class ButtonToggleIcons extends UI {
         layout.addComponent(new Button("Toggle icon", iconToggleListener));

         layout.addComponent(new NativeButton("Toggle icon", iconToggleListener));

     }

-}
+}

diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
index 9d6640eb6d..69a919497b 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
@@ -40,7 +40,7 @@ public class CheckBoxRpcCountTest extends MultiBrowserTest {
 
         // Click on the actual checkbox.
         inputElem.click();
-        //Have to use waitUntil to make this test more stable.
+        // Have to use waitUntil to make this test more stable.
         waitUntilLabelIsUpdated(countElem, "1 RPC call(s) made.");
 
         // Click on the checkbox label.
@@ -52,7 +52,8 @@ public class CheckBoxRpcCountTest extends MultiBrowserTest {
         waitUntilLabelIsUpdated(countElem, "3 RPC call(s) made.");
     }
 
-    private void waitUntilLabelIsUpdated(final WebElement countElem, final String expectedText) {
+    private void waitUntilLabelIsUpdated(final WebElement countElem,
+            final String expectedText) {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
index 96151022ff..cbd83c5734 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
@@ -40,13 +40,16 @@ public class ComboBoxInputPromptTest extends MultiBrowserTest {
         ComboBoxElement disabledComboBox = getComboBoxWithCaption("Disabled");
         ComboBoxElement readOnlyComboBox = getComboBoxWithCaption("Read-only");
 
-        assertThat(getInputPromptValue(normalComboBox), is("Normal input prompt"));
+        assertThat(getInputPromptValue(normalComboBox),
+                is("Normal input prompt"));
         assertThat(getInputPromptValue(disabledComboBox), isEmptyString());
         assertThat(getInputPromptValue(readOnlyComboBox), isEmptyString());
 
         toggleDisabledAndReadonly();
-        assertThat(getInputPromptValue(disabledComboBox), is("Disabled input prompt"));
-        assertThat(getInputPromptValue(readOnlyComboBox), is("Read-only input prompt"));
+        assertThat(getInputPromptValue(disabledComboBox),
+                is("Disabled input prompt"));
+        assertThat(getInputPromptValue(readOnlyComboBox),
+                is("Read-only input prompt"));
 
         toggleDisabledAndReadonly();
         assertThat(getInputPromptValue(disabledComboBox), isEmptyString());
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
index fa6f5a3a93..bc1fe39fe5 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
@@ -52,8 +52,7 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest {
         // provide any way to access the popup and send keys to it.
         // Ticket #13756
 
-        return driver.findElement(By
-                .className("v-filterselect-input"));
+        return driver.findElement(By.className("v-filterselect-input"));
     }
 
     private void openPopup() {
@@ -70,7 +69,7 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest {
             dropDownComboBox.sendKeys(Keys.DOWN);
         }
 
-        assertThat(getSelectedItemText(), is("item " + PAGESIZE)); //item 10
+        assertThat(getSelectedItemText(), is("item " + PAGESIZE)); // item 10
     }
 
     private String getSelectedItemText() {
@@ -92,7 +91,8 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest {
         waitUntilNextPageIsVisible();
         dropDownComboBox.sendKeys(Keys.UP);
 
-        assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); //item 9
+        assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); // item
+                                                                         // 9
     }
 
     private void waitUntilNextPageIsVisible() {
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
index 289a5988ee..cfab13e205 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.datefield;
 
-
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.DateFieldElement;
@@ -14,7 +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,12 +29,15 @@ 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() {
-        //waiting for openPopup() in TB4 beta1: http://dev.vaadin.com/ticket/13766
-        $(DateFieldElement.class).first().findElement(By.tagName("button")).click();
+        // waiting for openPopup() in TB4 beta1:
+        // http://dev.vaadin.com/ticket/13766
+        $(DateFieldElement.class).first().findElement(By.tagName("button"))
+                .click();
     }
 
     private void toggleReadOnly() {
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
index eb4888ea1a..95152e1416 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
@@ -9,7 +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/com/vaadin/tests/components/menubar/MenuTooltipTest.java b/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java
index bb8f87daaa..24025b9f39 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java
@@ -47,7 +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());
 
         Mouse mouse = ((HasInputDevices) getDriver()).getMouse();
 
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java
index ecf704835f..7a12168af4 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java
@@ -102,8 +102,8 @@ public class NotificationsWaiAria extends TestBase {
                     .getNotificationConfiguration();
             notificationConf.setAssistivePrefix(typeValue, prefix.getValue());
             notificationConf.setAssistivePostfix(typeValue, postfix.getValue());
-            notificationConf
-                    .setAssistiveRole(typeValue, (NotificationRole) role.getValue());
+            notificationConf.setAssistiveRole(typeValue,
+                    (NotificationRole) role.getValue());
 
             n.show(Page.getCurrent());
         }
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
index e067ada818..8d74e3a259 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
@@ -43,12 +43,13 @@ public class WindowMoveListenerTest extends MultiBrowserTest {
         waitUntilWindowHasReseted(window, winPos);
     }
 
-    private void waitUntilWindowHasReseted(final WebElement window, final Point winPos) {
+    private void waitUntilWindowHasReseted(final WebElement window,
+            final Point winPos) {
         waitUntil(new ExpectedCondition<Boolean>() {
             @Override
             public Boolean apply(WebDriver input) {
-                return winPos.x == window.getLocation().x &&
-                       winPos.y == window.getLocation().y;
+                return winPos.x == window.getLocation().x
+                        && winPos.y == window.getLocation().y;
             }
         }, 5);
     }
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
index 52ea5f4f8e..ba3d0f06f1 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
@@ -17,7 +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/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index 2771af01c6..84254b4935 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/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)
      */
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
index 1c0e992a86..c4787045fc 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
@@ -19,7 +19,6 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove;
 import com.vaadin.ui.HorizontalLayout;
 
-
 public class HAddReplaceMove extends BaseAddReplaceMove {
 
     /**
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
index bb974a8c68..3088a00c39 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
@@ -19,7 +19,6 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.tests.layouts.layouttester.BaseCaption;
 import com.vaadin.ui.HorizontalLayout;
 
-
 public class HCaption extends BaseCaption {
 
     /**
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
index 57bb134be7..152e3f0b86 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout;
 
 import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest;
 
-
 /**
  *
  * @since
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
index e3e5914e3a..7f803781fb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout;
 
 import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest;
 
-
 /**
  *
  * @since
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
index 372eb9cba4..519f8113f8 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout;
 
 import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest;
 
-
 /**
  *
  * @since
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
index f2207ccba7..a04d569e05 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
@@ -37,7 +37,8 @@ public class PushConfigurationLongPollingTest extends PushConfigurationTest {
 
         clearDebugMessages();
         new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
-        waitForDebugMessage("Push connection established using long-polling", 10);
+        waitForDebugMessage("Push connection established using long-polling",
+                10);
         waitForServerCounterToUpdate();
     }
 
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 8a4593d70d..28ef30a04a 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.push;
 
-
 public class ReconnectLongPollingTest extends ReconnectTest {
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
index fe63764e78..0a0275c4d0 100755
--- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.push;
 
-
 public class ReconnectStreamingTest extends ReconnectTest {
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 8dd10216d2..c4573fb9b8 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -166,7 +166,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     protected WebElement getTooltipElement() {
-        return getDriver().findElement(com.vaadin.testbench.By.className("v-tooltip-text"));
+        return getDriver().findElement(
+                com.vaadin.testbench.By.className("v-tooltip-text"));
     }
 
     protected Coordinates getCoordinates(TestBenchElement element) {
diff --git a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java b/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
index b9fc788008..af7a303629 100644
--- a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
+++ b/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
@@ -69,7 +69,6 @@ public class AdjacentElementsWithTooltipsTest extends MultiBrowserTest {
     }
 
     private ButtonElement getButton(String caption) {
-        return $(ButtonElement.class)
-                    .caption(caption).first();
+        return $(ButtonElement.class).caption(caption).first();
     }
 }