Formatted project

Change-Id: I771ca4edea66ad29a80628ee1a98d1c5ff1679ab

16 files changed, 21 insertions, 28 deletions

diff --git a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
index fbf534a5b5..7c1c734aa0 100644
--- a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
@@ -558,7 +558,7 @@ public class VAbsoluteLayout extends ComplexPanel {
         protected void updateStyleNames() {
             setStyleName(VAbsoluteLayout.this.getStylePrimaryName()
                     + "-wrapper");
-            if(extraStyleNames != null){
+            if (extraStyleNames != null) {
                 for (String stylename : extraStyleNames) {
                     addStyleDependentName(stylename);
                 }
diff --git a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
index 4ce651cde0..c08371af95 100644
--- a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
@@ -218,7 +218,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
             root.appendChild(down);
             root.appendChild(status);
 
-
             DOM.sinkEvents(root, Event.ONMOUSEDOWN | Event.ONMOUSEWHEEL);
             addCloseHandler(this);
         }
diff --git a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index b2a5b49212..6f23d42de9 100644
--- a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
@@ -145,8 +145,7 @@ public class PopupDateFieldConnector extends TextualDateConnector {
         // prefix
         if (!styleName.startsWith("-")) {
             getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
-                    + "-popup-" + styleName,
-                    add);
+                    + "-popup-" + styleName, add);
         } else {
             getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
                     + "-popup" + styleName, add);
diff --git a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
index 2323035e58..a9528cd145 100644
--- a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
+++ b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
@@ -502,7 +502,9 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     "v-first");
             days.getFlexCellFormatter().setStyleName(headerRow,
                     firstWeekdayColumn, "");
-            days.getRowFormatter().addStyleName(headerRow,
+            days.getRowFormatter()
+                    .addStyleName(
+                            headerRow,
                             parent.getStylePrimaryName()
                                     + "-calendarpanel-weeknumbers");
         } else {
diff --git a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
index 2f2c3b3290..39972e7214 100644
--- a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
+++ b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
@@ -56,7 +56,7 @@ public class VDateFieldCalendar extends VDateField {
             }
         });
     }
-    
+
     /**
      * TODO refactor: almost same method as in VPopupCalendar.updateValue
      */
diff --git a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
index e38e6816ad..38d6d513bf 100644
--- a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
@@ -894,7 +894,7 @@ public class VMenuBar extends SimpleFocusablePanel implements
             } else {
                 addStyleDependentName("disabled");
             }
-            
+
             if (selected && isSelectable()) {
                 addStyleDependentName("selected");
                 // needed for IE6 to have a single style name to match for an
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index 9707db610e..ea4048515c 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -90,8 +90,7 @@ public abstract class AbstractOrderedLayoutConnector extends
                         (String[]) null);
             } else {
                 getWidget().setSlotStyleNames(child.getWidget(),
-                        childStyles.toArray(new String[childStyles
-                                .size()]));
+                        childStyles.toArray(new String[childStyles.size()]));
             }
 
             updateSlotListeners(child);
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
index 99fd681d63..0159e491b2 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
@@ -56,7 +56,6 @@ public class VOrderedLayout extends FlowPanel {
 
     private LayoutManager layoutManager;
 
-
     public VOrderedLayout(boolean vertical) {
         this.vertical = vertical;
     }
diff --git a/client/src/com/vaadin/client/ui/slider/VSlider.java b/client/src/com/vaadin/client/ui/slider/VSlider.java
index c7e9d35c83..58db8494f0 100644
--- a/client/src/com/vaadin/client/ui/slider/VSlider.java
+++ b/client/src/com/vaadin/client/ui/slider/VSlider.java
@@ -129,7 +129,6 @@ public class VSlider extends SimpleFocusablePanel implements Field,
         sinkEvents(Event.MOUSEEVENTS | Event.ONMOUSEWHEEL | Event.KEYEVENTS
                 | Event.FOCUSEVENTS | Event.TOUCHEVENTS);
 
-
         feedbackPopup.setWidget(feedback);
     }
 
