From aa3196b8eee8a5d1182c5c0420efbaf15a8a6c9f Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Fri, 8 Jul 2016 13:39:27 +0300 Subject: [PATCH] Move new files under temporary package names Change-Id: I79b456f49c81b5709bece92b8735d4a5e223174d --- .../com/vaadin/client/connectors/GridConnector.java | 2 +- .../components/AbstractListingConnector.java | 6 +++--- .../connectors/components/CheckBoxConnector.java | 4 ++-- .../connectors/components/NativeSelectConnector.java | 8 +++----- .../connectors/components/grid/ColumnConnector.java | 4 ++-- .../connectors/components/grid/GridConnector.java | 10 +++++----- .../connectors/data/DataSourceConnector.java | 4 ++-- .../{ => tokka}/connectors/data/HasDataSource.java | 2 +- .../{ => tokka}/connectors/data/HasSelection.java | 4 ++-- .../connectors/fields/DateFieldConnector.java | 9 ++++----- .../connectors/fields/TextFieldConnector.java | 4 ++-- .../selection/AbstractSelectionConnector.java | 8 ++++---- .../selection/SingleSelectionConnector.java | 10 +++++----- .../{ => tokka}/data/selection/SelectionModel.java | 2 +- .../com/vaadin/server/AbstractClientConnector.java | 6 +++--- .../vaadin/{event/typed => tokka/event}/Event.java | 2 +- .../vaadin/{event/typed => tokka/event}/Handler.java | 2 +- .../{event/typed => tokka/event}/Registration.java | 2 +- .../vaadin/{ => tokka}/server/ListingExtension.java | 5 +++-- .../communication/data}/AbstractDataSource.java | 4 ++-- .../communication/data}/AbstractSelectionModel.java | 10 +++------- .../server/communication/data}/Binder.java | 6 +++--- .../communication/data}/DataChangeHandler.java | 2 +- .../server/communication/data}/DataKeyMapper.java | 2 +- .../server/communication/data}/DataProvider.java | 5 ++--- .../server/communication/data}/DataSource.java | 4 ++-- .../server/communication/data}/KeyMapper.java | 2 +- .../server/communication/data}/ListDataSource.java | 2 +- .../server/communication/data}/SelectionModel.java | 10 +++++----- .../communication/data}/SimpleDataProvider.java | 2 +- .../server/communication/data}/SingleSelection.java | 12 ++++++------ .../communication/data}/TypedDataGenerator.java | 2 +- .../{ => tokka}/ui/components/AbstractListing.java | 12 +++++------- .../vaadin/{ => tokka}/ui/components/HasValue.java | 6 +++--- .../vaadin/{ => tokka}/ui/components/Listing.java | 6 +++--- .../ui/components/fields/AbstractTextField.java | 10 +++++----- .../{ => tokka}/ui/components/fields/CheckBox.java | 10 +++++----- .../ui/components/fields}/DateField.java | 11 +++++------ .../{ => tokka}/ui/components/fields/TextField.java | 2 +- .../{ => tokka}/ui/components/grid/Column.java | 4 ++-- .../vaadin/{ => tokka}/ui/components/grid/Grid.java | 10 +++++----- .../ui/components/nativeselect/NativeSelect.java | 12 ++++++------ .../data/datasource/ListDataSourceTest.java | 8 ++++---- .../ui/components/AbstractListingTest.java | 11 ++++++----- .../tests/components}/CheckBoxTestUI.java | 8 ++++---- .../tests/components}/ListingTestUI.java | 10 +++++----- 46 files changed, 134 insertions(+), 143 deletions(-) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/components/AbstractListingConnector.java (92%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/components/CheckBoxConnector.java (98%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/components/NativeSelectConnector.java (95%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/components/grid/ColumnConnector.java (94%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/components/grid/GridConnector.java (92%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/data/DataSourceConnector.java (98%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/data/HasDataSource.java (95%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/data/HasSelection.java (90%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/fields/DateFieldConnector.java (88%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/fields/TextFieldConnector.java (95%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/selection/AbstractSelectionConnector.java (90%) rename client/src/main/java/com/vaadin/client/{ => tokka}/connectors/selection/SingleSelectionConnector.java (87%) rename client/src/main/java/com/vaadin/client/{ => tokka}/data/selection/SelectionModel.java (96%) rename server/src/main/java/com/vaadin/{event/typed => tokka/event}/Event.java (98%) rename server/src/main/java/com/vaadin/{event/typed => tokka/event}/Handler.java (97%) rename server/src/main/java/com/vaadin/{event/typed => tokka/event}/Registration.java (96%) rename server/src/main/java/com/vaadin/{ => tokka}/server/ListingExtension.java (85%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/AbstractDataSource.java (96%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/AbstractSelectionModel.java (86%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/Binder.java (97%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/DataChangeHandler.java (96%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/DataKeyMapper.java (96%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/DataProvider.java (98%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/DataSource.java (96%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/KeyMapper.java (94%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/ListDataSource.java (97%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/SelectionModel.java (91%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/SimpleDataProvider.java (98%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/SingleSelection.java (91%) rename server/src/main/java/com/vaadin/{server/communication/data/typed => tokka/server/communication/data}/TypedDataGenerator.java (96%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/AbstractListing.java (93%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/HasValue.java (92%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/Listing.java (92%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/fields/AbstractTextField.java (97%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/fields/CheckBox.java (96%) rename server/src/main/java/com/vaadin/{ui/components/field => tokka/ui/components/fields}/DateField.java (93%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/fields/TextField.java (98%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/grid/Column.java (94%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/grid/Grid.java (85%) rename server/src/main/java/com/vaadin/{ => tokka}/ui/components/nativeselect/NativeSelect.java (83%) rename server/src/test/java/com/vaadin/{ => tokka}/data/datasource/ListDataSourceTest.java (90%) rename server/src/test/java/com/vaadin/{ => tokka}/ui/components/AbstractListingTest.java (84%) rename uitest/src/main/java/com/vaadin/{tests/databinding => tokka/tests/components}/CheckBoxTestUI.java (88%) rename uitest/src/main/java/com/vaadin/{tests/databinding => tokka/tests/components}/ListingTestUI.java (92%) diff --git a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java index f53d9c9d04..1ac21149f3 100644 --- a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java @@ -99,7 +99,7 @@ import elemental.json.JsonValue; /** * Connects the client side {@link Grid} widget with the server side - * {@link com.vaadin.ui.components.grid.Grid} component. + * {@link com.vaadin.ui.Grid} component. *

* The Grid is typed to JSONObject. The structure of the JSONObject is described * at {@link com.vaadin.shared.data.DataProviderRpc#setRowData(int, List) diff --git a/client/src/main/java/com/vaadin/client/connectors/components/AbstractListingConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/AbstractListingConnector.java similarity index 92% rename from client/src/main/java/com/vaadin/client/connectors/components/AbstractListingConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/components/AbstractListingConnector.java index 51b29a26b2..bed707284c 100644 --- a/client/src/main/java/com/vaadin/client/connectors/components/AbstractListingConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/AbstractListingConnector.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.components; +package com.vaadin.client.tokka.connectors.components; -import com.vaadin.client.connectors.data.HasSelection; import com.vaadin.client.data.DataSource; -import com.vaadin.client.data.selection.SelectionModel; +import com.vaadin.client.tokka.connectors.data.HasSelection; +import com.vaadin.client.tokka.data.selection.SelectionModel; import com.vaadin.client.ui.AbstractComponentConnector; import elemental.json.JsonObject; diff --git a/client/src/main/java/com/vaadin/client/connectors/components/CheckBoxConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/CheckBoxConnector.java similarity index 98% rename from client/src/main/java/com/vaadin/client/connectors/components/CheckBoxConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/components/CheckBoxConnector.java index a17241912e..955ef5f70a 100644 --- a/client/src/main/java/com/vaadin/client/connectors/components/CheckBoxConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/CheckBoxConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.components; +package com.vaadin.client.tokka.connectors.components; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.event.dom.client.ClickEvent; @@ -34,7 +34,7 @@ import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; import com.vaadin.shared.ui.checkbox.CheckBoxState; -import com.vaadin.ui.components.fields.CheckBox; +import com.vaadin.tokka.ui.components.fields.CheckBox; @Connect(CheckBox.class) public class CheckBoxConnector extends AbstractFieldConnector implements diff --git a/client/src/main/java/com/vaadin/client/connectors/components/NativeSelectConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java similarity index 95% rename from client/src/main/java/com/vaadin/client/connectors/components/NativeSelectConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java index a67565ac48..e86c3ce4ec 100644 --- a/client/src/main/java/com/vaadin/client/connectors/components/NativeSelectConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/NativeSelectConnector.java @@ -13,21 +13,19 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.components; +package com.vaadin.client.tokka.connectors.components; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.user.client.ui.ListBox; -import com.vaadin.client.connectors.data.HasSelection; import com.vaadin.client.data.DataChangeHandler; import com.vaadin.client.data.DataSource; -import com.vaadin.client.data.selection.SelectionModel; -import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.tokka.connectors.data.HasSelection; import com.vaadin.shared.data.typed.DataProviderConstants; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.components.nativeselect.NativeSelect; +import com.vaadin.tokka.ui.components.nativeselect.NativeSelect; import elemental.json.JsonObject; diff --git a/client/src/main/java/com/vaadin/client/connectors/components/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java similarity index 94% rename from client/src/main/java/com/vaadin/client/connectors/components/grid/ColumnConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java index 6eeb6247e2..d5159f8ec9 100644 --- a/client/src/main/java/com/vaadin/client/connectors/components/grid/ColumnConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/ColumnConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.components.grid; +package com.vaadin.client.tokka.connectors.components.grid; import com.vaadin.client.ServerConnector; import com.vaadin.client.annotations.OnStateChange; @@ -26,7 +26,7 @@ import com.vaadin.shared.ui.components.grid.ColumnState; import elemental.json.JsonObject; import elemental.json.JsonValue; -@Connect(com.vaadin.ui.components.grid.Column.class) +@Connect(com.vaadin.tokka.ui.components.grid.Column.class) public class ColumnConnector extends AbstractExtensionConnector { private Column column; diff --git a/client/src/main/java/com/vaadin/client/connectors/components/grid/GridConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/GridConnector.java similarity index 92% rename from client/src/main/java/com/vaadin/client/connectors/components/grid/GridConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/GridConnector.java index 89edb56605..527cf4d9c9 100644 --- a/client/src/main/java/com/vaadin/client/connectors/components/grid/GridConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/components/grid/GridConnector.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.components.grid; +package com.vaadin.client.tokka.connectors.components.grid; import java.util.Collection; -import com.vaadin.client.connectors.components.AbstractListingConnector; -import com.vaadin.client.connectors.data.HasSelection; import com.vaadin.client.data.DataSource; -import com.vaadin.client.data.selection.SelectionModel; import com.vaadin.client.renderers.Renderer; +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.client.widget.grid.selection.ClickSelectHandler; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.Column; @@ -29,7 +29,7 @@ import com.vaadin.shared.ui.Connect; import elemental.json.JsonObject; -@Connect(com.vaadin.ui.components.grid.Grid.class) +@Connect(com.vaadin.tokka.ui.components.grid.Grid.class) public class GridConnector extends AbstractListingConnector implements HasSelection { diff --git a/client/src/main/java/com/vaadin/client/connectors/data/DataSourceConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataSourceConnector.java similarity index 98% rename from client/src/main/java/com/vaadin/client/connectors/data/DataSourceConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/data/DataSourceConnector.java index 5a559dfafa..9e95c8bdad 100644 --- a/client/src/main/java/com/vaadin/client/connectors/data/DataSourceConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/data/DataSourceConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.data; +package com.vaadin.client.tokka.connectors.data; import java.util.HashMap; import java.util.HashSet; @@ -26,11 +26,11 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.vaadin.client.ServerConnector; import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.client.widget.grid.datasources.ListDataSource; -import com.vaadin.server.communication.data.typed.SimpleDataProvider; import com.vaadin.shared.data.DataRequestRpc; import com.vaadin.shared.data.typed.DataProviderClientRpc; import com.vaadin.shared.data.typed.DataProviderConstants; import com.vaadin.shared.ui.Connect; +import com.vaadin.tokka.server.communication.data.SimpleDataProvider; import elemental.json.Json; import elemental.json.JsonArray; diff --git a/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java b/client/src/main/java/com/vaadin/client/tokka/connectors/data/HasDataSource.java similarity index 95% rename from client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/data/HasDataSource.java index 9aca5a25aa..39afe74ff1 100644 --- a/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/data/HasDataSource.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.data; +package com.vaadin.client.tokka.connectors.data; import com.vaadin.client.data.DataSource; diff --git a/client/src/main/java/com/vaadin/client/connectors/data/HasSelection.java b/client/src/main/java/com/vaadin/client/tokka/connectors/data/HasSelection.java similarity index 90% rename from client/src/main/java/com/vaadin/client/connectors/data/HasSelection.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/data/HasSelection.java index 6eb298006d..dbc2e61440 100644 --- a/client/src/main/java/com/vaadin/client/connectors/data/HasSelection.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/data/HasSelection.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.data; +package com.vaadin.client.tokka.connectors.data; -import com.vaadin.client.data.selection.SelectionModel; +import com.vaadin.client.tokka.data.selection.SelectionModel; /** * Marker interface for Connectors that have a SelectionModel. diff --git a/client/src/main/java/com/vaadin/client/connectors/fields/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java similarity index 88% rename from client/src/main/java/com/vaadin/client/connectors/fields/DateFieldConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java index e07e66a3a5..7b620ff06f 100644 --- a/client/src/main/java/com/vaadin/client/connectors/fields/DateFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/DateFieldConnector.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.connectors.fields; +package com.vaadin.client.tokka.connectors.fields; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; @@ -26,7 +26,7 @@ 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.ui.components.field.DateField.class, loadStyle = LoadStyle.EAGER) +@Connect(value = com.vaadin.tokka.ui.components.fields.DateField.class, loadStyle = LoadStyle.EAGER) public class DateFieldConnector extends AbstractComponentConnector { @Override @@ -37,10 +37,9 @@ public class DateFieldConnector extends AbstractComponentConnector { public void onChange(ChangeEvent event) { String value = getWidget().getValue(); value = (value == null) ? "" : value.trim(); - //TODO validation + // TODO validation - getRpcProxy(DateFieldServerRpc.class) - .setDate(value); + getRpcProxy(DateFieldServerRpc.class).setDate(value); } }); } diff --git a/client/src/main/java/com/vaadin/client/connectors/fields/TextFieldConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java similarity index 95% rename from client/src/main/java/com/vaadin/client/connectors/fields/TextFieldConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java index 006e6ebe90..75f20863eb 100644 --- a/client/src/main/java/com/vaadin/client/connectors/fields/TextFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/fields/TextFieldConnector.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.connectors.fields; +package com.vaadin.client.tokka.connectors.fields; import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.ChangeEvent; @@ -28,7 +28,7 @@ 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.ui.components.fields.TextField.class, loadStyle = LoadStyle.EAGER) +@Connect(value = com.vaadin.tokka.ui.components.fields.TextField.class, loadStyle = LoadStyle.EAGER) public class TextFieldConnector extends AbstractComponentConnector { @Override diff --git a/client/src/main/java/com/vaadin/client/connectors/selection/AbstractSelectionConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java similarity index 90% rename from client/src/main/java/com/vaadin/client/connectors/selection/AbstractSelectionConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java index 6c0cf2763d..dd4396aaa5 100644 --- a/client/src/main/java/com/vaadin/client/connectors/selection/AbstractSelectionConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/AbstractSelectionConnector.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.selection; +package com.vaadin.client.tokka.connectors.selection; import com.vaadin.client.ServerConnector; -import com.vaadin.client.connectors.components.AbstractListingConnector; -import com.vaadin.client.connectors.data.HasSelection; -import com.vaadin.client.data.selection.SelectionModel; 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 elemental.json.JsonObject; diff --git a/client/src/main/java/com/vaadin/client/connectors/selection/SingleSelectionConnector.java b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java similarity index 87% rename from client/src/main/java/com/vaadin/client/connectors/selection/SingleSelectionConnector.java rename to client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java index 2470cc0634..60adcd7600 100644 --- a/client/src/main/java/com/vaadin/client/connectors/selection/SingleSelectionConnector.java +++ b/client/src/main/java/com/vaadin/client/tokka/connectors/selection/SingleSelectionConnector.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.selection; +package com.vaadin.client.tokka.connectors.selection; import java.util.logging.Logger; import com.vaadin.client.ServerConnector; -import com.vaadin.client.connectors.components.AbstractListingConnector; -import com.vaadin.client.data.selection.SelectionModel; -import com.vaadin.client.data.selection.SelectionModel.Single; +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.ui.Connect; import elemental.json.JsonObject; -@Connect(com.vaadin.server.communication.data.typed.SingleSelection.class) +@Connect(com.vaadin.tokka.server.communication.data.SingleSelection.class) public class SingleSelectionConnector extends AbstractSelectionConnector { public static class SingleSelection implements SelectionModel, Single { diff --git a/client/src/main/java/com/vaadin/client/data/selection/SelectionModel.java b/client/src/main/java/com/vaadin/client/tokka/data/selection/SelectionModel.java similarity index 96% rename from client/src/main/java/com/vaadin/client/data/selection/SelectionModel.java rename to client/src/main/java/com/vaadin/client/tokka/data/selection/SelectionModel.java index 7ba7fc949f..0f68768ba2 100644 --- a/client/src/main/java/com/vaadin/client/data/selection/SelectionModel.java +++ b/client/src/main/java/com/vaadin/client/tokka/data/selection/SelectionModel.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.data.selection; +package com.vaadin.client.tokka.data.selection; import elemental.json.JsonObject; diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java index 18577be414..44008bd0cf 100644 --- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java +++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java @@ -35,13 +35,13 @@ import java.util.concurrent.ConcurrentHashMap; import com.vaadin.event.EventRouter; import com.vaadin.event.MethodEventSource; -import com.vaadin.event.typed.Event; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.ui.ComponentStateUtil; +import com.vaadin.tokka.event.Event; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; import com.vaadin.ui.Component; import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.HasComponents; diff --git a/server/src/main/java/com/vaadin/event/typed/Event.java b/server/src/main/java/com/vaadin/tokka/event/Event.java similarity index 98% rename from server/src/main/java/com/vaadin/event/typed/Event.java rename to server/src/main/java/com/vaadin/tokka/event/Event.java index cbdbe54ec1..8b72315c22 100644 --- a/server/src/main/java/com/vaadin/event/typed/Event.java +++ b/server/src/main/java/com/vaadin/tokka/event/Event.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.event.typed; +package com.vaadin.tokka.event; import java.util.EventObject; diff --git a/server/src/main/java/com/vaadin/event/typed/Handler.java b/server/src/main/java/com/vaadin/tokka/event/Handler.java similarity index 97% rename from server/src/main/java/com/vaadin/event/typed/Handler.java rename to server/src/main/java/com/vaadin/tokka/event/Handler.java index 50b18c4bf2..a87eb785a6 100644 --- a/server/src/main/java/com/vaadin/event/typed/Handler.java +++ b/server/src/main/java/com/vaadin/tokka/event/Handler.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.event.typed; +package com.vaadin.tokka.event; import java.io.Serializable; import java.util.function.Consumer; diff --git a/server/src/main/java/com/vaadin/event/typed/Registration.java b/server/src/main/java/com/vaadin/tokka/event/Registration.java similarity index 96% rename from server/src/main/java/com/vaadin/event/typed/Registration.java rename to server/src/main/java/com/vaadin/tokka/event/Registration.java index c5809cbeb0..95b535a44c 100644 --- a/server/src/main/java/com/vaadin/event/typed/Registration.java +++ b/server/src/main/java/com/vaadin/tokka/event/Registration.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.event.typed; +package com.vaadin.tokka.event; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/ListingExtension.java b/server/src/main/java/com/vaadin/tokka/server/ListingExtension.java similarity index 85% rename from server/src/main/java/com/vaadin/server/ListingExtension.java rename to server/src/main/java/com/vaadin/tokka/server/ListingExtension.java index 72799e2662..6543e2c176 100644 --- a/server/src/main/java/com/vaadin/server/ListingExtension.java +++ b/server/src/main/java/com/vaadin/tokka/server/ListingExtension.java @@ -13,9 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server; +package com.vaadin.tokka.server; -import com.vaadin.ui.components.Listing; +import com.vaadin.server.Extension; +import com.vaadin.tokka.ui.components.Listing; public interface ListingExtension extends Extension { diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractDataSource.java similarity index 96% rename from server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractDataSource.java index abba026774..4e2bfbf6bf 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractDataSource.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractDataSource.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.util.LinkedHashSet; import java.util.Set; -import com.vaadin.event.typed.Registration; +import com.vaadin.tokka.event.Registration; /** * Base class for AbstractDataSource. Provides tracking for diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractSelectionModel.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java similarity index 86% rename from server/src/main/java/com/vaadin/server/communication/data/typed/AbstractSelectionModel.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java index f132d85f8b..c347c82cdc 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/AbstractSelectionModel.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/AbstractSelectionModel.java @@ -13,14 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import com.vaadin.server.AbstractClientConnector; -import com.vaadin.server.Extension; import com.vaadin.shared.data.typed.DataProviderConstants; +import com.vaadin.tokka.ui.components.AbstractListing.AbstractListingExtension; +import com.vaadin.tokka.ui.components.Listing; import com.vaadin.ui.Component; -import com.vaadin.ui.components.AbstractListing.AbstractListingExtension; -import com.vaadin.ui.components.Listing; import elemental.json.JsonObject; @@ -33,14 +32,11 @@ import elemental.json.JsonObject; public abstract class AbstractSelectionModel extends AbstractListingExtension implements SelectionModel { - private Listing parent; - @Override public void setParentListing(Listing target) { if (target instanceof Component && target instanceof Listing && target instanceof AbstractClientConnector) { super.extend((AbstractClientConnector) target); - parent = target; } else { throw new IllegalArgumentException( "Extended object was not suitable for a SelectionModel"); diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/Binder.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/Binder.java similarity index 97% rename from server/src/main/java/com/vaadin/server/communication/data/typed/Binder.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/Binder.java index 8d90888ccf..114ab44baa 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/Binder.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/Binder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; import java.util.Collection; @@ -22,8 +22,8 @@ import java.util.Set; import java.util.function.BiConsumer; import java.util.function.Function; -import com.vaadin.ui.components.HasValue; -import com.vaadin.ui.components.Listing; +import com.vaadin.tokka.ui.components.HasValue; +import com.vaadin.tokka.ui.components.Listing; // TODO: Should this class listen to changes in DataSource? public class Binder implements Serializable { diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataChangeHandler.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataChangeHandler.java similarity index 96% rename from server/src/main/java/com/vaadin/server/communication/data/typed/DataChangeHandler.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/DataChangeHandler.java index 8e216faaff..b42e2abdf4 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataChangeHandler.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataChangeHandler.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataKeyMapper.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataKeyMapper.java similarity index 96% rename from server/src/main/java/com/vaadin/server/communication/data/typed/DataKeyMapper.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/DataKeyMapper.java index ff56a38639..6325a9896c 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataKeyMapper.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataKeyMapper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataProvider.java similarity index 98% rename from server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/DataProvider.java index cf3fa922a3..806f6a9104 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataProvider.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; import java.util.Collection; @@ -21,13 +21,12 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import com.vaadin.event.typed.Registration; import com.vaadin.server.AbstractExtension; import com.vaadin.server.ClientConnector; import com.vaadin.shared.data.DataRequestRpc; import com.vaadin.shared.data.typed.DataProviderClientRpc; import com.vaadin.shared.data.typed.DataProviderConstants; -import com.vaadin.ui.AbstractComponent; +import com.vaadin.tokka.event.Registration; import elemental.json.Json; import elemental.json.JsonArray; diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataSource.java similarity index 96% rename from server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/DataSource.java index e94abf6337..06224910a4 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/DataSource.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/DataSource.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import com.vaadin.event.typed.Registration; +import com.vaadin.tokka.event.Registration; /** * Minimal DataSource API for communication between the DataProvider and a back diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/KeyMapper.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/KeyMapper.java similarity index 94% rename from server/src/main/java/com/vaadin/server/communication/data/typed/KeyMapper.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/KeyMapper.java index 9a26882cd9..221b2b105b 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/KeyMapper.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/KeyMapper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; /** * Generic {@link DataKeyMapper} implementation based on diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/ListDataSource.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/ListDataSource.java similarity index 97% rename from server/src/main/java/com/vaadin/server/communication/data/typed/ListDataSource.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/ListDataSource.java index 83ab8dffd7..d93bc6a37c 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/ListDataSource.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/ListDataSource.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/SelectionModel.java similarity index 91% rename from server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/SelectionModel.java index 48d6d3005e..4c56a95399 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/SelectionModel.java @@ -13,17 +13,17 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; import java.util.Collection; -import com.vaadin.event.typed.Event; import com.vaadin.server.ClientConnector; -import com.vaadin.server.ListingExtension; +import com.vaadin.tokka.event.Event; +import com.vaadin.tokka.server.ListingExtension; +import com.vaadin.tokka.ui.components.HasValue; +import com.vaadin.tokka.ui.components.Listing; import com.vaadin.ui.Component; -import com.vaadin.ui.components.HasValue; -import com.vaadin.ui.components.Listing; /** * Generic selection model interface. diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SimpleDataProvider.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/SimpleDataProvider.java similarity index 98% rename from server/src/main/java/com/vaadin/server/communication/data/typed/SimpleDataProvider.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/SimpleDataProvider.java index 47b4a6495b..c9b70ab603 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/SimpleDataProvider.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/SimpleDataProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.util.Collections; import java.util.HashSet; diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java similarity index 91% rename from server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java index 3c0acf6e3f..ba11fbb617 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/SingleSelection.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/SingleSelection.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.util.Collection; import java.util.Collections; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; -import com.vaadin.server.communication.data.typed.SelectionModel.Single; import com.vaadin.shared.data.selection.SelectionServerRpc; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; +import com.vaadin.tokka.server.communication.data.SelectionModel.Single; /** * {@link SelectionModel} for selecting a single value. @@ -29,8 +29,8 @@ import com.vaadin.shared.data.selection.SelectionServerRpc; * @param * type of selected data */ -public class SingleSelection extends AbstractSelectionModel - implements Single { +public class SingleSelection extends AbstractSelectionModel implements + Single { public SingleSelection() { registerRpc(new SelectionServerRpc() { diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/TypedDataGenerator.java b/server/src/main/java/com/vaadin/tokka/server/communication/data/TypedDataGenerator.java similarity index 96% rename from server/src/main/java/com/vaadin/server/communication/data/typed/TypedDataGenerator.java rename to server/src/main/java/com/vaadin/tokka/server/communication/data/TypedDataGenerator.java index b21fe0699e..c33a3f0e68 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/TypedDataGenerator.java +++ b/server/src/main/java/com/vaadin/tokka/server/communication/data/TypedDataGenerator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data.typed; +package com.vaadin.tokka.server.communication.data; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/ui/components/AbstractListing.java b/server/src/main/java/com/vaadin/tokka/ui/components/AbstractListing.java similarity index 93% rename from server/src/main/java/com/vaadin/ui/components/AbstractListing.java rename to server/src/main/java/com/vaadin/tokka/ui/components/AbstractListing.java index 3964d31e28..15e5f467c8 100644 --- a/server/src/main/java/com/vaadin/ui/components/AbstractListing.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/AbstractListing.java @@ -13,18 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components; +package com.vaadin.tokka.ui.components; import java.util.LinkedHashSet; import java.util.Set; -import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractExtension; -import com.vaadin.server.ListingExtension; -import com.vaadin.server.communication.data.typed.AbstractSelectionModel; -import com.vaadin.server.communication.data.typed.DataProvider; -import com.vaadin.server.communication.data.typed.SelectionModel; -import com.vaadin.server.communication.data.typed.TypedDataGenerator; +import com.vaadin.tokka.server.ListingExtension; +import com.vaadin.tokka.server.communication.data.DataProvider; +import com.vaadin.tokka.server.communication.data.SelectionModel; +import com.vaadin.tokka.server.communication.data.TypedDataGenerator; import com.vaadin.ui.AbstractComponent; /** diff --git a/server/src/main/java/com/vaadin/ui/components/HasValue.java b/server/src/main/java/com/vaadin/tokka/ui/components/HasValue.java similarity index 92% rename from server/src/main/java/com/vaadin/ui/components/HasValue.java rename to server/src/main/java/com/vaadin/tokka/ui/components/HasValue.java index ab4daccc0b..16d550c06b 100644 --- a/server/src/main/java/com/vaadin/ui/components/HasValue.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/HasValue.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components; +package com.vaadin.tokka.ui.components; import java.io.Serializable; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; /** * Generic interface for Components that have a value. diff --git a/server/src/main/java/com/vaadin/ui/components/Listing.java b/server/src/main/java/com/vaadin/tokka/ui/components/Listing.java similarity index 92% rename from server/src/main/java/com/vaadin/ui/components/Listing.java rename to server/src/main/java/com/vaadin/tokka/ui/components/Listing.java index 0d81d60c68..103d7b5b2e 100644 --- a/server/src/main/java/com/vaadin/ui/components/Listing.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/Listing.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components; +package com.vaadin.tokka.ui.components; import java.io.Serializable; import java.util.Collection; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.server.communication.data.typed.SelectionModel; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.server.communication.data.SelectionModel; /** * Generic interface for Components that show a list of data. diff --git a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java similarity index 97% rename from server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java rename to server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java index e7f977d7f4..64d61e495d 100644 --- a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/AbstractTextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui.components.fields; +package com.vaadin.tokka.ui.components.fields; import java.util.Collection; @@ -26,13 +26,13 @@ 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.event.typed.Event; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; import com.vaadin.shared.ui.components.fields.TextFieldServerRpc; import com.vaadin.shared.ui.components.fields.TextFieldState; +import com.vaadin.tokka.event.Event; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; +import com.vaadin.tokka.ui.components.HasValue; import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.components.HasValue; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/CheckBox.java similarity index 96% rename from server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java rename to server/src/main/java/com/vaadin/tokka/ui/components/fields/CheckBox.java index 685b079e68..325d097715 100644 --- a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/CheckBox.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.fields; +package com.vaadin.tokka.ui.components.fields; import java.util.Collection; @@ -21,14 +21,14 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl; -import com.vaadin.event.typed.Event; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; import com.vaadin.shared.ui.checkbox.CheckBoxState; +import com.vaadin.tokka.event.Event; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; +import com.vaadin.tokka.ui.components.HasValue; import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.components.HasValue; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/main/java/com/vaadin/ui/components/field/DateField.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java similarity index 93% rename from server/src/main/java/com/vaadin/ui/components/field/DateField.java rename to server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java index 48f8db4139..d619fd1b7f 100644 --- a/server/src/main/java/com/vaadin/ui/components/field/DateField.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/DateField.java @@ -13,8 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ - -package com.vaadin.ui.components.field; +package com.vaadin.tokka.ui.components.fields; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -24,13 +23,13 @@ import org.jsoup.nodes.Element; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.FocusEvent; -import com.vaadin.event.typed.Event; -import com.vaadin.event.typed.Handler; -import com.vaadin.event.typed.Registration; import com.vaadin.shared.ui.components.field.DateFieldServerRpc; import com.vaadin.shared.ui.components.field.DateFieldState; +import com.vaadin.tokka.event.Event; +import com.vaadin.tokka.event.Handler; +import com.vaadin.tokka.event.Registration; +import com.vaadin.tokka.ui.components.HasValue; import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.components.HasValue; import com.vaadin.ui.declarative.DesignContext; /** diff --git a/server/src/main/java/com/vaadin/ui/components/fields/TextField.java b/server/src/main/java/com/vaadin/tokka/ui/components/fields/TextField.java similarity index 98% rename from server/src/main/java/com/vaadin/ui/components/fields/TextField.java rename to server/src/main/java/com/vaadin/tokka/ui/components/fields/TextField.java index c691a92184..96194019fb 100644 --- a/server/src/main/java/com/vaadin/ui/components/fields/TextField.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/fields/TextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui.components.fields; +package com.vaadin.tokka.ui.components.fields; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; diff --git a/server/src/main/java/com/vaadin/ui/components/grid/Column.java b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java similarity index 94% rename from server/src/main/java/com/vaadin/ui/components/grid/Column.java rename to server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java index a2f04bac60..29b016fbd2 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/Column.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Column.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.grid; +package com.vaadin.tokka.ui.components.grid; import java.util.function.Function; import com.vaadin.server.AbstractExtension; -import com.vaadin.server.communication.data.typed.TypedDataGenerator; import com.vaadin.shared.data.typed.DataProviderConstants; import com.vaadin.shared.ui.components.grid.ColumnState; +import com.vaadin.tokka.server.communication.data.TypedDataGenerator; import elemental.json.Json; import elemental.json.JsonObject; diff --git a/server/src/main/java/com/vaadin/ui/components/grid/Grid.java b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Grid.java similarity index 85% rename from server/src/main/java/com/vaadin/ui/components/grid/Grid.java rename to server/src/main/java/com/vaadin/tokka/ui/components/grid/Grid.java index 955488b335..8f8c08be4f 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/Grid.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/grid/Grid.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.grid; +package com.vaadin.tokka.ui.components.grid; import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; -import com.vaadin.server.communication.data.typed.DataProvider; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.server.communication.data.typed.SingleSelection; -import com.vaadin.ui.components.AbstractListing; +import com.vaadin.tokka.server.communication.data.DataProvider; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.server.communication.data.SingleSelection; +import com.vaadin.tokka.ui.components.AbstractListing; public class Grid extends AbstractListing { diff --git a/server/src/main/java/com/vaadin/ui/components/nativeselect/NativeSelect.java b/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java similarity index 83% rename from server/src/main/java/com/vaadin/ui/components/nativeselect/NativeSelect.java rename to server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java index c4316687c1..b18ea8143f 100644 --- a/server/src/main/java/com/vaadin/ui/components/nativeselect/NativeSelect.java +++ b/server/src/main/java/com/vaadin/tokka/ui/components/nativeselect/NativeSelect.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.nativeselect; +package com.vaadin.tokka.ui.components.nativeselect; import java.util.function.Function; -import com.vaadin.server.communication.data.typed.DataProvider; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.server.communication.data.typed.SingleSelection; -import com.vaadin.server.communication.data.typed.TypedDataGenerator; import com.vaadin.shared.data.typed.DataProviderConstants; -import com.vaadin.ui.components.AbstractListing; +import com.vaadin.tokka.server.communication.data.DataProvider; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.server.communication.data.SingleSelection; +import com.vaadin.tokka.server.communication.data.TypedDataGenerator; +import com.vaadin.tokka.ui.components.AbstractListing; import elemental.json.JsonObject; diff --git a/server/src/test/java/com/vaadin/data/datasource/ListDataSourceTest.java b/server/src/test/java/com/vaadin/tokka/data/datasource/ListDataSourceTest.java similarity index 90% rename from server/src/test/java/com/vaadin/data/datasource/ListDataSourceTest.java rename to server/src/test/java/com/vaadin/tokka/data/datasource/ListDataSourceTest.java index 29efb9f745..78858cf633 100644 --- a/server/src/test/java/com/vaadin/data/datasource/ListDataSourceTest.java +++ b/server/src/test/java/com/vaadin/tokka/data/datasource/ListDataSourceTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.datasource; +package com.vaadin.tokka.data.datasource; import static org.junit.Assert.assertTrue; @@ -11,9 +11,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.vaadin.server.communication.data.typed.DataChangeHandler; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.server.communication.data.typed.ListDataSource; +import com.vaadin.tokka.server.communication.data.DataChangeHandler; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.server.communication.data.ListDataSource; public class ListDataSourceTest { diff --git a/server/src/test/java/com/vaadin/ui/components/AbstractListingTest.java b/server/src/test/java/com/vaadin/tokka/ui/components/AbstractListingTest.java similarity index 84% rename from server/src/test/java/com/vaadin/ui/components/AbstractListingTest.java rename to server/src/test/java/com/vaadin/tokka/ui/components/AbstractListingTest.java index 3c6ead5715..3480403d1e 100644 --- a/server/src/test/java/com/vaadin/ui/components/AbstractListingTest.java +++ b/server/src/test/java/com/vaadin/tokka/ui/components/AbstractListingTest.java @@ -1,4 +1,4 @@ -package com.vaadin.ui.components; +package com.vaadin.tokka.ui.components; import static org.junit.Assert.assertEquals; @@ -8,10 +8,11 @@ import java.util.Iterator; import org.junit.Before; import org.junit.Test; -import com.vaadin.server.communication.data.typed.AbstractDataSource; -import com.vaadin.server.communication.data.typed.DataProvider; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.ui.components.AbstractListing.AbstractListingExtension; +import com.vaadin.tokka.server.communication.data.AbstractDataSource; +import com.vaadin.tokka.server.communication.data.DataProvider; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.ui.components.AbstractListing; +import com.vaadin.tokka.ui.components.AbstractListing.AbstractListingExtension; import elemental.json.JsonObject; diff --git a/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java b/uitest/src/main/java/com/vaadin/tokka/tests/components/CheckBoxTestUI.java similarity index 88% rename from uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java rename to uitest/src/main/java/com/vaadin/tokka/tests/components/CheckBoxTestUI.java index c39572f8bf..1b69a492c7 100644 --- a/uitest/src/main/java/com/vaadin/tests/databinding/CheckBoxTestUI.java +++ b/uitest/src/main/java/com/vaadin/tokka/tests/components/CheckBoxTestUI.java @@ -1,12 +1,12 @@ -package com.vaadin.tests.databinding; +package com.vaadin.tokka.tests.components; -import com.vaadin.event.typed.Registration; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.communication.data.typed.Binder; import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tokka.event.Registration; +import com.vaadin.tokka.server.communication.data.Binder; +import com.vaadin.tokka.ui.components.fields.CheckBox; import com.vaadin.ui.Button; import com.vaadin.ui.Notification; -import com.vaadin.ui.components.fields.CheckBox; public class CheckBoxTestUI extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/databinding/ListingTestUI.java b/uitest/src/main/java/com/vaadin/tokka/tests/components/ListingTestUI.java similarity index 92% rename from uitest/src/main/java/com/vaadin/tests/databinding/ListingTestUI.java rename to uitest/src/main/java/com/vaadin/tokka/tests/components/ListingTestUI.java index c843058622..210007df04 100644 --- a/uitest/src/main/java/com/vaadin/tests/databinding/ListingTestUI.java +++ b/uitest/src/main/java/com/vaadin/tokka/tests/components/ListingTestUI.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.databinding; +package com.vaadin.tokka.tests.components; import java.util.ArrayList; import java.util.List; @@ -7,15 +7,15 @@ import java.util.stream.Stream; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.communication.data.typed.DataSource; -import com.vaadin.server.communication.data.typed.SingleSelection; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tokka.server.communication.data.DataSource; +import com.vaadin.tokka.server.communication.data.SingleSelection; +import com.vaadin.tokka.ui.components.grid.Grid; +import com.vaadin.tokka.ui.components.nativeselect.NativeSelect; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.components.grid.Grid; -import com.vaadin.ui.components.nativeselect.NativeSelect; @Theme("valo") public class ListingTestUI extends AbstractTestUI { -- 2.39.5