diff options
15 files changed, 18 insertions, 15 deletions
diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/com/vaadin/client/connectors/GridConnector.java index e298892c6f..061a6ac61e 100644 --- a/client/src/com/vaadin/client/connectors/GridConnector.java +++ b/client/src/com/vaadin/client/connectors/GridConnector.java @@ -63,6 +63,7 @@ import com.vaadin.client.widgets.Grid.FooterCell; import com.vaadin.client.widgets.Grid.FooterRow; import com.vaadin.client.widgets.Grid.HeaderCell; import com.vaadin.client.widgets.Grid.HeaderRow; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.grid.EditorRowClientRpc; import com.vaadin.shared.ui.grid.EditorRowServerRpc; @@ -75,7 +76,6 @@ import com.vaadin.shared.ui.grid.GridStaticSectionState; import com.vaadin.shared.ui.grid.GridStaticSectionState.CellState; import com.vaadin.shared.ui.grid.GridStaticSectionState.RowState; import com.vaadin.shared.ui.grid.ScrollDestination; -import com.vaadin.shared.ui.grid.SortDirection; /** * Connects the client side {@link Grid} widget with the server side diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java b/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java index ff999801a0..016f4aa7b3 100644 --- a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java +++ b/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java @@ -26,7 +26,7 @@ import com.vaadin.client.widget.grid.sort.SortEvent; import com.vaadin.client.widget.grid.sort.SortHandler; import com.vaadin.client.widget.grid.sort.SortOrder; import com.vaadin.client.widgets.Grid; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Provides sorting facility from Grid for the {@link ListDataSource} in-memory diff --git a/client/src/com/vaadin/client/widget/grid/sort/Sort.java b/client/src/com/vaadin/client/widget/grid/sort/Sort.java index 2b536a6e6e..eb174921fd 100644 --- a/client/src/com/vaadin/client/widget/grid/sort/Sort.java +++ b/client/src/com/vaadin/client/widget/grid/sort/Sort.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.client.widgets.Grid; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Fluid Sort descriptor object. diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java b/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java index eb7d14a64d..51013f3a8b 100644 --- a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java +++ b/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java @@ -16,7 +16,7 @@ package com.vaadin.client.widget.grid.sort; import com.vaadin.client.widgets.Grid; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Sort order descriptor. Contains column and direction references. diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index 32349116a5..93dbc5bace 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -119,13 +119,13 @@ import com.vaadin.client.widget.grid.sort.SortEvent; import com.vaadin.client.widget.grid.sort.SortHandler; import com.vaadin.client.widget.grid.sort.SortOrder; import com.vaadin.client.widgets.Escalator.AbstractRowContainer; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.GridColumnState; import com.vaadin.shared.ui.grid.GridConstants; import com.vaadin.shared.ui.grid.GridStaticCellType; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.shared.ui.grid.Range; import com.vaadin.shared.ui.grid.ScrollDestination; -import com.vaadin.shared.ui.grid.SortDirection; import com.vaadin.shared.util.SharedUtil; /** diff --git a/server/src/com/vaadin/data/sort/Sort.java b/server/src/com/vaadin/data/sort/Sort.java index 914a92f249..81e0d08c73 100644 --- a/server/src/com/vaadin/data/sort/Sort.java +++ b/server/src/com/vaadin/data/sort/Sort.java @@ -19,7 +19,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Fluid Sort API. Provides a convenient, human-readable way of specifying diff --git a/server/src/com/vaadin/data/sort/SortOrder.java b/server/src/com/vaadin/data/sort/SortOrder.java index 55cae8c51d..2c419f88b7 100644 --- a/server/src/com/vaadin/data/sort/SortOrder.java +++ b/server/src/com/vaadin/data/sort/SortOrder.java @@ -17,7 +17,7 @@ package com.vaadin.data.sort; import java.io.Serializable; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Sort order descriptor. Links together a {@link SortDirection} value and a diff --git a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java index 0f4f0be1dd..3c4506c109 100644 --- a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java +++ b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java @@ -33,7 +33,7 @@ import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.sort.SortOrder; import com.vaadin.data.util.filter.UnsupportedFilterException; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; /** * Container wrapper that adds support for generated properties. This container diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 4166df6c71..3daf63806d 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -48,6 +48,7 @@ import com.vaadin.data.Property; import com.vaadin.data.RpcDataProviderExtension; import com.vaadin.data.RpcDataProviderExtension.DataProviderKeyMapper; import com.vaadin.data.fieldgroup.FieldGroup; +import com.vaadin.data.fieldgroup.FieldGroup.BindException; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.data.fieldgroup.FieldGroupFieldFactory; import com.vaadin.data.sort.Sort; @@ -67,6 +68,7 @@ import com.vaadin.server.ErrorMessage; import com.vaadin.server.JsonCodec; import com.vaadin.server.KeyMapper; import com.vaadin.server.VaadinSession; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.EditorRowClientRpc; import com.vaadin.shared.ui.grid.EditorRowServerRpc; import com.vaadin.shared.ui.grid.GridClientRpc; @@ -80,7 +82,6 @@ import com.vaadin.shared.ui.grid.GridStaticSectionState.CellState; import com.vaadin.shared.ui.grid.GridStaticSectionState.RowState; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.shared.ui.grid.ScrollDestination; -import com.vaadin.shared.ui.grid.SortDirection; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.renderer.Renderer; import com.vaadin.ui.renderer.TextRenderer; diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java index 22640b8b8f..2a682df2e5 100644 --- a/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java @@ -28,7 +28,7 @@ import com.vaadin.data.sort.SortOrder; import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SortEvent; import com.vaadin.event.SortEvent.SortListener; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.ui.Grid; public class SortTest { diff --git a/shared/src/com/vaadin/shared/ui/grid/SortDirection.java b/shared/src/com/vaadin/shared/data/sort/SortDirection.java index 9aed268d01..043b363226 100644 --- a/shared/src/com/vaadin/shared/ui/grid/SortDirection.java +++ b/shared/src/com/vaadin/shared/data/sort/SortDirection.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.grid; +package com.vaadin.shared.data.sort; import java.io.Serializable; /** - * Describes sorting direction for a Grid column - * + * Describes sorting direction. + * * @since * @author Vaadin Ltd */ diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java index 28149010be..141b1ed9ca 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java @@ -18,6 +18,7 @@ package com.vaadin.shared.ui.grid; import java.util.List; import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.data.sort.SortDirection; /** * Client-to-server RPC interface for the Grid component diff --git a/shared/src/com/vaadin/shared/ui/grid/GridState.java b/shared/src/com/vaadin/shared/ui/grid/GridState.java index f26b5cb344..4cf834c4f0 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridState.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridState.java @@ -21,6 +21,7 @@ import java.util.List; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.annotations.DelegateToWidget; +import com.vaadin.shared.data.sort.SortDirection; /** * The shared state for the {@link com.vaadin.ui.components.grid.Grid} component diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java index 43ac604846..62f3488447 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -34,9 +34,9 @@ import com.vaadin.data.sort.SortOrder; import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SortEvent; import com.vaadin.event.SortEvent.SortListener; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.GridStaticCellType; import com.vaadin.shared.ui.grid.HeightMode; -import com.vaadin.shared.ui.grid.SortDirection; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java index 8aca4cf250..ffd6ef2959 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import com.vaadin.shared.ui.grid.SortDirection; +import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures; |