Reformat project

20 files changed, 22 insertions, 27 deletions

diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index ce3ac43812..42b1f06d20 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -596,7 +596,7 @@ public class ComponentLocator {
 
                     Widget child = iterator.next();
                     String simpleName2 = Util.getSimpleName(child);
-                    
+
                     if (widgetClassName.equals(simpleName2)) {
                         if (widgetPosition == 0) {
                             w = child;
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index f832dbfda2..5ec5939c7b 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -534,7 +534,6 @@ public class Util {
 
     }
 
-
     @Deprecated
     public static boolean isCached(UIDL uidl) {
         return uidl.getBooleanAttribute("cached");
diff --git a/client/src/com/vaadin/client/VDebugConsole.java b/client/src/com/vaadin/client/VDebugConsole.java
index 51504ae4e1..331073cd90 100644
--- a/client/src/com/vaadin/client/VDebugConsole.java
+++ b/client/src/com/vaadin/client/VDebugConsole.java
@@ -924,8 +924,8 @@ public class VDebugConsole extends VOverlay implements Console {
     protected void dumpConnectorInfo(ApplicationConnection a) {
         UIConnector root = a.getRootConnector();
         log("================");
-        log("Connector hierarchy for Root: " + root.getState().caption
-                + " (" + root.getConnectorId() + ")");
+        log("Connector hierarchy for Root: " + root.getState().caption + " ("
+                + root.getConnectorId() + ")");
         Set<ServerConnector> connectorsInHierarchy = new HashSet<ServerConnector>();
         SimpleTree rootHierachy = dumpConnectorHierarchy(root, "",
                 connectorsInHierarchy);
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index 3a9dcec347..b133b0e83d 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -47,7 +47,7 @@ import com.vaadin.shared.ui.TabIndexState;
 import com.vaadin.ui.themes.BaseTheme;
 
 public abstract class AbstractComponentConnector extends AbstractConnector
-implements ComponentConnector {
+        implements ComponentConnector {
 
     private Widget widget;
 
@@ -93,7 +93,7 @@ implements ComponentConnector {
                     "There is no information about the widget for "
                             + Util.getSimpleName(this)
                             + ". Did you remember to compile the right widgetset?",
-                            e);
+                    e);
         }
     }
 
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
index 59adca1ca8..8a2e63735a 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
@@ -22,9 +22,9 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ComponentContainerConnector;
 import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
 import com.vaadin.client.Util;
 import com.vaadin.client.VConsole;
-import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
 
 public abstract class AbstractComponentContainerConnector extends
         AbstractComponentConnector implements ComponentContainerConnector,
diff --git a/client/src/com/vaadin/client/ui/AbstractConnector.java b/client/src/com/vaadin/client/ui/AbstractConnector.java
index bad374c2f0..d0bba797e2 100644
--- a/client/src/com/vaadin/client/ui/AbstractConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractConnector.java
@@ -46,7 +46,7 @@ import com.vaadin.shared.communication.URLReference;
  * 
  */
 public abstract class AbstractConnector implements ServerConnector,
-StateChangeHandler {
+        StateChangeHandler {
 
     private ApplicationConnection connection;
     private String id;
diff --git a/client/src/com/vaadin/client/ui/FocusableScrollPanel.java b/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
index 99254db4c2..f96be9fcd8 100644
--- a/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
+++ b/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
@@ -22,7 +22,6 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.dom.client.Style.Position;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.HasScrollHandlers;
diff --git a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
index 317836370c..e6c293d217 100644
--- a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
@@ -163,8 +163,7 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
         layout.colExpandRatioArray = uidl.getIntArrayAttribute("colExpand");
         layout.rowExpandRatioArray = uidl.getIntArrayAttribute("rowExpand");
 
-        layout.updateMarginStyleNames(new MarginInfo(getState()
-.marginsBitmask));
+        layout.updateMarginStyleNames(new MarginInfo(getState().marginsBitmask));
 
         layout.updateSpacingStyleName(getState().spacing);
 
diff --git a/client/src/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
index 35a2681590..16e6babfa6 100644
--- a/client/src/com/vaadin/client/ui/panel/PanelConnector.java
+++ b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
@@ -146,8 +146,7 @@ public class PanelConnector extends AbstractComponentContainerConnector
             getWidget().setIconUri(null, client);
         }
 
-        getWidget().setErrorIndicatorVisible(
-null != getState().errorMessage);
+        getWidget().setErrorIndicatorVisible(null != getState().errorMessage);
 
         // We may have actions attached to this panel
         if (uidl.getChildCount() > 0) {
diff --git a/client/src/com/vaadin/client/ui/panel/VPanel.java b/client/src/com/vaadin/client/ui/panel/VPanel.java
index 90951684a7..91fdf74aa7 100644
--- a/client/src/com/vaadin/client/ui/panel/VPanel.java
+++ b/client/src/com/vaadin/client/ui/panel/VPanel.java
@@ -26,8 +26,8 @@ import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.ui.Icon;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
 
 public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
diff --git a/client/src/com/vaadin/client/ui/popupview/VPopupView.java b/client/src/com/vaadin/client/ui/popupview/VPopupView.java
index 20783fe9d9..fd1e9e2dbe 100644
--- a/client/src/com/vaadin/client/ui/popupview/VPopupView.java
+++ b/client/src/com/vaadin/client/ui/popupview/VPopupView.java
@@ -42,8 +42,8 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.VCaptionWrapper;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.VOverlay;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.client.ui.richtextarea.VRichTextArea;
 
 public class VPopupView extends HTML {
diff --git a/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java b/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java
index 785d65ea10..ed5d48aaca 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java
+++ b/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java
@@ -42,8 +42,8 @@ import com.vaadin.client.ConnectorMap;
 import com.vaadin.client.Util;
 import com.vaadin.client.ui.Field;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate;
 
 /**
  * This class implements a basic client side rich text editor component.
diff --git a/client/src/com/vaadin/client/ui/slider/VSlider.java b/client/src/com/vaadin/client/ui/slider/VSlider.java
index 5a694784b8..648201c2b5 100644
--- a/client/src/com/vaadin/client/ui/slider/VSlider.java
+++ b/client/src/com/vaadin/client/ui/slider/VSlider.java
@@ -558,15 +558,18 @@ public class VSlider extends SimpleFocusablePanel implements Field,
         this.resolution = resolution;
     }
 
+    @Override
     public HandlerRegistration addValueChangeHandler(
             ValueChangeHandler<Double> handler) {
         return addHandler(handler, ValueChangeEvent.getType());
     }
 
+    @Override
     public Double getValue() {
         return value;
     }
 
+    @Override
     public void setValue(Double value) {
         if (value < min) {
             value = min;
@@ -613,6 +616,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
         setFeedbackValue(v);
     }
 
+    @Override
     public void setValue(Double value, boolean fireEvents) {
         if (value == null) {
             return;
diff --git a/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java b/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java
index 31bc69ec3f..61e2748257 100644
--- a/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java
@@ -44,8 +44,8 @@ import com.vaadin.client.LayoutManager;
 import com.vaadin.client.Util;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.ui.TouchScrollDelegate;
-import com.vaadin.client.ui.VOverlay;
 import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
 
 public class VAbstractSplitPanel extends ComplexPanel {
diff --git a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
index 50a5465e07..7a4c4cbb93 100644
--- a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.client.ui.splitpanel;
 
-import com.google.gwt.core.client.GWT;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.ui.VerticalSplitPanel;
diff --git a/client/src/com/vaadin/client/ui/ui/VUI.java b/client/src/com/vaadin/client/ui/ui/VUI.java
index 9aa3331577..8d534053ed 100644
--- a/client/src/com/vaadin/client/ui/ui/VUI.java
+++ b/client/src/com/vaadin/client/ui/ui/VUI.java
@@ -39,10 +39,10 @@ import com.vaadin.client.ConnectorMap;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.TouchScrollDelegate;
-import com.vaadin.client.ui.VLazyExecutor;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.VLazyExecutor;
 import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ui.ui.UIConstants;
diff --git a/client/src/com/vaadin/client/ui/window/VWindow.java b/client/src/com/vaadin/client/ui/window/VWindow.java
index 196b28bbd9..264ed57ced 100644
--- a/client/src/com/vaadin/client/ui/window/VWindow.java
+++ b/client/src/com/vaadin/client/ui/window/VWindow.java
@@ -48,9 +48,9 @@ import com.vaadin.client.LayoutManager;
 import com.vaadin.client.Util;
 import com.vaadin.client.ui.FocusableScrollPanel;
 import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 import com.vaadin.client.ui.VLazyExecutor;
 import com.vaadin.client.ui.VOverlay;
-import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 import com.vaadin.client.ui.notification.VNotification;
 import com.vaadin.shared.EventId;
 
diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
index da5970d64d..cb4f1f4068 100644
--- a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
+++ b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
@@ -4,8 +4,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.vaadin.client.ApplicationConnection;
-
 public class ApplicationConnectionTestURLGeneration {
 
     private static final String[] URIS = new String[] {
diff --git a/client/tests/src/com/vaadin/client/DateTimeServiceTest.java b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
index 6852e9ec3f..3f4828678f 100755
--- a/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
+++ b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
@@ -7,8 +7,6 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import com.vaadin.client.DateTimeService;
-
 public class DateTimeServiceTest extends TestCase {
 
     final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
diff --git a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
index 04e8be699b..70c1b130fd 100644
--- a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
+++ b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
@@ -1,9 +1,9 @@
 package com.vaadin.client;
 
-import com.vaadin.shared.VBrowserDetails;
-
 import junit.framework.TestCase;
 
+import com.vaadin.shared.VBrowserDetails;
+
 public class TestVBrowserDetailsUserAgentParser extends TestCase {
 
     private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";