Select and AbstractSelect now check isNewItemsAllowed() before adding new items,...

svn changeset:7990/svn branch:6.0

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 4719a9837116f9e11f57f186d056f75f0b40277b..b2e52254f6d4d9785453bb5bcb091ab810160220 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -27,8 +27,8 @@ import com.vaadin.terminal.Resource;
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s
- * in a {@link com.vaadin.data.Container}.
+ * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
+ * {@link com.vaadin.data.Container}.
  * </p>
  * 
  * <p>
@@ -362,9 +362,11 @@ public abstract class AbstractSelect extends AbstractField implements
         super.changeVariables(source, variables);
 
         // New option entered (and it is allowed)
-        final String newitem = (String) variables.get("newitem");
-        if (newitem != null && newitem.length() > 0) {
-            getNewItemHandler().addNewItem(newitem);
+        if (isNewItemsAllowed()) {
+            final String newitem = (String) variables.get("newitem");
+            if (newitem != null && newitem.length() > 0) {
+                getNewItemHandler().addNewItem(newitem);
+            }
         }
 
         // Selection change
@@ -709,8 +711,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * Gets the Property identified by the given itemId and propertyId from the
      * Container
      * 
-     * @see com.vaadin.data.Container#getContainerProperty(Object,
-     *      Object)
+     * @see com.vaadin.data.Container#getContainerProperty(Object, Object)
      */
     public Property getContainerProperty(Object itemId, Object propertyId) {
         return items.getContainerProperty(itemId, propertyId);
@@ -1664,8 +1665,7 @@ public abstract class AbstractSelect extends AbstractField implements
             }
         }
 
-        public void valueChange(
-                com.vaadin.data.Property.ValueChangeEvent event) {
+        public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) {
             requestRepaint();
         }
 

diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index e18a7eaebe5928da3e8fb982690a2ca17585c5f6..9b16830a313aa870e8a5ceb96f6a3fd2c9717aac 100644 (file)
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -397,12 +397,14 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
         }
 
         // New option entered (and it is allowed)
-        final String newitem = (String) variables.get("newitem");
-        if (newitem != null && newitem.length() > 0) {
-            getNewItemHandler().addNewItem(newitem);
-            // rebuild list
-            filterstring = null;
-            prevfilterstring = null;
+        if (isNewItemsAllowed()) {
+            final String newitem = (String) variables.get("newitem");
+            if (newitem != null && newitem.length() > 0) {
+                getNewItemHandler().addNewItem(newitem);
+                // rebuild list
+                filterstring = null;
+                prevfilterstring = null;
+            }
         }
 
     }