Global code cleanup

Change-Id: I14f46e6aa4f9cbdd9037f1c4ad1ac38fe7cbda86

12 files changed, 14 insertions, 17 deletions

diff --git a/server/src/com/vaadin/event/ShortcutAction.java b/server/src/com/vaadin/event/ShortcutAction.java
index 9d13d41b9f..29238dfca9 100644
--- a/server/src/com/vaadin/event/ShortcutAction.java
+++ b/server/src/com/vaadin/event/ShortcutAction.java
@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.vaadin.client.ui.ShortcutActionTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 31920b5df6..50150c5d5c 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -1328,7 +1328,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
      */
     private void writePerformanceData(final PrintWriter outWriter) {
         outWriter.write(String.format(", \"timings\":[%d, %d]",
-                session.getCumulativeRequestDuration(), session.getLastRequestDuration()));
+                session.getCumulativeRequestDuration(),
+                session.getLastRequestDuration()));
     }
 
     private void legacyPaint(PaintTarget paintTarget,
@@ -2637,8 +2638,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
         String pathInfo = request.getPathInfo();
         // + 2 to also remove beginning and ending slashes
         String fileName = pathInfo
-                .substring(ApplicationConstants.PUBLISHED_FILE_PATH
-                        .length() + 2);
+                .substring(ApplicationConstants.PUBLISHED_FILE_PATH.length() + 2);
 
         final String mimetype = response.getService().getMimeType(fileName);
 
diff --git a/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java b/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java
index 7111a8bbbb..2d1ff81311 100644
--- a/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java
+++ b/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.server;
 
-
 /**
  * System messages provider using the built-in default system messages. This
  * singleton is accessed using {@link #get()}.
diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index 00fdccdeb7..be5fd1c287 100644
--- a/server/src/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/server/ServletPortletHelper.java
@@ -101,8 +101,8 @@ class ServletPortletHelper implements Serializable {
     }
 
     public static boolean isPublishedFileRequest(VaadinRequest request) {
-        return hasPathPrefix(request,
-                ApplicationConstants.PUBLISHED_FILE_PATH + "/");
+        return hasPathPrefix(request, ApplicationConstants.PUBLISHED_FILE_PATH
+                + "/");
     }
 
     public static boolean isUIDLRequest(VaadinRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index ac2d81b202..11e341a16f 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -428,8 +428,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
                             .getCommunicationManager();
 
                     if (requestType == RequestType.PUBLISHED_FILE) {
-                        communicationManager.servePublishedFile(
-                                vaadinRequest, vaadinResponse);
+                        communicationManager.servePublishedFile(vaadinRequest,
+                                vaadinResponse);
                         return;
                     } else if (requestType == RequestType.HEARTBEAT) {
                         communicationManager.handleHeartbeatRequest(
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 0902924e4b..2ce3e25b2a 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -33,8 +33,8 @@ import com.vaadin.server.ComponentSizeValidator;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.util.ReflectTools;
 
diff --git a/server/src/com/vaadin/ui/LegacyComponent.java b/server/src/com/vaadin/ui/LegacyComponent.java
index 5538c3ac5e..32f52eb3eb 100644
--- a/server/src/com/vaadin/ui/LegacyComponent.java
+++ b/server/src/com/vaadin/ui/LegacyComponent.java
@@ -17,7 +17,6 @@ package com.vaadin.ui;
 
 import java.util.EventListener;
 
-import com.vaadin.server.ClientConnector;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.VariableOwner;
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index f6101be916..a5e8f5e508 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -37,8 +37,8 @@ import com.vaadin.server.PaintTarget;
 import com.vaadin.server.UIProvider;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
-import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinServlet;
+import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.ui.UIConstants;
diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index 5f9269c6e3..c7330001d3 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
-
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
 
     VaadinServlet servlet;
diff --git a/server/tests/src/com/vaadin/tests/VaadinClasses.java b/server/tests/src/com/vaadin/tests/VaadinClasses.java
index e88786432c..b5933bbd10 100644
--- a/server/tests/src/com/vaadin/tests/VaadinClasses.java
+++ b/server/tests/src/com/vaadin/tests/VaadinClasses.java
@@ -144,8 +144,7 @@ public class VaadinClasses {
             String basePackage, String[] ignoredPackages) throws IOException {
         List<Class<? extends T>> classes = new ArrayList<Class<? extends T>>();
         String basePackageDirName = "/" + basePackage.replace('.', '/');
-        URL location = VaadinSession.class
-                .getResource(basePackageDirName);
+        URL location = VaadinSession.class.getResource(basePackageDirName);
         if (location.getProtocol().equals("file")) {
             try {
                 File f = new File(location.toURI());
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index 577275b4d9..cd9b6c6631 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -18,8 +18,7 @@ public class RemoveListenersOnDetach {
     int numReadOnlyChanges = 0;
 
     AbstractField field = new AbstractField() {
-        final private VaadinSession application = new VaadinSession(
-                null);
+        final private VaadinSession application = new VaadinSession(null);
         private UI uI = new UI() {
 
             @Override
diff --git a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index c680e59210..9ac3dfa4ea 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
@@ -57,7 +57,8 @@ public class UriFragmentManagerTest extends TestCase {
         navigator.navigateTo("test");
         control.replay();
 
-        UriFragmentChangedEvent event = new UriFragmentChangedEvent(page, "oldtest");
+        UriFragmentChangedEvent event = new UriFragmentChangedEvent(page,
+                "oldtest");
         manager.uriFragmentChanged(event);
     }
 }