Move shared classes to a temporary subpackage

Change-Id: I50079477ed8424ee8263a403a5446897717b2ff5

22 files changed, 30 insertions, 32 deletions

diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java
index ceff1467b2..246ad67292 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java
@@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.ListBox;
 import com.vaadin.client.data.DataChangeHandler;
 import com.vaadin.client.data.DataSource;
 import com.vaadin.client.tokka.connectors.data.HasSelection;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.tokka.ui.components.nativeselect.NativeSelect;
 
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java
index d5159f8ec9..c32db624fc 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java
@@ -19,9 +19,9 @@ import com.vaadin.client.ServerConnector;
 import com.vaadin.client.annotations.OnStateChange;
 import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.client.widgets.Grid.Column;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
+import com.vaadin.shared.tokka.ui.components.grid.ColumnState;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.components.grid.ColumnState;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataCommunicatorConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataCommunicatorConnector.java
index 82fd64a954..4563663af2 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataCommunicatorConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataCommunicatorConnector.java
@@ -25,8 +25,8 @@ import com.vaadin.client.data.AbstractRemoteDataSource;
 import com.vaadin.client.data.DataSource;
 import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.data.DataRequestRpc;
-import com.vaadin.shared.data.typed.DataCommunicatorClientRpc;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataCommunicatorClientRpc;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.tokka.server.communication.data.DataCommunicator;
 
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java
index 7b620ff06f..65aff80226 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java
@@ -21,10 +21,10 @@ import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.user.client.ui.TextBox;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.shared.tokka.ui.components.fields.DateFieldServerRpc;
+import com.vaadin.shared.tokka.ui.components.fields.DateFieldState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.shared.ui.components.field.DateFieldServerRpc;
-import com.vaadin.shared.ui.components.field.DateFieldState;
 
 @Connect(value = com.vaadin.tokka.ui.components.fields.DateField.class, loadStyle = LoadStyle.EAGER)
 public class DateFieldConnector extends AbstractComponentConnector {
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java
index 75f20863eb..0af17e7f04 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java
@@ -23,10 +23,10 @@ import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.TextBox;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.shared.tokka.ui.components.fields.TextFieldServerRpc;
+import com.vaadin.shared.tokka.ui.components.fields.TextFieldState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.shared.ui.components.fields.TextFieldServerRpc;
-import com.vaadin.shared.ui.components.fields.TextFieldState;
 
 @Connect(value = com.vaadin.tokka.ui.components.fields.TextField.class, loadStyle = LoadStyle.EAGER)
 public class TextFieldConnector extends AbstractComponentConnector {
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java
index dd4396aaa5..96debf1e32 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java
@@ -20,7 +20,7 @@ import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.client.tokka.connectors.components.AbstractListingConnector;
 import com.vaadin.client.tokka.connectors.data.HasSelection;
 import com.vaadin.client.tokka.data.selection.SelectionModel;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 
 import elemental.json.JsonObject;
 
diff --git a/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java
index 60adcd7600..5f228b17a4 100644
--- a/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java
+++ b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java
@@ -15,13 +15,11 @@
  */
 package com.vaadin.client.tokka.connectors.selection;
 
-import java.util.logging.Logger;
-
 import com.vaadin.client.ServerConnector;
 import com.vaadin.client.tokka.connectors.components.AbstractListingConnector;
 import com.vaadin.client.tokka.data.selection.SelectionModel;
 import com.vaadin.client.tokka.data.selection.SelectionModel.Single;
-import com.vaadin.shared.data.selection.SelectionServerRpc;
+import com.vaadin.shared.tokka.data.selection.SelectionServerRpc;
 import com.vaadin.shared.ui.Connect;
 
 import elemental.json.JsonObject;
diff --git a/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java
index c347c82cdc..5e88b15d78 100644
--- a/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java
+++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java
@@ -16,7 +16,7 @@
 package com.vaadin.tokka.server.communication.data;
 
 import com.vaadin.server.AbstractClientConnector;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 import com.vaadin.tokka.ui.components.AbstractListing.AbstractListingExtension;
 import com.vaadin.tokka.ui.components.Listing;
 import com.vaadin.ui.Component;
diff --git a/server/src/main/java/com/vaadin/tokka/server/communication/data/DataCommunicator.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataCommunicator.java
index 24cb803306..d840193bd1 100644
--- a/server/src/main/java/com/vaadin/tokka/server/communication/data/DataCommunicator.java
+++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataCommunicator.java
@@ -26,8 +26,8 @@ import java.util.stream.Stream;
 
 import com.vaadin.server.AbstractExtension;
 import com.vaadin.shared.data.DataRequestRpc;
-import com.vaadin.shared.data.typed.DataCommunicatorClientRpc;
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataCommunicatorClientRpc;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 import com.vaadin.shared.ui.grid.Range;
 import com.vaadin.tokka.event.Registration;
 
diff --git a/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java
index ba11fbb617..f12ec1476d 100644
--- a/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java
+++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java
@@ -18,7 +18,7 @@ package com.vaadin.tokka.server.communication.data;
 import java.util.Collection;
 import java.util.Collections;
 
-import com.vaadin.shared.data.selection.SelectionServerRpc;
+import com.vaadin.shared.tokka.data.selection.SelectionServerRpc;
 import com.vaadin.tokka.event.Handler;
 import com.vaadin.tokka.event.Registration;
 import com.vaadin.tokka.server.communication.data.SelectionModel.Single;
diff --git a/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java
index 64d61e495d..9184ece16a 100644
--- a/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java
+++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java
@@ -26,8 +26,8 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.shared.ui.components.fields.TextFieldServerRpc;
-import com.vaadin.shared.ui.components.fields.TextFieldState;
+import com.vaadin.shared.tokka.ui.components.fields.TextFieldServerRpc;
+import com.vaadin.shared.tokka.ui.components.fields.TextFieldState;
 import com.vaadin.tokka.event.Event;
 import com.vaadin.tokka.event.Handler;
 import com.vaadin.tokka.event.Registration;
diff --git a/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java
index d619fd1b7f..151697dbb2 100644
--- a/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java
+++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java
@@ -23,8 +23,8 @@ import org.jsoup.nodes.Element;
 
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.shared.ui.components.field.DateFieldServerRpc;
-import com.vaadin.shared.ui.components.field.DateFieldState;
+import com.vaadin.shared.tokka.ui.components.fields.DateFieldServerRpc;
+import com.vaadin.shared.tokka.ui.components.fields.DateFieldState;
 import com.vaadin.tokka.event.Event;
 import com.vaadin.tokka.event.Handler;
 import com.vaadin.tokka.event.Registration;
diff --git a/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java
index 29b016fbd2..9957fce4b2 100644
--- a/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java
+++ b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java
@@ -18,8 +18,8 @@ package com.vaadin.tokka.ui.components.grid;
 import java.util.function.Function;
 
 import com.vaadin.server.AbstractExtension;
-import com.vaadin.shared.data.typed.DataProviderConstants;
-import com.vaadin.shared.ui.components.grid.ColumnState;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
+import com.vaadin.shared.tokka.ui.components.grid.ColumnState;
 import com.vaadin.tokka.server.communication.data.TypedDataGenerator;
 
 import elemental.json.Json;
diff --git a/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java b/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java
index 0c18f78287..19bad4d702 100644
--- a/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java
@@ -17,7 +17,7 @@ package com.vaadin.tokka.ui.components.nativeselect;
 
 import java.util.function.Function;
 
-import com.vaadin.shared.data.typed.DataProviderConstants;
+import com.vaadin.shared.tokka.data.DataProviderConstants;
 import com.vaadin.tokka.server.communication.data.DataCommunicator;
 import com.vaadin.tokka.server.communication.data.DataSource;
 import com.vaadin.tokka.server.communication.data.SingleSelection;
diff --git a/shared/src/main/java/com/vaadin/shared/data/typed/DataCommunicatorClientRpc.java b/shared/src/main/java/com/vaadin/shared/tokka/data/DataCommunicatorClientRpc.java
index d5b09bbda2..8dab7732bb 100644
--- a/shared/src/main/java/com/vaadin/shared/data/typed/DataCommunicatorClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/data/DataCommunicatorClientRpc.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.data.typed;
+package com.vaadin.shared.tokka.data;
 
 import com.vaadin.shared.communication.ClientRpc;
 import elemental.json.JsonArray;
diff --git a/shared/src/main/java/com/vaadin/shared/data/typed/DataProviderConstants.java b/shared/src/main/java/com/vaadin/shared/tokka/data/DataProviderConstants.java
index 1fba68b310..7e0d966f9c 100644
--- a/shared/src/main/java/com/vaadin/shared/data/typed/DataProviderConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/data/DataProviderConstants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.data.typed;
+package com.vaadin.shared.tokka.data;
 
 import java.io.Serializable;
 
diff --git a/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java b/shared/src/main/java/com/vaadin/shared/tokka/data/selection/SelectionServerRpc.java
index 12707c0e65..6e36071706 100644
--- a/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/data/selection/SelectionServerRpc.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.data.selection;
+package com.vaadin.shared.tokka.data.selection;
 
 import com.vaadin.shared.communication.ServerRpc;
 
diff --git a/shared/src/main/java/com/vaadin/shared/ui/components/field/DateFieldServerRpc.java b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/DateFieldServerRpc.java
index 9e2e9328a1..179f6531d7 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/components/field/DateFieldServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/DateFieldServerRpc.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.shared.ui.components.field;
+package com.vaadin.shared.tokka.ui.components.fields;
 
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 
diff --git a/shared/src/main/java/com/vaadin/shared/ui/components/field/DateFieldState.java b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/DateFieldState.java
index 525e21d694..f030a2b40f 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/components/field/DateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/DateFieldState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.components.field;
+package com.vaadin.shared.tokka.ui.components.fields;
 
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.NoLayout;
diff --git a/shared/src/main/java/com/vaadin/shared/ui/components/fields/TextFieldServerRpc.java b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/TextFieldServerRpc.java
index 679aba3430..8f7630df8f 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/components/fields/TextFieldServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/TextFieldServerRpc.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.shared.ui.components.fields;
+package com.vaadin.shared.tokka.ui.components.fields;
 
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 
diff --git a/shared/src/main/java/com/vaadin/shared/ui/components/fields/TextFieldState.java b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/TextFieldState.java
index 07848388c8..13390f290b 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/components/fields/TextFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/fields/TextFieldState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.components.fields;
+package com.vaadin.shared.tokka.ui.components.fields;
 
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.NoLayout;
diff --git a/shared/src/main/java/com/vaadin/shared/ui/components/grid/ColumnState.java b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/grid/ColumnState.java
index 370a85ecc8..fece9ac1d7 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/components/grid/ColumnState.java
+++ b/shared/src/main/java/com/vaadin/shared/tokka/ui/components/grid/ColumnState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.shared.ui.components.grid;
+package com.vaadin.shared.tokka.ui.components.grid;
 
 import com.vaadin.shared.communication.SharedState;