@@ -183,8 +182,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
             feedbackPopup.setPopupPosition(
                     handle.getAbsoluteLeft() + handle.getOffsetWidth() / 2
                             - feedbackPopup.getOffsetWidth() / 2,
-                    handle.getAbsoluteTop()
-                            - feedbackPopup.getOffsetHeight());
+                    handle.getAbsoluteTop() - feedbackPopup.getOffsetHeight());
         }
     }
 
diff --git a/client/src/com/vaadin/client/ui/table/VScrollTable.java b/client/src/com/vaadin/client/ui/table/VScrollTable.java
index 6a171c5b30..df44f58740 100644
--- a/client/src/com/vaadin/client/ui/table/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/table/VScrollTable.java
@@ -2251,7 +2251,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
             final String ALIGN_PREFIX = primaryStyleName
                     + "-caption-container-align-";
-            
+
             switch (align) {
             case ALIGN_CENTER:
                 captionContainer.addClassName(ALIGN_PREFIX + "center");
@@ -2261,9 +2261,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                 break;
             default:
                 captionContainer.addClassName(ALIGN_PREFIX + "left");
-                    break;
+                break;
             }
-           
+
         }
 
         public void disableAutoWidthCalculation() {
diff --git a/server/src/com/vaadin/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/DefaultDeploymentConfiguration.java
index a9818f2c8b..1d804c99aa 100644
--- a/server/src/com/vaadin/DefaultDeploymentConfiguration.java
+++ b/server/src/com/vaadin/DefaultDeploymentConfiguration.java
@@ -219,7 +219,8 @@ public class DefaultDeploymentConfiguration implements DeploymentConfiguration {
         try {
             heartbeatInterval = Integer
                     .parseInt(getApplicationOrSystemProperty(
-                            Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL, "300"));
+                            Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL,
+                            "300"));
         } catch (NumberFormatException e) {
             getLogger().warning(
                     Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC);
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
index 6af6f1c040..0d60b86ab8 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
@@ -1,6 +1,5 @@
 package com.vaadin.shared.ui.orderedlayout;
 
-
 public class HorizontalLayoutState extends AbstractOrderedLayoutState {
     {
         primaryStyleName = "v-horizontallayout";
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
index 4824f63838..3736f41299 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
@@ -1,6 +1,5 @@
 package com.vaadin.shared.ui.splitpanel;
 
-
 public class HorizontalSplitPanelState extends AbstractSplitPanelState {
     {
         primaryStyleName = "v-splitpanel-horizontal";
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
index ca9492b111..e477ee8487 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
@@ -13,19 +13,19 @@ public class DateFieldPrimaryStyleNames extends TestBase {
         final DateField df = new DateField();
         df.setPrimaryStyleName("my-datefield");
         addComponent(df);
-        
+
         final InlineDateField idf = new InlineDateField();
         idf.setPrimaryStyleName("my-inline-datefield");
         addComponent(idf);
-        
+
         addComponent(new Button("Set primary stylename",
                 new Button.ClickListener() {
-            @Override
-            public void buttonClick(ClickEvent event) {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
                         df.setPrimaryStyleName("my-second-datefield");
                         idf.setPrimaryStyleName("my-second-inline-datefield");
-            }
-        }));
+                    }
+                }));
 
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java b/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
index 06dec920ea..b0137c55cf 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
+++ b/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
@@ -12,8 +12,7 @@ public class ListSelectPrimaryStylename extends TestBase {
     @Override
     protected void setup() {
         final ListSelect list = new ListSelect("Caption", Arrays.asList(
-                "Option 1",
-                "Option 2", "Option 3"));
+                "Option 1", "Option 2", "Option 3"));
         list.setPrimaryStyleName("my-list");
         addComponent(list);
 
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
index 3bfc5bb5e0..8adfcf4439 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
@@ -24,7 +24,6 @@ public class OrderedLayoutSlotStyleNames extends TestBase {
 
         addComponent(vl);
 
-
         HorizontalLayout hl = new HorizontalLayout();
 
         lbl = new Label("A label");