diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-07 14:32:46 +0200 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2015-01-07 16:38:11 +0000 |
| commit | 395955d960a716fa8bf2318c3f92e167c93b4f6c (patch) | |
| tree | ee953eef3b933980624e119d4a58af5bba20ec95 /client | |
| parent | 20ed8b863d24f48afab5d510f5caf1fbdadeeb19 (diff) | |
| download | vaadin-framework-395955d960a716fa8bf2318c3f92e167c93b4f6c.tar.gz vaadin-framework-395955d960a716fa8bf2318c3f92e167c93b4f6c.zip | |
Move column constants from state to GridConstants (#15510)
Change-Id: I9dd103d2f9725499823231881c432696f05b80db
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index c95e8e4a53..28cc1000ce 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -122,7 +122,6 @@ 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; @@ -2543,7 +2542,7 @@ public class Grid<T> extends ResizeComposite implements * Width of column in pixels as {@link #setWidth(double)} has been * called */ - private double widthUser = GridColumnState.DEFAULT_COLUMN_WIDTH_PX; + private double widthUser = GridConstants.DEFAULT_COLUMN_WIDTH_PX; /** * Renderer for rendering a value into the cell @@ -2554,9 +2553,9 @@ public class Grid<T> extends ResizeComposite implements private String headerCaption = ""; - private double minimumWidthPx = GridColumnState.DEFAULT_MIN_WIDTH; - private double maximumWidthPx = GridColumnState.DEFAULT_MAX_WIDTH; - private int expandRatio = GridColumnState.DEFAULT_EXPAND_RATIO; + private double minimumWidthPx = GridConstants.DEFAULT_MIN_WIDTH; + private double maximumWidthPx = GridConstants.DEFAULT_MAX_WIDTH; + private int expandRatio = GridConstants.DEFAULT_EXPAND_RATIO; /** * Constructs a new column with a simple TextRenderer. |