Move and duplicate client side and state to compatibility package

* ProgressBar
* ProgressIndicator
* OptionGroup
* Table
* Tree
* TreeTable

Change-Id: Ie1249631cbdd2721f2c3a36e1b8ffc8160fca6aa

17 files changed, 27 insertions, 27 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index e30d666ea0..f522cef77a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -44,7 +44,6 @@ import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.select.AbstractSelectState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
@@ -60,6 +59,7 @@ import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
index f4e3415cf5..c85e0ff631 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
@@ -30,11 +30,11 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 
 /**
  * Configures select to be used as an option group.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
index 444724fcf8..62074a69db 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
@@ -18,10 +18,10 @@ package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.v7.ui.AbstractField;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
index 8a969f96c3..1f3feb99ed 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
@@ -17,10 +17,10 @@
 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;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState;
 
 /**
  * A {@link ProgressBar} which polls the server for updates.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index d47f5479f4..33b74df857 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -54,11 +54,6 @@ import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.shared.ui.table.CollapseMenuContent;
-import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.shared.ui.table.TableConstants.Section;
-import com.vaadin.shared.ui.table.TableServerRpc;
-import com.vaadin.shared.ui.table.TableState;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HasChildMeasurementHint;
@@ -80,6 +75,11 @@ import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
+import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
+import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableServerRpc;
+import com.vaadin.v7.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 /**
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index 5744879ea6..87917ffa53 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -51,9 +51,6 @@ import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.shared.ui.tree.TreeServerRpc;
-import com.vaadin.shared.ui.tree.TreeState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
@@ -67,6 +64,9 @@ import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
+import com.vaadin.v7.shared.ui.tree.TreeConstants;
+import com.vaadin.v7.shared.ui.tree.TreeServerRpc;
+import com.vaadin.v7.shared.ui.tree.TreeState;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
index 446c9c271c..f9a35f2b46 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
@@ -33,8 +33,6 @@ import org.jsoup.nodes.Element;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
-import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.shared.ui.treetable.TreeTableState;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
@@ -45,6 +43,8 @@ import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.v7.shared.ui.treetable.TreeTableConstants;
+import com.vaadin.v7.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.Tree.CollapseEvent;
 import com.vaadin.v7.ui.Tree.CollapseListener;
 import com.vaadin.v7.ui.Tree.ExpandEvent;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
index 68853ddaa1..4766d938ea 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
@@ -20,9 +20,9 @@ import java.util.Collection;
 
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectConstants;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
 
 /**
  * Multiselect component with two lists: left side for available items and right
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
index cc1c9f8d27..14f03739d1 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.abstractselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.ui.AbstractSelect;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
index 8a34077e73..d9e31e6bc1 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.listselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.ui.ListSelect;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
index f15c3aeb1e..85aff22711 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.optiongroup;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.v7.ui.OptionGroup;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
index 162d57c0da..5f9f19f19d 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ContextClickEvent.ContextClickListener;
-import com.vaadin.shared.ui.table.TableConstants.Section;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.ui.Table;
 
 public class TableContextClickTest extends Table {
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
index 2c993fe03f..f61a027c0a 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.table;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableState;
 import com.vaadin.v7.ui.Table;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
index 04673af2bd..4f4bdead4e 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
@@ -12,10 +12,10 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.tree.TreeState;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.shared.ui.tree.TreeState;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeTest {
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
index a6948256df..08e77db859 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
@@ -20,8 +20,8 @@ import java.util.EnumSet;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.TreeTable;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
index 7479d3f8e6..d2498d9160 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.twincolselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.ui.TwinColSelect;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
index a5ff142490..5accba796d 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
@@ -20,8 +20,8 @@ import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 
 public class NativeSelectTest {