- Grid.Column.hidden and Grid.Column.hidable - Grid.columnReorderingAllowed Change-Id: Iee2e3ff7472bceef314403b750549c99e26a9546tags/7.5.0.beta1
@@ -3200,6 +3200,10 @@ public class Grid extends AbstractComponent implements SelectionNotifier, | |||
getMaximumWidth(), def.maxWidth, Double.class); | |||
DesignAttributeHandler.writeAttribute("expand", attributes, | |||
getExpandRatio(), def.expandRatio, Integer.class); | |||
DesignAttributeHandler.writeAttribute("hidable", attributes, | |||
isHidable(), def.hidable, boolean.class); | |||
DesignAttributeHandler.writeAttribute("hidden", attributes, | |||
isHidden(), def.hidden, boolean.class); | |||
DesignAttributeHandler.writeAttribute("property-id", attributes, | |||
getPropertyId(), null, Object.class); | |||
} | |||
@@ -3225,7 +3229,14 @@ public class Grid extends AbstractComponent implements SelectionNotifier, | |||
setEditable(DesignAttributeHandler.readAttribute("editable", | |||
attributes, boolean.class)); | |||
} | |||
if (design.hasAttr("hidable")) { | |||
setHidable(DesignAttributeHandler.readAttribute("hidable", | |||
attributes, boolean.class)); | |||
} | |||
if (design.hasAttr("hidden")) { | |||
setHidden(DesignAttributeHandler.readAttribute("hidden", | |||
attributes, boolean.class)); | |||
} | |||
// Read size info where necessary. | |||
if (design.hasAttr("width")) { | |||
setWidth(DesignAttributeHandler.readAttribute("width", |
@@ -28,6 +28,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { | |||
+ " <col sortable=true width='100' property-id='Column1'>" | |||
+ " <col sortable=false max-width='200' expand='2' property-id='Column2'>" | |||
+ " <col sortable=true editable=false min-width='15' expand='1' property-id='Column3'>" | |||
+ " <col sortable=true hidable=true property-id='Column4'>" | |||
+ " <col sortable=true hidden=true property-id='Column5'>" | |||
+ "</colgroup>" // | |||
+ "<thead />" // | |||
+ "</table></v-grid>"; | |||
@@ -37,6 +39,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { | |||
.setExpandRatio(2).setSortable(false); | |||
grid.addColumn("Column3", String.class).setMinimumWidth(15) | |||
.setExpandRatio(1).setEditable(false); | |||
grid.addColumn("Column4", String.class).setHidable(true); | |||
grid.addColumn("Column5", String.class).setHidden(true); | |||
// Remove the default header | |||
grid.removeHeaderRow(grid.getDefaultHeaderRow()); |
@@ -38,7 +38,7 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { | |||
public void testBasicAttributes() { | |||
String design = "<v-grid editable='true' rows=20 frozen-columns=-1 " | |||
+ "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta'>"; | |||
+ "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed=true>"; | |||
Grid grid = new Grid(); | |||
grid.setEditorEnabled(true); | |||
@@ -47,6 +47,7 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { | |||
grid.setFrozenColumnCount(-1); | |||
grid.setEditorSaveCaption("Tallenna"); | |||
grid.setEditorCancelCaption("Peruuta"); | |||
grid.setColumnReorderingAllowed(true); | |||
testRead(design, grid); | |||
testWrite(design, grid); |