Remove deprecated column based width support from selects

Change-Id: I233f205d3d0d7c0cf59e55531de09b7807d73548

3 files changed, 0 insertions, 144 deletions

diff --git a/server/src/main/java/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java
index c8ed8e5854..b340e701ad 100644
--- a/server/src/main/java/com/vaadin/ui/ListSelect.java
+++ b/server/src/main/java/com/vaadin/ui/ListSelect.java
@@ -29,7 +29,6 @@ import com.vaadin.server.PaintTarget;
 @SuppressWarnings("serial")
 public class ListSelect extends AbstractSelect {
 
-    private int columns = 0;
     private int rows = 0;
 
     public ListSelect() {
@@ -48,46 +47,6 @@ public class ListSelect extends AbstractSelect {
         super(caption);
     }
 
-    /**
-     * Sets the width of the component so that it can display approximately the
-     * given number of letters.
-     * <p>
-     * Calling {@code setColumns(10);} is equivalent to calling
-     * {@code setWidth("10em");}
-     * </p>
-     * 
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     * @param columns
-     *            the number of columns to set.
-     */
-    @Deprecated
-    public void setColumns(int columns) {
-        if (columns < 0) {
-            columns = 0;
-        }
-        if (this.columns != columns) {
-            this.columns = columns;
-            markAsDirty();
-        }
-    }
-
-    /**
-     * Gets the number of columns for the component.
-     * 
-     * @see #setColumns(int)
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     */
-    @Deprecated
-    public int getColumns() {
-        return columns;
-    }
-
     public int getRows() {
         return rows;
     }
@@ -112,10 +71,6 @@ public class ListSelect extends AbstractSelect {
 
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
-        // Adds the number of columns
-        if (columns != 0) {
-            target.addAttribute("cols", columns);
-        }
         // Adds the number of rows
         if (rows != 0) {
             target.addAttribute("rows", rows);
diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index 9dbd85e386..c7af478428 100644
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
@@ -25,8 +25,6 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.server.PaintException;
-import com.vaadin.server.PaintTarget;
 
 /**
  * This is a simple drop-down select without, for instance, support for
@@ -38,9 +36,6 @@ import com.vaadin.server.PaintTarget;
 public class NativeSelect extends AbstractSelect implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
-    // width in characters, mimics TextField
-    private int columns = 0;
-
     FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) {
 
         @Override
@@ -69,56 +64,6 @@ public class NativeSelect extends AbstractSelect implements
         registerRpc(focusBlurRpc);
     }
 
-    /**
-     * Sets the width of the component so that it can display approximately the
-     * given number of letters.
-     * <p>
-     * Calling {@code setColumns(10);} is equivalent to calling
-     * {@code setWidth("10em");}
-     * </p>
-     * 
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     * @param columns
-     *            the number of columns to set.
-     */
-    @Deprecated
-    public void setColumns(int columns) {
-        if (columns < 0) {
-            columns = 0;
-        }
-        if (this.columns != columns) {
-            this.columns = columns;
-            markAsDirty();
-        }
-    }
-
-    /**
-     * Gets the number of columns for the component.
-     * 
-     * @see #setColumns(int)
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     */
-    @Deprecated
-    public int getColumns() {
-        return columns;
-    }
-
-    @Override
-    public void paintContent(PaintTarget target) throws PaintException {
-        // Adds the number of columns
-        if (columns != 0) {
-            target.addAttribute("cols", columns);
-        }
-
-        super.paintContent(target);
-    }
-
     @Override
     public void setMultiSelect(boolean multiSelect)
             throws UnsupportedOperationException {
diff --git a/server/src/main/java/com/vaadin/ui/TwinColSelect.java b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
index 06e06c3396..60ab09b24c 100644
--- a/server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
@@ -31,7 +31,6 @@ import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
 @SuppressWarnings("serial")
 public class TwinColSelect extends AbstractSelect {
 
-    private int columns = 0;
     private int rows = 0;
 
     private String leftColumnCaption;
@@ -62,46 +61,6 @@ public class TwinColSelect extends AbstractSelect {
         setMultiSelect(true);
     }
 
-    /**
-     * Sets the width of the component so that it displays approximately the
-     * given number of letters in each of the two selects.
-     * <p>
-     * Calling {@code setColumns(10);} is roughly equivalent to calling
-     * {@code setWidth((10*2+4)+"10em");}
-     * </p>
-     * 
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     * @param columns
-     *            the number of columns to set.
-     */
-    @Deprecated
-    public void setColumns(int columns) {
-        if (columns < 0) {
-            columns = 0;
-        }
-        if (this.columns != columns) {
-            this.columns = columns;
-            markAsDirty();
-        }
-    }
-
-    /**
-     * Gets the number of columns for the component.
-     * 
-     * @see #setColumns(int)
-     * @deprecated As of 7.0. "Columns" does not reflect the exact number of
-     *             characters that will be displayed. It is better to use
-     *             setWidth together with "em" to control the width of the
-     *             field.
-     */
-    @Deprecated
-    public int getColumns() {
-        return columns;
-    }
-
     public int getRows() {
         return rows;
     }
@@ -142,9 +101,6 @@ public class TwinColSelect extends AbstractSelect {
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
         // Adds the number of columns
-        if (columns != 0) {
-            target.addAttribute("cols", columns);
-        }
         // Adds the number of rows
         if (rows != 0) {
             target.addAttribute("rows", rows);