diff options
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 9 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/grid/GridColumnState.java | 16 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/grid/GridConstants.java | 22 |
3 files changed, 31 insertions, 16 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. diff --git a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java b/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java index 11cb133fa5..c69b02231e 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java @@ -28,12 +28,6 @@ import com.vaadin.shared.Connector; */ public class GridColumnState implements Serializable { - public static final double DEFAULT_MAX_WIDTH = -1; - public static final double DEFAULT_MIN_WIDTH = 10.0d; - public static final int DEFAULT_EXPAND_RATIO = -1; - - public static final double DEFAULT_COLUMN_WIDTH_PX = -1; - /** * Id used by grid connector to map server side column with client side * column @@ -42,9 +36,9 @@ public class GridColumnState implements Serializable { /** * Column width in pixels. Default column width is - * {@value #DEFAULT_COLUMN_WIDTH_PX}. + * {@value GridConstants#DEFAULT_COLUMN_WIDTH_PX}. */ - public double width = DEFAULT_COLUMN_WIDTH_PX; + public double width = GridConstants.DEFAULT_COLUMN_WIDTH_PX; /** * The connector for the renderer used to render the cells in this column. @@ -63,17 +57,17 @@ public class GridColumnState implements Serializable { public boolean sortable = false; /** How much of the remaining space this column will reserve. */ - public int expandRatio = DEFAULT_EXPAND_RATIO; + public int expandRatio = GridConstants.DEFAULT_EXPAND_RATIO; /** * The maximum expansion width of this column. -1 for "no maximum". If * maxWidth is less than the calculated width, maxWidth is ignored. */ - public double maxWidth = DEFAULT_MAX_WIDTH; + public double maxWidth = GridConstants.DEFAULT_MAX_WIDTH; /** * The minimum expansion width of this column. -1 for "no minimum". If * minWidth is less than the calculated width, minWidth will win. */ - public double minWidth = DEFAULT_MIN_WIDTH; + public double minWidth = GridConstants.DEFAULT_MIN_WIDTH; } diff --git a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java b/shared/src/com/vaadin/shared/ui/grid/GridConstants.java index 1ee79a5d37..61cf7f6ef0 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridConstants.java @@ -41,4 +41,26 @@ public final class GridConstants implements Serializable { * The threshold in pixels a finger can move while long tapping. */ public static final int LONG_TAP_THRESHOLD = 3; + + /* Column constants */ + + /** + * Default maximum width for columns. + */ + public static final double DEFAULT_MAX_WIDTH = -1; + + /** + * Default minimum width for columns. + */ + public static final double DEFAULT_MIN_WIDTH = 10.0d; + + /** + * Default expand ratio for columns. + */ + public static final int DEFAULT_EXPAND_RATIO = -1; + + /** + * Default width for columns. + */ + public static final double DEFAULT_COLUMN_WIDTH_PX = -1; } |