Skip to content

Commit 33dab2f

Browse files
Merge pull request #1736 from JohnMcGuinness/remove-usage-of-deprecated-ColumnLayout-constructors
Removed usage of deprecated ColumnLayout constructors
2 parents 27dd7d7 + 95f74a5 commit 33dab2f

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WMultiFileWidgetAjaxExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public WMultiFileWidgetAjaxExample() {
102102
paramsLayout.addField("Readonly", readonly);
103103

104104
WPanel split = new WPanel();
105-
split.setLayout(new ColumnLayout(new int[]{50, 50}, 12, 0));
105+
split.setLayout(new ColumnLayout(new int[]{50, 50}, Size.LARGE, Size.ZERO));
106106
split.setHtmlClass(HtmlClassProperties.RESPOND);
107107
add(split);
108108

wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/layout/ColumnLayoutExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private void addResponsiveExample() {
7575
+ "The columns have width and alignment and there is also a hgap and a vgap."));
7676
WPanel panel = new WPanel();
7777
panel.setLayout(new ColumnLayout(new int[]{33, 33, 33},
78-
new Alignment[]{Alignment.LEFT, Alignment.CENTER, Alignment.RIGHT}, 12, 18));
78+
new Alignment[]{Alignment.LEFT, Alignment.CENTER, Alignment.RIGHT}, Size.LARGE, Size.XL));
7979
panel.setHtmlClass(HtmlClassProperties.RESPOND);
8080
add(panel);
8181
panel.add(new BoxComponent("Left"));

wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/picker/TreePicker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public class TreePicker extends WContainer {
7070
/**
7171
* column hgap.
7272
*/
73-
private static final int COL_HGAP = 12;
73+
private static final Size COL_HGAP = Size.LARGE;
7474
/**
7575
* column vgap.
7676
*/
77-
private static final int COL_VGAP = 0;
77+
private static final Size COL_VGAP = Size.ZERO;
7878

7979
/**
8080
* Creates a TreePicker.

wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/TableLoadPerformance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public void executeOnValid(final ActionEvent event) {
296296

297297
// Table layouts
298298
root.add(tablePanel);
299-
tableLayout.setLayout(new ColumnLayout(new int[]{50, 50}, 6, 6));
299+
tableLayout.setLayout(new ColumnLayout(new int[]{50, 50}, Size.MEDIUM, Size.MEDIUM));
300300
tableLayout.setMargin(new Margin(Size.LARGE, null, Size.LARGE, null));
301301
tableLayout.setVisible(false);
302302
tablePanel.add(tableLayout);

wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WLabelExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ private void addAntiPatternExamples() {
261261
WTextField myField = new WTextField();
262262
WLabel myFieldLabel = new WLabel("I am not the label for my nested text field", myField);
263263
nestingErrorPanel = new WPanel();
264-
nestingErrorPanel.setLayout(new ColumnLayout(new int[]{50, 50}, 12, 6));
264+
nestingErrorPanel.setLayout(new ColumnLayout(new int[]{50, 50}, Size.LARGE, Size.MEDIUM));
265265
errorLayoutPanel.add(nestingErrorPanel);
266266
nestingErrorPanel.add(myFieldLabel);
267267
nestingErrorPanel.add(myField);

0 commit comments

Comments
 (0)