Reformatted project

41 files changed, 181 insertions, 206 deletions

diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index 1d37d12a45..f5c604cbf5 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
@@ -90,8 +90,7 @@ public class ConnectorBundle {
         JClassType serializerInterface = oracle.findType(JSONSerializer.class
                 .getName());
         JType[] deserializeParamTypes = new JType[] {
-                oracle.findType(com.vaadin.client.metadata.Type.class
-                        .getName()),
+                oracle.findType(com.vaadin.client.metadata.Type.class.getName()),
                 oracle.findType(JSONValue.class.getName()),
                 oracle.findType(ApplicationConnection.class.getName()) };
         String deserializeMethodName = "deserialize";
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
diff --git a/sass/src/com/vaadin/sass/parser/LocatorImpl.java b/sass/src/com/vaadin/sass/parser/LocatorImpl.java
index 77e7543061..d481459f17 100644
--- a/sass/src/com/vaadin/sass/parser/LocatorImpl.java
+++ b/sass/src/com/vaadin/sass/parser/LocatorImpl.java
@@ -12,119 +12,117 @@ import org.w3c.css.sac.Locator;
 
 /**
  * @version $Revision: 1.2 $
- * @author  Philippe Le Hegaret
+ * @author Philippe Le Hegaret
  */
 public class LocatorImpl implements Locator {
 
     // W3C DEBUG mode
     private static boolean W3CDebug;
     static {
-	try {
-	    W3CDebug = (Boolean.getBoolean("debug")
-			|| Boolean.getBoolean("org.w3c.flute.parser.LocatorImpl.debug")
-			|| Boolean.getBoolean("org.w3c.flute.parser.debug")
-			|| Boolean.getBoolean("org.w3c.flute.debug")
-			|| Boolean.getBoolean("org.w3c.debug")
-			|| Boolean.getBoolean("org.debug"));
-	} catch (Exception e) {
-	    // nothing
-	}
+        try {
+            W3CDebug = (Boolean.getBoolean("debug")
+                    || Boolean
+                            .getBoolean("org.w3c.flute.parser.LocatorImpl.debug")
+                    || Boolean.getBoolean("org.w3c.flute.parser.debug")
+                    || Boolean.getBoolean("org.w3c.flute.debug")
+                    || Boolean.getBoolean("org.w3c.debug") || Boolean
+                    .getBoolean("org.debug"));
+        } catch (Exception e) {
+            // nothing
+        }
     }
-    
+
     String uri;
-    int    line;
-    int    column;
+    int line;
+    int column;
 
     public String getURI() {
-	return uri;
+        return uri;
     }
 
     public int getLineNumber() {
-	return line;
+        return line;
     }
 
     public int getColumnNumber() {
-	return column;
+        return column;
     }
 
     /**
      * Creates a new LocatorImpl
      */
     public LocatorImpl(Parser p) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ");");
+        }
         uri = p.source.getURI();
-	line = p.token.beginLine;
-	column = p.token.beginColumn;
+        line = p.token.beginLine;
+        column = p.token.beginColumn;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl(Parser p, Token tok) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p 
-				+ ", " + tok + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + tok
+                    + ");");
+        }
         uri = p.source.getURI();
-	line = tok.beginLine;
-	column = tok.beginColumn;
+        line = tok.beginLine;
+        column = tok.beginColumn;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl(Parser p, int line, int column) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p 
-				+ ", " + line 
-				 + ", " + column + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + line
+                    + ", " + column + ");");
+        }
         uri = p.source.getURI();
-	this.line = line;
-	this.column = column;
+        this.line = line;
+        this.column = column;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::reInit(" + p + ");" );
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ");");
+        }
         uri = p.source.getURI();
-	line = p.token.beginLine;
-	column = p.token.beginColumn;
-	return this;
+        line = p.token.beginLine;
+        column = p.token.beginColumn;
+        return this;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p, Token tok) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::reInit(" + p 
-				+ ", " + tok + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ", " + tok + ");");
+        }
         uri = p.source.getURI();
