diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-07-14 15:14:18 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-11 10:01:04 +0000 |
| commit | fd3617bba2d758ad78689116cfe444d6bfbc1664 (patch) | |
| tree | 4c7e7c0e7e7f3b8ac2d2f532896e862ff418f50e /client | |
| parent | 5e75657b387a99993ec17b03ab97bc32884fef80 (diff) | |
| download | vaadin-framework-fd3617bba2d758ad78689116cfe444d6bfbc1664.tar.gz vaadin-framework-fd3617bba2d758ad78689116cfe444d6bfbc1664.zip | |
Remove deprecated column based width support from selects
Change-Id: I233f205d3d0d7c0cf59e55531de09b7807d73548
Diffstat (limited to 'client')
3 files changed, 1 insertions, 28 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java index ce75043d89..703c0e3090 100644 --- a/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java +++ b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java @@ -59,9 +59,6 @@ public abstract class VOptionGroupBase extends Composite implements Field, private boolean readonly; /** For internal use only. May be removed or replaced in the future. */ - public int cols = 0; - - /** For internal use only. May be removed or replaced in the future. */ public int rows = 0; /** For internal use only. May be removed or replaced in the future. */ @@ -138,15 +135,6 @@ public abstract class VOptionGroupBase extends Composite implements Field, /** * For internal use only. May be removed or replaced in the future. * - * @return "cols" specified in uidl, 0 if not specified - */ - public int getColumns() { - return cols; - } - - /** - * For internal use only. May be removed or replaced in the future. - * * @return "rows" specified in uidl, 0 if not specified */ public int getRows() { diff --git a/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java index 853bd8d456..8495a25f68 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java @@ -363,12 +363,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, /** For internal use only. May be removed or replaced in the future. */ public void clearInternalWidths() { - int cols = -1; - if (getColumns() > 0) { - cols = getColumns(); - } else { - cols = DEFAULT_COLUMN_COUNT; - } + int cols = DEFAULT_COLUMN_COUNT; if (cols >= 0) { String colWidth = cols + "em"; diff --git a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java index 0757bc395b..4c5a8b9dea 100644 --- a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -51,22 +51,12 @@ public abstract class OptionGroupBaseConnector extends AbstractFieldConnector getWidget().nullSelectionItemAvailable = uidl .getBooleanAttribute("nullselectitem"); - if (uidl.hasAttribute("cols")) { - getWidget().cols = uidl.getIntAttribute("cols"); - } if (uidl.hasAttribute("rows")) { getWidget().rows = uidl.getIntAttribute("rows"); } final UIDL ops = uidl.getChildUIDL(0); - if (getWidget().getColumns() > 0) { - getWidget().container.setWidth(getWidget().getColumns() + "em"); - if (getWidget().container != getWidget().optionsContainer) { - getWidget().optionsContainer.setWidth("100%"); - } - } - getWidget().buildOptions(ops); if (uidl.getBooleanAttribute("allownewitem")) { |