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

7 files changed, 16 insertions, 14 deletions

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");