diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/ui/ComboBox.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 42996803d3..dc064e925b 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -115,8 +115,6 @@ public class ComboBox extends AbstractSelect implements // Current page when the user is 'paging' trough options private int currentPage = -1; - private FilteringMode filteringMode = FilteringMode.STARTSWITH; - private String filterstring; private String prevfilterstring; @@ -207,7 +205,7 @@ public class ComboBox extends AbstractSelect implements private boolean isFilteringNeeded() { return filterstring != null && filterstring.length() > 0 - && filteringMode != FilteringMode.OFF; + && getFilteringMode() != FilteringMode.OFF; } @Override @@ -240,8 +238,6 @@ public class ComboBox extends AbstractSelect implements String[] selectedKeys = new String[(getValue() == null && getNullSelectionItemId() == null ? 0 : 1)]; - target.addAttribute("filteringmode", getFilteringMode().toString()); - // Paints the options and create array of selected id keys int keyIndex = 0; @@ -438,7 +434,7 @@ public class ComboBox extends AbstractSelect implements Filterable filterable = (Filterable) container; - Filter filter = buildFilter(filterstring, filteringMode); + Filter filter = buildFilter(filterstring, getFilteringMode()); // adding and removing filters leads to extraneous item set // change events from the underlying container, but the ComboBox does @@ -693,7 +689,7 @@ public class ComboBox extends AbstractSelect implements } else { caption = caption.toLowerCase(getLocale()); } - switch (filteringMode) { + switch (getFilteringMode()) { case CONTAINS: if (caption.indexOf(filterstring) > -1) { filteredOptions.add(itemId); @@ -736,12 +732,12 @@ public class ComboBox extends AbstractSelect implements @Override public void setFilteringMode(FilteringMode filteringMode) { - this.filteringMode = filteringMode; + getState().filteringMode = filteringMode; } @Override public FilteringMode getFilteringMode() { - return filteringMode; + return getState(false).filteringMode; } @Override |