-	line = tok.beginLine;
-	column = tok.beginColumn;
-	return this;
+        line = tok.beginLine;
+        column = tok.beginColumn;
+        return this;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p, int line, int column) {
-	if (W3CDebug) {
-	    System.err.println("LocatorImpl::reInit(" + p 
-			       + ", " + line 
-			       + ", " + column + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ", " + line + ", "
+                    + column + ");");
+        }
         uri = p.source.getURI();
-	this.line = line;
-	this.column = column;
-	return this;
+        this.line = line;
+        this.column = column;
+        return this;
     }
 }
diff --git a/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java b/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
index acb17612b3..c3b0e75979 100644
--- a/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
+++ b/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
@@ -4,17 +4,16 @@ import org.w3c.css.sac.InputSource;
 
 public interface ScssStylesheetResolver {
     /**
-     * Called with the "identifier" of a stylesheet that the resolver should
-     * try to find. The identifier is basically a filename, like "runo.scss"
-     * or "addon/styles.scss", but might exclude ".scss". The resolver must
+     * Called with the "identifier" of a stylesheet that the resolver should try
+     * to find. The identifier is basically a filename, like "runo.scss" or
+     * "addon/styles.scss", but might exclude ".scss". The resolver must
      * {@link InputSource#setURI(String)} to the final location where the
      * stylesheet was found, e.g "runo.scss" might result in a URI like
      * "VAADIN/themes/runo/runo.scss".
      * 
      * @param identifier
      *            used fo find stylesheet
-     * @return InputSource for stylesheet (with URI set) or null if not
-     *         found
+     * @return InputSource for stylesheet (with URI set) or null if not found
      */
     public InputSource resolve(String identifier);
 }
