Reformat project

18 files changed, 44 insertions, 17 deletions

diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index 4e27dbb158..fb345d30ec 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -232,8 +232,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     @Override
     public void setComponentAlignment(Component childComponent,
             Alignment alignment) {
-        ChildComponentData childData = getState().childData.get(
-                childComponent);
+        ChildComponentData childData = getState().childData.get(childComponent);
         if (childData != null) {
             // Alignments are bit masks
             childData.alignmentBitmask = alignment.getBitMask();
@@ -252,8 +251,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      */
     @Override
     public Alignment getComponentAlignment(Component childComponent) {
-        ChildComponentData childData = getState().childData.get(
-                childComponent);
+        ChildComponentData childData = getState().childData.get(childComponent);
         if (childData == null) {
             throw new IllegalArgumentException(
                     "The given component is not a child of this layout");
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index 2f420b9286..1e9db0a264 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -1493,6 +1493,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(Container.PropertySetChangeListener listener) {
         addPropertySetChangeListener(listener);
@@ -1518,6 +1519,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(Container.PropertySetChangeListener listener) {
         removePropertySetChangeListener(listener);
@@ -1541,6 +1543,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(Container.ItemSetChangeListener listener) {
         addItemSetChangeListener(listener);
@@ -1566,6 +1569,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(Container.ItemSetChangeListener listener) {
         removeItemSetChangeListener(listener);
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index 2555aac339..b16d0ee3d0 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -701,6 +701,7 @@ public class ComboBox extends AbstractSelect implements
         return filteringMode;
     }
 
+    @Override
     public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
@@ -709,6 +710,7 @@ public class ComboBox extends AbstractSelect implements
     /**
      * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(BlurListener listener) {
         addBlurListener(listener);
@@ -723,6 +725,7 @@ public class ComboBox extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(BlurListener listener) {
         removeBlurListener(listener);
@@ -738,6 +741,7 @@ public class ComboBox extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(FocusListener listener) {
         addFocusListener(listener);
@@ -752,6 +756,7 @@ public class ComboBox extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(FocusListener listener) {
         removeFocusListener(listener);
diff --git a/server/src/com/vaadin/ui/CustomField.java b/server/src/com/vaadin/ui/CustomField.java
index 7bb6e66cf9..75182f37bd 100644
--- a/server/src/com/vaadin/ui/CustomField.java
+++ b/server/src/com/vaadin/ui/CustomField.java
@@ -230,6 +230,7 @@ public abstract class CustomField<T> extends AbstractField<T> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(ComponentAttachListener listener) {
         addComponentAttachListener(listener);
@@ -245,6 +246,7 @@ public abstract class CustomField<T> extends AbstractField<T> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(ComponentAttachListener listener) {
         removeComponentAttachListener(listener);
@@ -259,6 +261,7 @@ public abstract class CustomField<T> extends AbstractField<T> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(ComponentDetachListener listener) {
         addComponentDetachListener(listener);
@@ -274,6 +277,7 @@ public abstract class CustomField<T> extends AbstractField<T> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(ComponentDetachListener listener) {
         removeComponentDetachListener(listener);
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 712034a562..f54959fb0a 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -36,9 +36,9 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.datefield.DateFieldConstants;
 
 /**
@@ -750,6 +750,7 @@ public class DateField extends AbstractField<Date> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(FocusListener listener) {
         addFocusListener(listener);
@@ -764,6 +765,7 @@ public class DateField extends AbstractField<Date> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(FocusListener listener) {
         removeFocusListener(listener);
@@ -778,6 +780,7 @@ public class DateField extends AbstractField<Date> implements
     /**
      * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(BlurListener listener) {
         addBlurListener(listener);
@@ -792,6 +795,7 @@ public class DateField extends AbstractField<Date> implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(BlurListener listener) {
         removeBlurListener(listener);
diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java
index d3f3e23448..ca4807ff5d 100644
--- a/server/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -29,10 +29,10 @@ import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.event.dd.TargetDetailsImpl;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.StreamVariable;
-import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.HorizontalDropLocation;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index b3afb52249..3bcd7a26a0 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -22,10 +22,10 @@ import java.util.Map;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
-import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.embedded.EmbeddedConstants;
diff --git a/server/src/com/vaadin/ui/Flash.java b/server/src/com/vaadin/ui/Flash.java
index d39f34634e..430018289a 100644
--- a/server/src/com/vaadin/ui/Flash.java
+++ b/server/src/com/vaadin/ui/Flash.java
@@ -34,8 +34,7 @@ public class Flash extends AbstractEmbedded {
      */
     public void setCodebase(String codebase) {
         if (codebase != getState().codebase
-                || (codebase != null && !codebase.equals(getState()
-.codebase))) {
+                || (codebase != null && !codebase.equals(getState().codebase))) {
             getState().codebase = codebase;
             requestRepaint();
         }
@@ -53,8 +52,7 @@ public class Flash extends AbstractEmbedded {
      */
     public void setCodetype(String codetype) {
         if (codetype != getState().codetype
-                || (codetype != null && !codetype.equals(getState()
-.codetype))) {
+                || (codetype != null && !codetype.equals(getState().codetype))) {
             getState().codetype = codetype;
             requestRepaint();
         }
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 53b618a87f..86cbdb3253 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -357,6 +357,7 @@ public class Label extends AbstractComponent implements Property<String>,
      * @deprecated Since 7.0, replaced by
      *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(Property.ValueChangeListener listener) {
         addValueChangeListener(listener);
@@ -379,6 +380,7 @@ public class Label extends AbstractComponent implements Property<String>,
      * @deprecated Since 7.0, replaced by
      *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(Property.ValueChangeListener listener) {
         removeValueChangeListener(listener);
diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java
index d948ef813a..a254f62fc8 100644
--- a/server/src/com/vaadin/ui/MenuBar.java
+++ b/server/src/com/vaadin/ui/MenuBar.java
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
-import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
 
 /**
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java
index 983a01381d..8a9e7f101d 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/com/vaadin/ui/OptionGroup.java
@@ -97,6 +97,7 @@ public class OptionGroup extends AbstractSelect implements
     /**
      * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(BlurListener listener) {
         addBlurListener(listener);
@@ -111,6 +112,7 @@ public class OptionGroup extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(BlurListener listener) {
         removeBlurListener(listener);
@@ -126,6 +128,7 @@ public class OptionGroup extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(FocusListener listener) {
         addFocusListener(listener);
@@ -141,6 +144,7 @@ public class OptionGroup extends AbstractSelect implements
      * @deprecated Since 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(FocusListener listener) {
         removeFocusListener(listener);
diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java
index 7558ff0e43..fa51197a8b 100644
--- a/server/src/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/com/vaadin/ui/ProgressIndicator.java
@@ -20,9 +20,9 @@ import java.util.Map;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.server.LegacyComponent;
 
 /**
  * <code>ProgressIndicator</code> is component that shows user state of a
diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java
index 261701b835..e687c68815 100644
--- a/server/src/com/vaadin/ui/RichTextArea.java
+++ b/server/src/com/vaadin/ui/RichTextArea.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Map;
 
 import com.vaadin.data.Property;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.server.LegacyComponent;
 
 /**
  * A simple RichTextArea to edit HTML format text.
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index 291aea3bd6..1293966e58 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -1238,6 +1238,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     /**
      * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(BlurListener listener) {
         addBlurListener(listener);
@@ -1252,6 +1253,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      * @deprecated Since 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(BlurListener listener) {
         removeBlurListener(listener);
@@ -1267,6 +1269,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      * @deprecated Since 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(FocusListener listener) {
         addFocusListener(listener);
@@ -1281,6 +1284,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      * @deprecated Since 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(FocusListener listener) {
         removeFocusListener(listener);
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index e0469f6522..989e6adba8 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -4626,6 +4626,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @deprecated Since 7.0, replaced by
      *             {@link #addItemClickListener(ItemClickListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(ItemClickListener listener) {
         addItemClickListener(listener);
@@ -4641,6 +4642,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @deprecated Since 7.0, replaced by
      *             {@link #removeItemClickListener(ItemClickListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(ItemClickListener listener) {
         removeItemClickListener(listener);
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 306d1f18ba..44a1208cf8 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -1205,6 +1205,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @deprecated Since 7.0, replaced by
      *             {@link #addItemClickListener(ItemClickListener)}
      **/
+    @Override
     @Deprecated
     public void addListener(ItemClickListener listener) {
         addItemClickListener(listener);
@@ -1220,6 +1221,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @deprecated Since 7.0, replaced by
      *             {@link #removeItemClickListener(ItemClickListener)}
      **/
+    @Override
     @Deprecated
     public void removeListener(ItemClickListener listener) {
         removeItemClickListener(listener);
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 1c1fcf5492..e0f984de0d 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -956,8 +956,8 @@ public abstract class UI extends AbstractComponentContainer implements
             throw new IllegalStateException("UI id has already been defined");
         }
         this.uiId = uiId;
-        theme = getSession().getUiProvider(request, getClass())
-                .getThemeForUI(request, getClass());
+        theme = getSession().getUiProvider(request, getClass()).getThemeForUI(
+                request, getClass());
 
         getPage().init(request);
 
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java
index 2323b22e17..624f6a3f91 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/com/vaadin/ui/Upload.java
@@ -24,11 +24,11 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.NoInputStreamException;
 import com.vaadin.server.NoOutputStreamException;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.server.LegacyComponent;
 import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 
 /**