Fix formatting (#11023)

diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
index 4600451b4eee16bff654bb9f6c79f141f0343189..7365814996ed58a0a2279eb6ee388d9740d443e9 100644 (file)
--- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
@@ -229,33 +229,37 @@ public final class BeanUtil implements Serializable {
     }
 
     /**
-     * Checks if the object is serializable or not. To be used in assertion checks only,
-     * since the check might be a bit heavyweight.
+     * Checks if the object is serializable or not. To be used in assertion
+     * checks only, since the check might be a bit heavyweight.
      *
-     * @param obj to be checked
+     * @param obj
+     *            to be checked
      * @return {@code true}
-     * @throws AssertionError if the object is not serializable
+     * @throws AssertionError
+     *             if the object is not serializable
      */
     public static boolean checkSerialization(Object obj) {
         try {
-            ObjectOutputStream dummyObjectOutputStream = new ObjectOutputStream(new OutputStream() {
-                @Override
-                public void write(int b) {
-                }
+            ObjectOutputStream dummyObjectOutputStream = new ObjectOutputStream(
+                    new OutputStream() {
+                        @Override
+                        public void write(int b) {
+                        }
 
-                @SuppressWarnings("NullableProblems")
-                @Override
-                public void write(byte[] ignored) {
-                }
+                        @SuppressWarnings("NullableProblems")
+                        @Override
+                        public void write(byte[] ignored) {
+                        }
 
-                @SuppressWarnings("NullableProblems")
-                @Override
-                public void write(byte[] b, int off, int len) {
-                }
-            });
+                        @SuppressWarnings("NullableProblems")
+                        @Override
+                        public void write(byte[] b, int off, int len) {
+                        }
+                    });
             dummyObjectOutputStream.writeObject(obj);
         } catch (Throwable e) {
-            throw new AssertionError("Formatter supplier should be serializable", e);
+            throw new AssertionError(
+                    "Formatter supplier should be serializable", e);
         }
         return true;
     }

diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index 4058f3e99245f4ec923f04ceae91632745533931..b0d270accb26725742899c6724f61440df4fd640 100644 (file)
--- a/server/src/main/java/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java
@@ -1430,6 +1430,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /*
      * (non-Javadoc)
+     *
      * @see javax.servlet.GenericServlet#destroy()
      */
     @Override

diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 6cea3ce2d9196cab562c273bd068331503e8deb3..301dc2d2e254f36a464e475ec14754e4b2938aca 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -1118,7 +1118,7 @@ public class Upload extends AbstractComponent
                     fireUploadSuccess(event.getFileName(), event.getMimeType(),
                             event.getContentLength());
                     endUpload();
-                    if(lastStartedEvent != null)
+                    if (lastStartedEvent != null)
                         lastStartedEvent.disposeStreamVariable();
                 }
 
@@ -1138,7 +1138,7 @@ public class Upload extends AbstractComponent
                         }
                     } finally {
                         endUpload();
-                        if(lastStartedEvent != null)
+                        if (lastStartedEvent != null)
                             lastStartedEvent.disposeStreamVariable();
                     }
                 }

diff --git a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
index 9922da895673c6d12b03e0474d60399d41a0bcb4..9d921e1a5297ea87ce8b97c628296a5ab69b5a67 100644 (file)
--- a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -103,7 +103,7 @@ public class ClassesSerializableTest {
             "com\\.vaadin\\.screenshotbrowser\\.ScreenshotBrowser.*", //
             "com\\.vaadin\\.osgi.*", //
             "com\\.vaadin\\.server\\.osgi.*",
-            //V7
+            // V7
             "com\\.vaadin\\.v7\\.ui\\.themes\\.BaseTheme",
             "com\\.vaadin\\.v7\\.ui\\.themes\\.ChameleonTheme",
             "com\\.vaadin\\.v7\\.ui\\.themes\\.Reindeer",
@@ -113,8 +113,7 @@ public class ClassesSerializableTest {
             "com\\.vaadin\\.v7\\.data\\.util.BeanItemContainerGenerator.*",
             "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.connection\\.MockInitialContextFactory",
             "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.DataGenerator",
-            "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil",
-    };
+            "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil", };
 
     /**
      * Tests that all the relevant classes and interfaces under

diff --git a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
index 77cd7779c3cc8b306a39cbf928d022458cfc71d0..61b99b2c4a3205dac3742bc5342730d6fbb7c575 100644 (file)
--- a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
@@ -30,7 +30,7 @@ public class AbstractListingTest {
 
         /**
          * Used to execute data generation
-         * 
+         *
          * @param initial
          *            {@code true} to mock initial data request; {@code false}
          *            for follow-up request.

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDateString.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDateString.java
index dfd4f86a28078c5ebb6a920708018b7a17f140e4..c8c5abb9797060fffc235bc2a544ffbba6810225 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDateString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDateString.java
@@ -30,7 +30,8 @@ public class DateFieldUnparsableDateString extends AbstractTestUI {
         protected Result<LocalDate> handleUnparsableDateString(
                 String dateString) {
             try {
-                String parseableString = dateString == null ? "" : dateString.replaceAll(" ", "");
+                String parseableString = dateString == null ? ""
+                        : dateString.replaceAll(" ", "");
                 if (parseableString.length() % 2 == 1) {
                     parseableString = "0" + parseableString;
                 }

diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index 1e093cf7f4d1fca2d4fecdf0eac1867aeb2353e2..b8ae59b4c8d3dc485c739cdb1df9138e6d09e2c0 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -1193,7 +1193,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * {@link Actions#moveToElement(WebElement, int, int)}. This method takes
      * into account the W3C specification in browsers that properly implement
      * it.
-     * 
+     *
      * @param element
      *            the element
      * @param targetX
@@ -1214,7 +1214,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
      * {@link Actions#moveToElement(WebElement, int, int)}. This method takes
      * into account the W3C specification in browsers that properly implement
      * it.
-     * 
+     *
      * @param element
      *            the element
      * @param targetY