Formatted project

Change-Id: I771ca4edea66ad29a80628ee1a98d1c5ff1679ab

diff --git a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
index fbf534a5b54a55a42bfcd1dbe1f790179757a26a..7c1c734aa03ce587b6c70e81cb180c033b708973 100644 (file)
--- 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 4ce651cde0463671cfbb6740ddb1a46aaad7e97e..c08371af953ff04967f71a108998c714b07b34f3 100644 (file)
--- 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 b2a5b492121a042d75d231cb39994429771a69ee..6f23d42de9c7143dd39db938a878382b8c0bb777 100644 (file)
--- 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 2323035e58eea9575498eb8198abaf8186b8b60c..a9528cd14587ebbd4605fdfd06de9c6864e9d840 100644 (file)
--- 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 2f2c3b32908a5822833056e6f43f2f9b946e4265..39972e7214406eafb14aaa8c187b56fd03dc3a1d 100644 (file)
--- 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 e38e6816ad288a9dc0db75ff6d21399510afa8a0..38d6d513bf326e02381c3987a9eea2d1eade4796 100644 (file)
--- 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 9707db610e43de1091d2f6d312ea0ba0a897e28c..ea4048515cb6c9980c658805b56c971cde1d0f1e 100644 (file)
--- 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 99fd681d6307d7dca72c88f3c33fc5811c732fc6..0159e491b28a4d1f98e469893c883aff7cbf9ddf 100644 (file)
--- 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 c7e9d35c83e4b67e5c423ac788b29830a68c7332..58db8494f006578a79da6b0c2e0e117fa1ab3dd1 100644 (file)
--- 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 6a171c5b30f8443eec00b9d5ae73d97e801ec1cc..df44f58740b7ddec6eb23a21c93b51340661d7ba 100644 (file)
--- 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 a9818f2c8be8ccdd65bc403b04906cb51c4a943b..1d804c99aad1c07ad139ba5bbef82343044b5756 100644 (file)
--- 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 6af6f1c04022ee5d87e5c380fccbbe0c55e71b87..0d60b86ab8a9ad1c93516ce95dc75688d114a352 100644 (file)
--- 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 4824f63838e75ddd2dda9f28877078cf01f94251..3736f412993b0bad3f7d516e465e594af87dde06 100644 (file)
--- 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 ca9492b111f933b9865204d74b710979d62959f8..e477ee848771b1061d94532a347db6bde703ff18 100644 (file)
--- 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 06dec920eabe3d50d54d3f0588de57af2de64283..b0137c55cf22422a26ecc57a4a5dce106b31634a 100644 (file)
--- 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 3bfc5bb5e04a4de51ca4e4eee828ca12bcba52f7..8adfcf4439dfad376916c88bdc1564fbbc058b47 100644 (file)
--- 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");