1 files changed, 8 insertions, 36 deletions

diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index 698350cb30..20345b55e0 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -676,15 +676,21 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
     }
 
     @Override
+    @Deprecated
     public void requestRepaint() {
-        super.requestRepaint();
+        markAsDirty();
+    }
+
+    @Override
+    public void markAsDirty() {
+        super.markAsDirty();
         optionRequest = false;
         prevfilterstring = filterstring;
         filterstring = null;
     }
 
     private void optionRepaint() {
-        super.requestRepaint();
+        super.markAsDirty();
     }
 
     @Override
@@ -697,40 +703,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
         return filteringMode;
     }
 
-    /**
-     * Note, one should use more generic setWidth(String) method instead of
-     * this. This now days actually converts columns to width with em css unit.
-     * 
-     * Sets the number of columns in the editor. If the number of columns is set
-     * 0, the actual number of displayed columns is determined implicitly by the
-     * adapter.
-     * 
-     * @deprecated
-     * 
-     * @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;
-            setWidth(columns, Select.UNITS_EM);
-            requestRepaint();
-        }
-    }
-
-    /**
-     * @deprecated see setter function
-     * @return
-     */
-    @Deprecated
-    public int getColumns() {
-        return columns;
-    }
-
     @Override
     public void addListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,