Reformatted project

11 files changed, 46 insertions, 53 deletions

diff --git a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
index 47fa23e627..59adca1ca8 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
@@ -44,8 +44,7 @@ public abstract class AbstractComponentContainerConnector extends
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.ComponentContainerConnector#getChildren()
+     * @see com.vaadin.client.ComponentContainerConnector#getChildren()
      */
     @Override
     public List<ComponentConnector> getChildComponents() {
@@ -59,8 +58,7 @@ public abstract class AbstractComponentContainerConnector extends
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.ComponentContainerConnector#setChildren
+     * @see com.vaadin.client.ComponentContainerConnector#setChildren
      * (java.util.Collection)
      */
     @Override
diff --git a/client/src/com/vaadin/client/ui/UI/UIConnector.java b/client/src/com/vaadin/client/ui/UI/UIConnector.java
index 18b271e64b..920bf152f9 100644
--- a/client/src/com/vaadin/client/ui/UI/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/UI/UIConnector.java
@@ -61,8 +61,8 @@ import com.vaadin.shared.ui.ui.UIState;
 import com.vaadin.ui.UI;
 
 @Connect(value = UI.class, loadStyle = LoadStyle.EAGER)
-public class UIConnector extends AbstractComponentContainerConnector
-        implements Paintable, MayScrollChildren {
+public class UIConnector extends AbstractComponentContainerConnector implements
+        Paintable, MayScrollChildren {
 
     private UIServerRpc rpc = RpcProxy.create(UIServerRpc.class, this);
 
@@ -276,8 +276,8 @@ public class UIConnector extends AbstractComponentContainerConnector
 
             // Include current fragment in the next request
             client.updateVariable(getWidget().id,
-                    UIConstants.FRAGMENT_VARIABLE,
-                    getWidget().currentFragment, false);
+                    UIConstants.FRAGMENT_VARIABLE, getWidget().currentFragment,
+                    false);
         }
 
         if (firstPaint) {
diff --git a/client/src/com/vaadin/client/ui/VOverlay.java b/client/src/com/vaadin/client/ui/VOverlay.java
index 222c98e761..6dfcd97516 100644
--- a/client/src/com/vaadin/client/ui/VOverlay.java
+++ b/client/src/com/vaadin/client/ui/VOverlay.java
@@ -469,17 +469,17 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
         if (BrowserInfo.get().isOpera() && isShadowEnabled()) {
             // We'll fix the height of all the middle elements
             DOM.getChild(shadow, 3)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 3).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 3).getOffsetHeight());
             DOM.getChild(shadow, 4)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 4).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 4).getOffsetHeight());
             DOM.getChild(shadow, 5)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 5).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 5).getOffsetHeight());
         }
 
         // Attach to dom if not there already
@@ -489,7 +489,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
         }
         if (needsShimElement() && !isShimElementAttached()) {
             RootPanel.get().getElement()
-            .insertBefore(getShimElement(), getElement());
+                    .insertBefore(getShimElement(), getElement());
         }
 
     }
diff --git a/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java b/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java
index 2e2ca42648..e5aeb2efe8 100644
--- a/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java
+++ b/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java
@@ -46,9 +46,9 @@ import com.vaadin.client.ui.datefield.VCalendarPanel.SubmitListener;
  * selector.
  * 
  * <b>Note:</b> To change the keyboard assignments used in the popup dialog you
- * should extend <code>com.vaadin.client.ui.VCalendarPanel</code>
- * and then pass set it by calling the
- * <code>setCalendarPanel(VCalendarPanel panel)</code> method.
+ * should extend <code>com.vaadin.client.ui.VCalendarPanel</code> and then pass
+ * set it by calling the <code>setCalendarPanel(VCalendarPanel panel)</code>
+ * method.
  * 
  */
 public class VPopupCalendar extends VTextualDate implements Field,
@@ -329,8 +329,7 @@ public class VPopupCalendar extends VTextualDate implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.ui.VDateField#onBrowserEvent(com.google
+     * @see com.vaadin.client.ui.VDateField#onBrowserEvent(com.google
      * .gwt.user.client.Event)
      */
     @Override
diff --git a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
index 70f39539ff..a4878724a8 100644
--- a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
@@ -56,8 +56,8 @@ import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
 
 public class VMenuBar extends SimpleFocusablePanel implements
-CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
-FocusHandler, SubPartAware {
+        CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
+        FocusHandler, SubPartAware {
 
     // The hierarchy of VMenuBar is a bit weird as VMenuBar is the Paintable,
     // used for the root menu but also used for the sub menus.
@@ -94,11 +94,11 @@ FocusHandler, SubPartAware {
     private VLazyExecutor iconLoadedExecutioner = new VLazyExecutor(100,
             new ScheduledCommand() {
 
-        @Override
-        public void execute() {
-            iLayout(true);
-        }
-    });
+                @Override
+                public void execute() {
+                    iLayout(true);
+                }
+            });
 
     boolean openRootOnHover;
 
@@ -188,7 +188,7 @@ FocusHandler, SubPartAware {
                 itemHTML.append("<img src=\""
                         + Util.escapeAttribute(client.translateVaadinUri(item
                                 .getStringAttribute("icon"))) + "\" class=\""
-                                + Icon.CLASSNAME + "\" alt=\"\" />");
+                        + Icon.CLASSNAME + "\" alt=\"\" />");
             }
             String itemText = item.getStringAttribute("text");
             if (!htmlContentAllowed) {
diff --git a/client/src/com/vaadin/client/ui/notification/VNotification.java b/client/src/com/vaadin/client/ui/notification/VNotification.java
index addb151b31..44dfaffd6e 100644
--- a/client/src/com/vaadin/client/ui/notification/VNotification.java
+++ b/client/src/com/vaadin/client/ui/notification/VNotification.java
@@ -386,8 +386,7 @@ public class VNotification extends VOverlay {
         boolean onlyPlainText = notification
                 .hasAttribute(UIConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED);
         String html = "";
-        if (notification
-                .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) {
+        if (notification.hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) {
             final String parsedUri = client
                     .translateVaadinUri(notification
                             .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON));
diff --git a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 0580fc3456..5a4950cc0a 100644
--- a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
@@ -1,5 +1,5 @@
 /*
-  * Copyright 2011 Vaadin Ltd.
+ * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/client/src/com/vaadin/client/ui/textarea/VTextArea.java b/client/src/com/vaadin/client/ui/textarea/VTextArea.java
index b883c95fdf..c4b1c2dd0b 100644
--- a/client/src/com/vaadin/client/ui/textarea/VTextArea.java
+++ b/client/src/com/vaadin/client/ui/textarea/VTextArea.java
@@ -132,7 +132,6 @@ public class VTextArea extends VTextField {
         }
     }
 
-
     @Override
     public int getCursorPos() {
         // This is needed so that TextBoxImplIE6 is used to return the correct
diff --git a/client/src/com/vaadin/client/ui/textfield/VTextField.java b/client/src/com/vaadin/client/ui/textfield/VTextField.java
index 99c6bef248..4b7e620ab1 100644
--- a/client/src/com/vaadin/client/ui/textfield/VTextField.java
+++ b/client/src/com/vaadin/client/ui/textfield/VTextField.java
@@ -44,7 +44,7 @@ import com.vaadin.shared.ui.textfield.TextFieldConstants;
  * 
  */
 public class VTextField extends TextBoxBase implements Field, ChangeHandler,
-FocusHandler, BlurHandler, KeyDownHandler {
+        FocusHandler, BlurHandler, KeyDownHandler {
 
     /**
      * The input node CSS classname.
@@ -114,7 +114,7 @@ FocusHandler, BlurHandler, KeyDownHandler {
 
         if (listenTextChangeEvents
                 && (event.getTypeInt() & TEXTCHANGE_EVENTS) == event
-                .getTypeInt()) {
+                        .getTypeInt()) {
             deferTextChangeEvent();
         }
 
diff --git a/client/src/com/vaadin/client/ui/tree/VTree.java b/client/src/com/vaadin/client/ui/tree/VTree.java
index 3c3452d1e3..2be3d7b33b 100644
--- a/client/src/com/vaadin/client/ui/tree/VTree.java
+++ b/client/src/com/vaadin/client/ui/tree/VTree.java
@@ -79,8 +79,8 @@ import com.vaadin.shared.ui.tree.TreeConstants;
  * 
  */
 public class VTree extends FocusElementPanel implements VHasDropHandler,
-FocusHandler, BlurHandler, KeyPressHandler, KeyDownHandler,
-SubPartAware, ActionOwner {
+        FocusHandler, BlurHandler, KeyPressHandler, KeyDownHandler,
+        SubPartAware, ActionOwner {
 
     public static final String CLASSNAME = "v-tree";
 
@@ -137,12 +137,12 @@ SubPartAware, ActionOwner {
     public VLazyExecutor iconLoaded = new VLazyExecutor(50,
             new ScheduledCommand() {
 
-        @Override
-        public void execute() {
-            Util.notifyParentOfSizeChange(VTree.this, true);
-        }
+                @Override
+                public void execute() {
+                    Util.notifyParentOfSizeChange(VTree.this, true);
+                }
 
-    });
+            });
 
     public VTree() {
         super();
@@ -668,7 +668,7 @@ SubPartAware, ActionOwner {
                     && client.hasEventListeners(VTree.this,
                             TreeConstants.ITEM_CLICK_EVENT_ID)
 
-                            && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) {
+                    && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) {
                 fireClick(event);
             }
             if (type == Event.ONCLICK) {
@@ -700,7 +700,7 @@ SubPartAware, ActionOwner {
                             .getEventTarget().cast())) {
                         if (dragMode > 0
                                 && (type == Event.ONTOUCHSTART || event
-                                .getButton() == NativeEvent.BUTTON_LEFT)) {
+                                        .getButton() == NativeEvent.BUTTON_LEFT)) {
                             mouseDownEvent = event; // save event for possible
                             // dd operation
                             if (type == Event.ONMOUSEDOWN) {
@@ -1721,7 +1721,7 @@ SubPartAware, ActionOwner {
                 selectNode(
                         focusedNode,
                         (!isMultiselect || multiSelectMode == MULTISELECT_MODE_SIMPLE)
-                        && selectable);
+                                && selectable);
             } else {
                 deselectNode(focusedNode);
             }
@@ -1967,8 +1967,7 @@ SubPartAware, ActionOwner {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.ui.SubPartAware#getSubPartElement(java
+     * @see com.vaadin.client.ui.SubPartAware#getSubPartElement(java
      * .lang.String)
      */
     @Override
@@ -2021,8 +2020,7 @@ SubPartAware, ActionOwner {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.ui.SubPartAware#getSubPartName(com.google
+     * @see com.vaadin.client.ui.SubPartAware#getSubPartName(com.google
      * .gwt.user.client.Element)
      */
     @Override
diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index b013bcaee0..7c83556283 100644
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -46,8 +46,8 @@ import com.vaadin.shared.ui.window.WindowState;
 
 @Connect(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractComponentContainerConnector
-implements Paintable, BeforeShortcutActionListener,
-SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
+        implements Paintable, BeforeShortcutActionListener,
+        SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this) {
         @Override