\ No newline at end of file
diff --git a/sass/src/com/vaadin/sass/tree/BlockNode.java b/sass/src/com/vaadin/sass/tree/BlockNode.java
index 685c3ac3f0..e255b2a3e5 100644
--- a/sass/src/com/vaadin/sass/tree/BlockNode.java
+++ b/sass/src/com/vaadin/sass/tree/BlockNode.java
@@ -70,10 +70,10 @@ public class BlockNode extends Node implements Clonable {
 
         if (selectorList != null) {
             clonedSelectorList = new SelectorListImpl();
-        for (int i = 0; i < selectorList.getLength(); i++) {
-            clonedSelectorList.addSelector(selectorList.item(i));
+            for (int i = 0; i < selectorList.getLength(); i++) {
+                clonedSelectorList.addSelector(selectorList.item(i));
+            }
         }
-    }
         final BlockNode clone = new BlockNode(clonedSelectorList);
         for (Node child : getChildren()) {
             clone.getChildren().add((Node) DeepCopy.copy(child));
diff --git a/sass/src/com/vaadin/sass/util/DeepCopy.java b/sass/src/com/vaadin/sass/util/DeepCopy.java
index 23f8386714..5d4e43c477 100644
--- a/sass/src/com/vaadin/sass/util/DeepCopy.java
+++ b/sass/src/com/vaadin/sass/util/DeepCopy.java
@@ -38,26 +38,26 @@ public class DeepCopy {
 
         Object obj = null;
         if (!(orig instanceof Clonable)) {
-        try {
-            // Write the object out to a byte array
-            FastByteArrayOutputStream fbos = new FastByteArrayOutputStream();
-            ObjectOutputStream out = new ObjectOutputStream(fbos);
-            out.writeObject(orig);
-            out.flush();
-            out.close();
+            try {
+                // Write the object out to a byte array
+                FastByteArrayOutputStream fbos = new FastByteArrayOutputStream();
+                ObjectOutputStream out = new ObjectOutputStream(fbos);
+                out.writeObject(orig);
+                out.flush();
+                out.close();
 
-            // Retrieve an input stream from the byte array and read
-            // a copy of the object back in.
+                // Retrieve an input stream from the byte array and read
+                // a copy of the object back in.
                 ObjectInputStream in = new ObjectInputStream(
                         fbos.getInputStream());
-            obj = in.readObject();
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException cnfe) {
-            cnfe.printStackTrace();
-        }
-        return obj;
+                obj = in.readObject();
+                in.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (ClassNotFoundException cnfe) {
+                cnfe.printStackTrace();
+            }
+            return obj;
         } else {
             try {
                 obj = ((Clonable) orig).clone();
diff --git a/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
index 22830ca82b..d1280d29ce 100644
--- a/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
@@ -22,7 +22,6 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-
 public abstract class AbstractDeploymentConfiguration implements
         DeploymentConfiguration {
 
diff --git a/server/src/com/vaadin/server/AbstractExtension.java b/server/src/com/vaadin/server/AbstractExtension.java
index ccc3bbed22..747caee967 100644
--- a/server/src/com/vaadin/server/AbstractExtension.java
+++ b/server/src/com/vaadin/server/AbstractExtension.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.server;
 
-
 /**
  * An extension is an entity that is attached to a Component or another
  * Extension and independently communicates between client and server.
diff --git a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
index 20e2752801..1f67631203 100644
--- a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
@@ -77,8 +77,7 @@ import com.vaadin.ui.JavaScriptFunction;
  * functions is described bellow.</li>
  * <li><code>translateVaadinUri(uri)</code> - Translates a Vaadin URI to a URL
  * that can be used in the browser. This is just way of accessing
- * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}
- * </li>
+ * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}</li>
  * </ul>
  * The connector wrapper also supports these special functions:
  * <ul>
diff --git a/server/src/com/vaadin/server/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java
index ba8e266eb2..07b95fc713 100644
--- a/server/src/com/vaadin/server/AbstractUIProvider.java
+++ b/server/src/com/vaadin/server/AbstractUIProvider.java
@@ -22,8 +22,8 @@ import com.vaadin.ui.UI;
 public abstract class AbstractUIProvider implements UIProvider {

 

     @Override

-    public UI instantiateUI(Application application,

-            Class<? extends UI> type, WrappedRequest request) {

+    public UI instantiateUI(Application application, Class<? extends UI> type,

+            WrappedRequest request) {

         try {

             return type.newInstance();

         } catch (InstantiationException e) {

diff --git a/server/src/com/vaadin/server/BootstrapPageResponse.java b/server/src/com/vaadin/server/BootstrapPageResponse.java
index e978703fa3..d6df145728 100644
--- a/server/src/com/vaadin/server/BootstrapPageResponse.java
+++ b/server/src/com/vaadin/server/BootstrapPageResponse.java
@@ -50,8 +50,7 @@ public class BootstrapPageResponse extends BootstrapResponse {
      *            the application for which the bootstrap page should be
      *            generated
      * @param uiId
-     *            the generated id of the UI that will be displayed on the
-     *            page
+     *            the generated id of the UI that will be displayed on the page
      * @param document
      *            the DOM document making up the HTML page
      * @param headers
diff --git a/server/src/com/vaadin/server/ConnectorResource.java b/server/src/com/vaadin/server/ConnectorResource.java
index 7f30de4bbe..e696c35c0d 100644
--- a/server/src/com/vaadin/server/ConnectorResource.java
+++ b/server/src/com/vaadin/server/ConnectorResource.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.server;
 
-
 /**
  * A resource that is served through the Connector that is using the resource.
  * 
diff --git a/server/src/com/vaadin/server/Extension.java b/server/src/com/vaadin/server/Extension.java
index 4676768781..bb7d133e8e 100644
--- a/server/src/com/vaadin/server/Extension.java
+++ b/server/src/com/vaadin/server/Extension.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.server;
 
-
 /**
  * An extension is an entity that is attached to a Component or another
  * Extension and independently communicates between client and server.
diff --git a/server/src/com/vaadin/server/JsonPaintTarget.java b/server/src/com/vaadin/server/JsonPaintTarget.java
index f776e38a1f..b193c47528 100644
--- a/server/src/com/vaadin/server/JsonPaintTarget.java
+++ b/server/src/com/vaadin/server/JsonPaintTarget.java
@@ -589,8 +589,7 @@ public class JsonPaintTarget implements PaintTarget {
      * @throws PaintException
      *             if the paint operation failed.
      * 
-     * @see com.vaadin.server.PaintTarget#addXMLSection(String, String,
-     *      String)
+     * @see com.vaadin.server.PaintTarget#addXMLSection(String, String, String)
      */
 
     @Override
diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index 5d626c2a01..b8fdae6cfb 100644
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -417,8 +417,8 @@ public class Page implements Serializable {
 
     /**
      * Adds a new {@link BrowserWindowResizeListener} to this uI. The listener
-     * will be notified whenever the browser window within which this uI
-     * resides is resized.
+     * will be notified whenever the browser window within which this uI resides
+     * is resized.
      * 
      * @param resizeListener
      *            the listener to add
@@ -442,8 +442,8 @@ public class Page implements Serializable {
     }
 
     /**
-     * Removes a {@link BrowserWindowResizeListener} from this UI. The
-     * listener will no longer be notified when the browser window is resized.
+     * Removes a {@link BrowserWindowResizeListener} from this UI. The listener
+     * will no longer be notified when the browser window is resized.
      * 
      * @param resizeListener
      *            the listener to remove
@@ -474,8 +474,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * Gets the last known width of the browser window in which this uI
-     * resides.
+     * Gets the last known width of the browser window in which this uI resides.
      * 
      * @return the browser window width in pixels
      */
@@ -552,8 +551,8 @@ public class Page implements Serializable {
     }
 
     /**
-     * Opens the given resource in this uI. The contents of this UI is
-     * replaced by the {@code Resource}.
+     * Opens the given resource in this uI. The contents of this UI is replaced
+     * by the {@code Resource}.
      * 
      * @param resource
      *            the resource to show in this uI
diff --git a/server/src/com/vaadin/server/RpcTarget.java b/server/src/com/vaadin/server/RpcTarget.java
index 934146385f..c491707995 100644
--- a/server/src/com/vaadin/server/RpcTarget.java
+++ b/server/src/com/vaadin/server/RpcTarget.java
@@ -18,7 +18,6 @@ package com.vaadin.server;
 
 import java.io.Serializable;
 
-
 /**
  * Marker interface for server side classes that can receive RPC calls.
  * 
diff --git a/server/src/com/vaadin/server/SystemError.java b/server/src/com/vaadin/server/SystemError.java
index edd49292f3..5d1426e87c 100644
--- a/server/src/com/vaadin/server/SystemError.java
+++ b/server/src/com/vaadin/server/SystemError.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.server;
 
-
 /**
  * <code>SystemError</code> is an error message for a problem caused by error in
  * system, not the user application code. The system error can contain technical
diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java
index e06b80c62f..f262a3e225 100644
--- a/server/src/com/vaadin/server/UIProvider.java
+++ b/server/src/com/vaadin/server/UIProvider.java
@@ -24,6 +24,6 @@ public interface UIProvider {
     public Class<? extends UI> getUIClass(Application application,

             WrappedRequest request) throws UIRequiresMoreInformationException;

 

-    public UI instantiateUI(Application application,

-            Class<? extends UI> type, WrappedRequest request);

+    public UI instantiateUI(Application application, Class<? extends UI> type,

+            WrappedRequest request);

 }

diff --git a/server/src/com/vaadin/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
index 67232e000e..f2916ac0eb 100644
--- a/server/src/com/vaadin/server/WrappedHttpServletResponse.java
+++ b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
@@ -19,7 +19,6 @@ package com.vaadin.server;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-
 /**
  * Wrapper for {@link HttpServletResponse}.
  * 
diff --git a/server/src/com/vaadin/server/WrappedPortletResponse.java b/server/src/com/vaadin/server/WrappedPortletResponse.java
index 4e23f4e63f..f84e3619d2 100644
--- a/server/src/com/vaadin/server/WrappedPortletResponse.java
+++ b/server/src/com/vaadin/server/WrappedPortletResponse.java
@@ -29,7 +29,6 @@ import javax.portlet.MimeResponse;
 import javax.portlet.PortletResponse;
 import javax.portlet.ResourceResponse;
 
-
 /**
  * Wrapper for {@link PortletResponse} and its subclasses.
  * 
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
index 3b80ac1f68..47420334d7 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
@@ -35,9 +35,9 @@ import com.vaadin.shared.ui.JavaScriptComponentState;
  * <code>com_example_MyComponent</code> has not been defined.
  * <p>
  * JavaScript components have a very simple GWT widget (
- * {@link com.vaadin.client.ui.JavaScriptWidget} ) just consisting
- * of a <code>div</code> element to which the JavaScript code should initialize
- * its own user interface.
+ * {@link com.vaadin.client.ui.JavaScriptWidget} ) just consisting of a
+ * <code>div</code> element to which the JavaScript code should initialize its
+ * own user interface.
  * <p>
  * The initialization function will be called with <code>this</code> pointing to
  * a connector wrapper object providing integration to Vaadin with the following
@@ -80,8 +80,7 @@ import com.vaadin.shared.ui.JavaScriptComponentState;
  * functions is described bellow.</li>
  * <li><code>translateVaadinUri(uri)</code> - Translates a Vaadin URI to a URL
  * that can be used in the browser. This is just way of accessing
- * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}
- * </li>
+ * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}</li>
  * </ul>
  * The connector wrapper also supports these special functions:
  * <ul>
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index 09f620cc2a..7cad310d37 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -58,8 +58,8 @@ public class ColumnPropertyTest {
 
     @Test(expected = ReadOnlyException.class)
     public void setValue_readOnlyNullable_shouldFail() {
-        ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                false, "Ville", String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", true, true, true, false,
+                "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         EasyMock.replay(container);
@@ -111,8 +111,8 @@ public class ColumnPropertyTest {
 
     @Test
     public void isReadOnly_readOnlyNullable_returnsTrue() {
-        ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                false, "Ville", String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", true, true, true, false,
+                "Ville", String.class);
         Assert.assertTrue(cp.isReadOnly());
     }
 
@@ -173,8 +173,8 @@ public class ColumnPropertyTest {
 
     @Test
     public void setValue_resetTonullOnNullable_shouldWork() {
-        ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false,
-                null, String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
+                false, null, String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         cp.setValue("asdf");
diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/com/vaadin/shared/Connector.java
index 87fc05f5d0..f3d5d16e59 100644
--- a/shared/src/com/vaadin/shared/Connector.java
+++ b/shared/src/com/vaadin/shared/Connector.java
@@ -29,9 +29,8 @@ import java.io.Serializable;
  * <p>
  * No classes should implement this interface directly, client side classes
  * wanting to communicate with server side should implement
- * {@link com.vaadin.client.ServerConnector} and server side
- * classes should implement
- * {@link com.vaadin.server.ClientConnector}.
+ * {@link com.vaadin.client.ServerConnector} and server side classes should
+ * implement {@link com.vaadin.server.ClientConnector}.
  * </p>
  * 
  * @author Vaadin Ltd
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index 5009857530..2143e884c0 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -21,8 +21,7 @@ import java.io.Serializable;
  * Class that parses the user agent string from the browser and provides
  * information about the browser. Used internally by
  * {@link com.vaadin.client.BrowserInfo} and
- * {@link com.vaadin.server.WebBrowser}. Should not be used
- * directly.
+ * {@link com.vaadin.server.WebBrowser}. Should not be used directly.
  * 
  * @author Vaadin Ltd.
  * @since 6.3
diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/com/vaadin/shared/communication/SharedState.java
index f35d4675f3..09147ac97d 100644
--- a/shared/src/com/vaadin/shared/communication/SharedState.java
+++ b/shared/src/com/vaadin/shared/communication/SharedState.java
@@ -38,9 +38,9 @@ import com.vaadin.shared.Connector;
  * arrays of these.
  * 
  * On the client side the connector should override
- * {@link com.vaadin.client.ui.AbstractConnector#getState()} to
- * return the correct state type. This automatically causes a correct state
- * object to be created.
+ * {@link com.vaadin.client.ui.AbstractConnector#getState()} to return the
+ * correct state type. This automatically causes a correct state object to be
+ * created.
  * 
  * Subclasses of a {@link Connector} using shared state should also provide a
  * subclass of the shared state class of the parent class to extend the state. A
diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java
index 17171ec843..c7a55775bd 100644
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/com/vaadin/shared/ui/Connect.java
@@ -46,9 +46,8 @@ public @interface Connect {
      * Depending on the used WidgetMap generator, these optional hints may be
      * used to define how the client side components are loaded by the browser.
      * The default is to eagerly load all widgets
-     * {@link com.vaadin.server.widgetsetutils.EagerWidgetMapGenerator},
-     * but if the
-     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} is used
+     * {@link com.vaadin.server.widgetsetutils.EagerWidgetMapGenerator}, but if
+     * the {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} is used
      * by the widgetset, these load style hints are respected.
      * <p>
      * Lazy loading of a widget implementation means the client side component
@@ -69,15 +68,14 @@ public @interface Connect {
      * the best of both worlds.
      * <p>
      * Fine tunings to widget loading can also be made by overriding
-     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} in the
-     * GWT module. Tunings might be helpful if the end users have slow
-     * connections and especially if they have high latency in their network.
-     * The
-     * {@link com.vaadin.server.widgetsetutils.CustomWidgetMapGenerator}
-     * is an abstract generator implementation for easy customization. Vaadin
-     * package also includes
-     * {@link com.vaadin.server.widgetsetutils.LazyWidgetMapGenerator}
-     * that makes as many widgets lazily loaded as possible.
+     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} in the GWT
+     * module. Tunings might be helpful if the end users have slow connections
+     * and especially if they have high latency in their network. The
+     * {@link com.vaadin.server.widgetsetutils.CustomWidgetMapGenerator} is an
+     * abstract generator implementation for easy customization. Vaadin package
+     * also includes
+     * {@link com.vaadin.server.widgetsetutils.LazyWidgetMapGenerator} that
+     * makes as many widgets lazily loaded as possible.
      * 
      * @since 6.4
      * 
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java b/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
index 61fc73577f..dd6079167e 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
+++ b/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
@@ -18,6 +18,6 @@ package com.vaadin.shared.ui.link;
 
 import com.vaadin.shared.ComponentState;
 
-public class LinkConstants  {
+public class LinkConstants {
     public static String HREF_RESOURCE = "href";
 }
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java b/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java
index e7aaf0c0e4..6abbc41213 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java
+++ b/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java
@@ -18,10 +18,10 @@ public class ImageAltText extends TestBase {
 
         Button changeAltTexts = new Button("Change alt text",
                 new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                image.setAlternateText("New alt text!");
-            }
-        });
+                    public void buttonClick(ClickEvent event) {
+                        image.setAlternateText("New alt text!");
+                    }
+                });
         addComponent(changeAltTexts);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java b/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java
index 8fefac16a1..1745c11982 100755
--- a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java
@@ -12,7 +12,8 @@ public class SemiTransparentNotification extends TestBase {
         Label l = new Label(LoremIpsum.get(10000));
         getLayout().setSizeFull();
         addComponent(l);
-        Notification.show("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This should be a <br/><b>SEMI-TRANSPARENT</b><br/> notification",
+        Notification
+                .show("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This should be a <br/><b>SEMI-TRANSPARENT</b><br/> notification",
                         Notification.TYPE_WARNING_MESSAGE);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
index 1e7fe5d78a..ce7960a169 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
@@ -87,7 +87,8 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication
             // Return a stream from the buffer.
             ByteArrayInputStream istream = new ByteArrayInputStream(
                     imagebuffer.toByteArray());
-            new DownloadStream(istream, null, null).writeResponse(request, response);
+            new DownloadStream(istream, null, null).writeResponse(request,
+                    response);
             return true;
         } catch (IOException e) {
             return false;
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
index eb3a20e90e..0d89976ca0 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
+++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
@@ -74,6 +74,7 @@ public interface SerializerTestRpc extends ServerRpc, ClientRpc {
     public void sendWrappedGenerics(
             Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics);
 
-    public void sendEnum(ContentMode contentMode, ContentMode[] array, List<ContentMode> list);
+    public void sendEnum(ContentMode contentMode, ContentMode[] array,
+            List<ContentMode> list);
 
 }