Move ProgressBar/ProgressIndicator to compatibility package

Change-Id: I9d8ef17fc4bd903ad6c4e258b800b72029e507fd

26 files changed, 33 insertions, 32 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
index 6cd7e6105e..1fd9a2f985 100644
--- a/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
@@ -21,7 +21,7 @@ import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.client.ui.VProgressBar;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.progressindicator.ProgressBarState;
-import com.vaadin.ui.ProgressBar;
+import com.vaadin.v7.ui.ProgressBar;
 
 /**
  * Connector for {@link VProgressBar}.
diff --git a/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
index 8e5626fb6e..ff4802d2f3 100644
--- a/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
@@ -23,7 +23,7 @@ import com.vaadin.client.ui.VProgressIndicator;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState;
-import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 /**
  * Connector for {@link VProgressBar} with polling support.
diff --git a/server/src/main/java/com/vaadin/ui/ProgressBar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
index 8a29176e55..444724fcf8 100644
--- a/server/src/main/java/com/vaadin/ui/ProgressBar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
diff --git a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
index d0f1ae164b..8a969f96c3 100644
--- a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
@@ -14,11 +14,12 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState;
+import com.vaadin.ui.UI;
 import com.vaadin.v7.data.Property;
 
 /**
diff --git a/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
index f3627f234f..6d551561af 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.progressbar;
+package com.vaadin.v7.tests.server.component.progressbar;
 
 import org.junit.Test;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.ProgressBar;
+import com.vaadin.v7.ui.ProgressBar;
 
 /**
  * Test cases for reading the properties of selection components.
@@ -29,7 +29,7 @@ public class ProgressBarDeclarativeTest
         extends DeclarativeTestBase<ProgressBar> {
 
     public String getBasicDesign() {
-        return "<vaadin-progress-bar value=0.5 indeterminate>";
+        return "<vaadin7-progress-bar value=0.5 indeterminate>";
     }
 
     public ProgressBar getBasicExpected() {
@@ -51,17 +51,17 @@ public class ProgressBarDeclarativeTest
 
     @Test
     public void testReadEmpty() {
-        testRead("<vaadin-progress-bar>", new ProgressBar());
+        testRead("<vaadin7-progress-bar>", new ProgressBar());
     }
 
     @Test
     public void testWriteEmpty() {
-        testWrite("<vaadin-progress-bar>", new ProgressBar());
+        testWrite("<vaadin7-progress-bar>", new ProgressBar());
     }
 
     @Test
     public void testReadOnlyValue() {
-        String design = "<vaadin-progress-bar readonly value=0.5 indeterminate>";
+        String design = "<vaadin7-progress-bar readonly value=0.5 indeterminate>";
         ProgressBar progressBar = new ProgressBar();
         progressBar.setIndeterminate(true);
         progressBar.setValue(0.5f);
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java
index 7aaaf954d2..15eafb76da 100644
--- a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java
+++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java
@@ -20,7 +20,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elementsbase.ServerClass;
 
-@ServerClass("com.vaadin.ui.ProgressBar")
+@ServerClass("com.vaadin.v7.ui.ProgressBar")
 public class ProgressBarElement
         extends com.vaadin.testbench.elements.ProgressBarElement {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index aa1ec78c5b..43960ef70c 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -33,7 +33,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.Slider;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Upload;
@@ -41,6 +40,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.Select;
 import com.vaadin.v7.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index 24b19e1ac2..7811deac27 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -35,7 +35,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FailedEvent;
 import com.vaadin.ui.Upload.FailedListener;
@@ -47,6 +46,7 @@ import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 public class TestForStyledUpload extends LegacyApplication
         implements Upload.FinishedListener, FailedListener, SucceededListener,
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index 1d4434d63e..c494f0ab16 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -38,7 +38,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.StartedEvent;
@@ -47,6 +46,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Select;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
index 4608fe14b1..ac24814e9c 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
@@ -27,7 +27,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Link;
-import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 public class NavigateWithOngoingXHR extends AbstractTestUI {
     private final RequestHandler slowRequestHandler = new RequestHandler() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
index 39329d7341..ffb8e33361 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
@@ -9,9 +9,9 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.ProgressBar;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
index 0f0a460bcf..7e3c493c2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
@@ -13,9 +13,9 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.TextField;
 
 public class ComboPushTiming extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
index 470f793a04..e83a9d054e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.progressindicator;
 import java.util.LinkedHashMap;
 
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
-import com.vaadin.ui.ProgressBar;
+import com.vaadin.v7.ui.ProgressBar;
 
 public class ProgressBarGenericTest
         extends LegacyAbstractFieldTest<ProgressBar> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
index b55d489c41..108d8cf9a7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.progressindicator;
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.ProgressBar;
 
 @Theme(Reindeer.THEME_NAME)
 public class ProgressBarStaticReindeer extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
index 799780dea1..457d7571b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.progressindicator;
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.ProgressBar;
 
 @Theme(Runo.THEME_NAME)
 public class ProgressBarStaticRuno extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
index d3c06d0d81..68dfa767a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
@@ -20,9 +20,9 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.ProgressBar;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.ProgressBar;
-import com.vaadin.ui.ProgressIndicator;
 
 public class ProgressBarTest extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 6bb9c73411..6d507315af 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.ui.VerticalLayout;
 
 public class ProgressIndicatorInvisible extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
index 7a3c27cfa1..c8480d2898 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.components.progressindicator;
 import java.util.LinkedHashMap;
 
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
-import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 public class ProgressIndicatorTest
         extends LegacyAbstractFieldTest<ProgressIndicator> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
index bc05f88235..4c264d42f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.richtextarea;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.RichTextArea;
 
 public class RichTextAreaUpdateWhileTyping extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
index 81997b24f3..02ed9fc8ef 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.slider;
 import com.vaadin.data.Binder;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.Slider;
 import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.ProgressBar;
 
 public class SliderValueFromDataSource extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index 58b535ef21..5c4e7be94b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.event.Action;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Table;
 
 public class RowUpdateShouldRetainContextMenu extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 38e3fae34c..4d13033f93 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Table;
 
 public class TableFirstRowFlicker extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
index 9383dba80f..f90a4b7075 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.window;
 
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 public class SubWindowPositionUpdate extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index a0c9bfaf75..745deab308 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -7,13 +7,13 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.ComponentContainer;
-import com.vaadin.ui.ProgressIndicator;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
 import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 // author table in testdb (MySQL) is set out as follows
 // +-------------+-------------+------+-----+---------+----------------+
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
index 58a66f37b8..9c1e4705e9 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
@@ -20,10 +20,10 @@ import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.shared.ui.slider.SliderOrientation;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.Slider;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.ProgressBar;
 
 public class Sliders extends VerticalLayout implements View {
     public Sliders() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
index 032dd55039..daf330bc4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
@@ -28,13 +28,13 @@ import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.ProgressBar;
 import com.vaadin.ui.Slider;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.ProgressBar;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
 import com.vaadin.v7.ui.Table.ColumnGenerator;