diff options
| -rw-r--r-- | client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/communication/data/DataGenerator.java (renamed from server/src/com/vaadin/data/DataGenerator.java) | 3 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java (renamed from server/src/com/vaadin/data/RpcDataProviderExtension.java) | 5 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 4 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java b/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java index 648aa2650b..d744bbc1c7 100644 --- a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java +++ b/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java @@ -42,7 +42,7 @@ import elemental.json.JsonObject; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.data.RpcDataProviderExtension.class) +@Connect(com.vaadin.server.communication.data.RpcDataProviderExtension.class) public class RpcDataSourceConnector extends AbstractExtensionConnector { /** diff --git a/server/src/com/vaadin/data/DataGenerator.java b/server/src/com/vaadin/server/communication/data/DataGenerator.java index fd64a389b8..58ba1b3b00 100644 --- a/server/src/com/vaadin/data/DataGenerator.java +++ b/server/src/com/vaadin/server/communication/data/DataGenerator.java @@ -13,10 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data; +package com.vaadin.server.communication.data; import java.io.Serializable; +import com.vaadin.data.Item; import com.vaadin.ui.Grid.AbstractGridExtension; import elemental.json.JsonObject; diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java index 293940aec7..e3c48f1ec0 100644 --- a/server/src/com/vaadin/data/RpcDataProviderExtension.java +++ b/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.server.communication.data; import java.io.Serializable; import java.util.ArrayList; @@ -26,12 +26,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.vaadin.data.Container; import com.vaadin.data.Container.Indexed; import com.vaadin.data.Container.Indexed.ItemAddEvent; import com.vaadin.data.Container.Indexed.ItemRemoveEvent; import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.Container.ItemSetChangeNotifier; +import com.vaadin.data.Item; +import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.Property.ValueChangeNotifier; diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 7179ddf0a2..d7efdf5814 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -51,10 +51,8 @@ import com.vaadin.data.Container.PropertySetChangeEvent; import com.vaadin.data.Container.PropertySetChangeListener; import com.vaadin.data.Container.PropertySetChangeNotifier; import com.vaadin.data.Container.Sortable; -import com.vaadin.data.DataGenerator; import com.vaadin.data.Item; import com.vaadin.data.Property; -import com.vaadin.data.RpcDataProviderExtension; import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory; import com.vaadin.data.fieldgroup.FieldGroup; @@ -83,6 +81,8 @@ import com.vaadin.server.Extension; import com.vaadin.server.JsonCodec; import com.vaadin.server.KeyMapper; import com.vaadin.server.VaadinSession; +import com.vaadin.server.communication.data.DataGenerator; +import com.vaadin.server.communication.data.RpcDataProviderExtension; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.EditorClientRpc; diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java b/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java index 63fa569ab4..97fb2d8309 100644 --- a/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java +++ b/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java @@ -19,8 +19,8 @@ import java.lang.reflect.Field; import org.easymock.EasyMock; -import com.vaadin.data.RpcDataProviderExtension; import com.vaadin.data.util.IndexedContainer; +import com.vaadin.server.communication.data.RpcDataProviderExtension; import com.vaadin.ui.ConnectorTracker; import com.vaadin.ui.Grid; import com.vaadin.ui.UI; |