#7668 - Formatted code to adhere to Vaadin coding conventions

svn changeset:22171/svn branch:6.7

diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 8898dbad3f4e849eb1b769693cac7b87a546ba6d..68c5ace0fc024b4630497ef2b915e40f39198dcb 100644 (file)
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -54,7 +54,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     @Override
     public void addComponent(Component c) {
         // Add to components before calling super.addComponent
-        // so that it is available to AttachListeners 
+        // so that it is available to AttachListeners
         components.add(c);
         try {
             super.addComponent(c);
@@ -75,7 +75,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     public void addComponentAsFirst(Component c) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if(c.getParent() == this) {
+        if (c.getParent() == this) {
             removeComponent(c);
         }
         components.addFirst(c);
@@ -100,9 +100,9 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     public void addComponent(Component c, int index) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if(c.getParent() == this) {
+        if (c.getParent() == this) {
             // When c is removed, all components after it are shifted down
-            if(index > getComponentIndex(c)) {
+            if (index > getComponentIndex(c)) {
                 index--;
             }
             removeComponent(c);

diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index 52b0e6dc27a4b4edab8bf3d8428e07390dac7f54..78474d33fe51ae90a841f6e03f4490377e73a98e 100644 (file)
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -77,7 +77,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     @Override
     public void addComponent(Component c) {
         // Add to components before calling super.addComponent
-        // so that it is available to AttachListeners 
+        // so that it is available to AttachListeners
         components.add(c);
         try {
             super.addComponent(c);
@@ -98,7 +98,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     public void addComponentAsFirst(Component c) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if(c.getParent() == this) {
+        if (c.getParent() == this) {
             removeComponent(c);
         }
         components.addFirst(c);
@@ -123,9 +123,9 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     public void addComponent(Component c, int index) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if(c.getParent() == this) {
+        if (c.getParent() == this) {
             // When c is removed, all components after it are shifted down
-            if(index > components.indexOf(c)) {
+            if (index > components.indexOf(c)) {
                 index--;
             }
             removeComponent(c);

diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
index cfbace2a1a881c27f8bc724977385d6e6ea30bd0..ba5ea6218151cefdf56317aed1a41cd46575ead8 100644 (file)
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
@@ -1,86 +1,85 @@
 package com.vaadin.tests.server.component.abstractorderedlayout;\r
 \r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertSame;\r
+import static org.junit.Assert.fail;\r
+\r
 import java.util.Iterator;\r
 import java.util.NoSuchElementException;\r
 \r
 import org.junit.Test;\r
 \r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertSame;\r
-import static org.junit.Assert.fail;\r
-\r
-import com.vaadin.ui.Component;\r
 import com.vaadin.ui.AbstractOrderedLayout;\r
+import com.vaadin.ui.Component;\r
 import com.vaadin.ui.HorizontalLayout;\r
+import com.vaadin.ui.Label;\r
 import com.vaadin.ui.Layout;\r
 import com.vaadin.ui.VerticalLayout;\r
-import com.vaadin.ui.Label;\r
 \r
 public class AddComponentsTest {\r
 \r
-    Component[] children = new Component[] {\r
-            new Label("A"), new Label("B"), \r
+    Component[] children = new Component[] { new Label("A"), new Label("B"),\r
             new Label("C"), new Label("D") };\r
-    \r
+\r
     @Test\r
     public void moveComponentsBetweenLayouts() {\r
         AbstractOrderedLayout layout1 = new HorizontalLayout();\r
         AbstractOrderedLayout layout2 = new VerticalLayout();\r
- \r
+\r
         layout1.addComponent(children[0]);\r
         layout1.addComponent(children[1]);\r
-        \r
+\r
         layout2.addComponent(children[2]);\r
         layout2.addComponent(children[3]);\r
-        \r
+\r
         layout2.addComponent(children[1], 1);\r
         assertOrder(layout1, new int[] { 0 });\r
         assertOrder(layout2, new int[] { 2, 1, 3 });\r
-        \r
+\r
         layout1.addComponent(children[3], 0);\r
         assertOrder(layout1, new int[] { 3, 0 });\r
         assertOrder(layout2, new int[] { 2, 1 });\r
-        \r
+\r
         layout2.addComponent(children[0]);\r
         assertOrder(layout1, new int[] { 3 });\r
         assertOrder(layout2, new int[] { 2, 1, 0 });\r
-        \r
+\r
         layout1.addComponentAsFirst(children[1]);\r
         assertOrder(layout1, new int[] { 1, 3 });\r
         assertOrder(layout2, new int[] { 2, 0 });\r
     }\r
-    \r
+\r
     @Test\r
     public void shuffleChildComponents() {\r
         shuffleChildComponents(new HorizontalLayout());\r
         shuffleChildComponents(new VerticalLayout());\r
     }\r
-    \r
+\r
     private void shuffleChildComponents(AbstractOrderedLayout layout) {\r
-        \r
+\r
         for (int i = 0; i < children.length; ++i) {\r
             layout.addComponent(children[i], i);\r
         }\r
-        \r
+\r
         assertOrder(layout, new int[] { 0, 1, 2, 3 });\r
 \r
         // Move C from #2 to #1\r
         // Exhibits defect #7668\r
         layout.addComponent(children[2], 1);\r
         assertOrder(layout, new int[] { 0, 2, 1, 3 });\r
-        \r
+\r
         // Move C from #1 to #4 (which becomes #3 when #1 is erased)\r
         layout.addComponent(children[2], 4);\r
         assertOrder(layout, new int[] { 0, 1, 3, 2 });\r
-        \r
+\r
         // Keep everything in place\r
         layout.addComponent(children[1], 1);\r
         assertOrder(layout, new int[] { 0, 1, 3, 2 });\r
-        \r
+\r
         // Move D from #2 to #0\r
         layout.addComponent(children[3], 0);\r
         assertOrder(layout, new int[] { 3, 0, 1, 2 });\r
-        \r
+\r
         // Move A from #1 to end (#4 which becomes #3)\r
         layout.addComponent(children[0]);\r
         assertOrder(layout, new int[] { 3, 1, 2, 0 });\r
@@ -88,7 +87,7 @@ public class AddComponentsTest {
         // Keep everything in place\r
         layout.addComponent(children[0]);\r
         assertOrder(layout, new int[] { 3, 1, 2, 0 });\r
-        \r
+\r
         // Move C from #2 to #0\r
         layout.addComponentAsFirst(children[2]);\r
         assertOrder(layout, new int[] { 2, 3, 1, 0 });\r
@@ -99,17 +98,17 @@ public class AddComponentsTest {
     }\r
 \r
     /**\r
-     * Asserts that layout has the components in children\r
-     * in the order specified by indices.\r
+     * Asserts that layout has the components in children in the order specified\r
+     * by indices.\r
      */\r
     private void assertOrder(Layout layout, int[] indices) {\r
         Iterator<?> i = layout.getComponentIterator();\r
         try {\r
-            for(int index : indices) {\r
+            for (int index : indices) {\r
                 assertSame(children[index], i.next());\r
             }\r
             assertFalse("Too many components in layout", i.hasNext());\r
-        } catch(NoSuchElementException e) {\r
+        } catch (NoSuchElementException e) {\r
             fail("Too few components in layout");\r
         }\r
     }\r

diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
index 73c977694b2584011c26b926942b8a74530b3ec8..29657830e8be740761510d3fde4a5587e8185ccc 100644 (file)
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
@@ -9,7 +9,6 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertFalse;\r
 import static org.junit.Assert.fail;\r
 \r
-\r
 import com.vaadin.ui.Component;\r
 import com.vaadin.ui.CssLayout;\r
 import com.vaadin.ui.Label;\r
@@ -17,65 +16,64 @@ import com.vaadin.ui.Layout;
 \r
 public class AddComponentsTest {\r
 \r
-    private Component[] children = new Component[] {\r
-            new Label("A"), new Label("B"), \r
-            new Label("C"), new Label("D") };\r
-    \r
+    private Component[] children = new Component[] { new Label("A"),\r
+            new Label("B"), new Label("C"), new Label("D") };\r
+\r
     @Test\r
     public void moveComponentsBetweenLayouts() {\r
         CssLayout layout1 = new CssLayout();\r
         CssLayout layout2 = new CssLayout();\r
-        \r
+\r
         layout1.addComponent(children[0]);\r
         layout1.addComponent(children[1]);\r
-        \r
+\r
         layout2.addComponent(children[2]);\r
         layout2.addComponent(children[3]);\r
-        \r
+\r
         layout2.addComponent(children[1], 1);\r
         assertOrder(layout1, new int[] { 0 });\r
         assertOrder(layout2, new int[] { 2, 1, 3 });\r
-        \r
+\r
         layout1.addComponent(children[3], 0);\r
         assertOrder(layout1, new int[] { 3, 0 });\r
         assertOrder(layout2, new int[] { 2, 1 });\r
-        \r
+\r
         layout2.addComponent(children[0]);\r
         assertOrder(layout1, new int[] { 3 });\r
         assertOrder(layout2, new int[] { 2, 1, 0 });\r
-        \r
+\r
         layout1.addComponentAsFirst(children[1]);\r
         assertOrder(layout1, new int[] { 1, 3 });\r
         assertOrder(layout2, new int[] { 2, 0 });\r
     }\r
-    \r
+\r
     @Test\r
     public void shuffleChildComponents() {\r
         CssLayout layout = new CssLayout();\r
-        \r
+\r
         for (int i = 0; i < children.length; ++i) {\r
             layout.addComponent(children[i], i);\r
         }\r
-        \r
+\r
         assertOrder(layout, new int[] { 0, 1, 2, 3 });\r
 \r
         // Move C from #2 to #1\r
         // Exhibits defect #7668\r
         layout.addComponent(children[2], 1);\r
         assertOrder(layout, new int[] { 0, 2, 1, 3 });\r
-        \r
+\r
         // Move C from #1 to #4 (which becomes #3 when #1 is erased)\r
         layout.addComponent(children[2], 4);\r
         assertOrder(layout, new int[] { 0, 1, 3, 2 });\r
-        \r
+\r
         // Keep everything in place\r
         layout.addComponent(children[1], 1);\r
         assertOrder(layout, new int[] { 0, 1, 3, 2 });\r
-        \r
+\r
         // Move D from #2 to #0\r
         layout.addComponent(children[3], 0);\r
         assertOrder(layout, new int[] { 3, 0, 1, 2 });\r
-        \r
+\r
         // Move A from #1 to end (#4 which becomes #3)\r
         layout.addComponent(children[0]);\r
         assertOrder(layout, new int[] { 3, 1, 2, 0 });\r
@@ -83,7 +81,7 @@ public class AddComponentsTest {
         // Keep everything in place\r
         layout.addComponent(children[0]);\r
         assertOrder(layout, new int[] { 3, 1, 2, 0 });\r
-        \r
+\r
         // Move C from #2 to #0\r
         layout.addComponentAsFirst(children[2]);\r
         assertOrder(layout, new int[] { 2, 3, 1, 0 });\r
@@ -94,17 +92,17 @@ public class AddComponentsTest {
     }\r
 \r
     /**\r
-     * Asserts that layout has the components in children\r
-     * in the order specified by indices.\r
+     * Asserts that layout has the components in children in the order specified\r
+     * by indices.\r
      */\r
     private void assertOrder(Layout layout, int[] indices) {\r
         Iterator<?> i = layout.getComponentIterator();\r
         try {\r
-            for(int index : indices) {\r
+            for (int index : indices) {\r
                 assertSame(children[index], i.next());\r
             }\r
             assertFalse("Too many components in layout", i.hasNext());\r
-        } catch(NoSuchElementException e) {\r
+        } catch (NoSuchElementException e) {\r
             fail("Too few components in layout");\r
         }\r
     }\r