Reformat project

7 files changed, 10 insertions, 10 deletions

diff --git a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index b584cdb5cf..fecac38697 100644
--- a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
@@ -4,8 +4,8 @@ import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase {
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 9f2715a09b..4e6a4fb02a 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
@@ -15,8 +15,8 @@ import com.vaadin.ui.Form;
 import com.vaadin.ui.FormFieldFactory;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class GridLayoutCaptions extends TestBase {
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index acc5f07103..47c445bb86 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class GridLayoutExpandRatioModification extends TestBase implements
diff --git a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 87ce80d4f7..0914726b75 100644
--- a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
@@ -75,12 +75,12 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase {
                         cc.setVisible(!cc.isVisible());
                         if (!cc.isVisible()) {
                             getLayout().addComponent(lab);
-                            lab.setValue(((String) lab.getValue()).replace(
-                                    "inside", "outside"));
+                            lab.setValue(lab.getValue().replace("inside",
+                                    "outside"));
                         } else {
                             cc.addComponent(lab);
-                            lab.setValue(((String) lab.getValue()).replace(
-                                    "outside", "inside"));
+                            lab.setValue(lab.getValue().replace("outside",
+                                    "inside"));
                         }
                     }
                 });
diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 44f40a7d78..d1a924e71c 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -13,9 +13,9 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class TestLayoutClickListeners extends AbstractTestCase {
diff --git a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 8786ae282c..a5c392765b 100644
--- a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.layouts;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Layout;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Tree;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class TreeWithBordersInLayout extends AbstractTestCase {
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index ef24150762..48c0222337 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -5,8 +5,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class VerticalLayoutExpandRatioModification extends TestBase implements