diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:31 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-02-12 15:49:49 +0200 |
| commit | 42f2387165471d08bbd24d4c3ae4a271d2cda4c5 (patch) | |
| tree | 4418a7610edf326d308f65ee0d79d4d09c341a93 /server/src/com/vaadin/ui/ComboBox.java | |
| parent | 50381a619458017d69b044435a22fae457a5d4c1 (diff) | |
| parent | 40e07d0172532ebf5750b8c2aab5ec892e42cdab (diff) | |
| download | vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.tar.gz vaadin-framework-42f2387165471d08bbd24d4c3ae4a271d2cda4c5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: I8f1f412eeb450688bba58b715eba6db9e4ae43ae
Diffstat (limited to 'server/src/com/vaadin/ui/ComboBox.java')
| -rw-r--r-- | server/src/com/vaadin/ui/ComboBox.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 88e895df82..5fb2f81011 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -56,8 +56,6 @@ public class ComboBox extends AbstractSelect implements */ protected int pageLength = 10; - private int columns = 0; - // Current page when the user is 'paging' trough options private int currentPage = -1; |