From 8941056349e302e687e40e94c13709e75f256d73 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 30 Aug 2012 17:02:08 +0300
Subject: Reformatted project

---
 .../vaadin/server/AbstractDeploymentConfiguration.java    |  1 -
 server/src/com/vaadin/server/AbstractExtension.java       |  1 -
 .../com/vaadin/server/AbstractJavaScriptExtension.java    |  3 +--
 server/src/com/vaadin/server/AbstractUIProvider.java      |  4 ++--
 server/src/com/vaadin/server/BootstrapPageResponse.java   |  3 +--
 server/src/com/vaadin/server/ConnectorResource.java       |  1 -
 server/src/com/vaadin/server/Extension.java               |  1 -
 server/src/com/vaadin/server/JsonPaintTarget.java         |  3 +--
 server/src/com/vaadin/server/Page.java                    | 15 +++++++--------
 server/src/com/vaadin/server/RpcTarget.java               |  1 -
 server/src/com/vaadin/server/SystemError.java             |  1 -
 server/src/com/vaadin/server/UIProvider.java              |  4 ++--
 .../src/com/vaadin/server/WrappedHttpServletResponse.java |  1 -
 server/src/com/vaadin/server/WrappedPortletResponse.java  |  1 -
 server/src/com/vaadin/ui/AbstractJavaScriptComponent.java |  9 ++++-----
 .../vaadin/data/util/sqlcontainer/ColumnPropertyTest.java | 12 ++++++------
 16 files changed, 24 insertions(+), 37 deletions(-)

(limited to 'server')

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");
-- 
cgit v1.2.3