Added rest of the select components.

svn changeset:6446/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
index b24a23e6481dc6929460f2fe99b9291037ce11d0..116558c94c3c1c7195a3ff697de03182a2c77528 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
@@ -23,7 +23,10 @@ import com.itmill.toolkit.demo.sampler.features.notifications.NotificationError;
 import com.itmill.toolkit.demo.sampler.features.notifications.NotificationHumanized;
 import com.itmill.toolkit.demo.sampler.features.notifications.NotificationTray;
 import com.itmill.toolkit.demo.sampler.features.notifications.NotificationWarning;
+import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxContains;
+import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
 import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxPlain;
+import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxStartsWith;
 import com.itmill.toolkit.demo.sampler.features.selects.ListSelectMultiple;
 import com.itmill.toolkit.demo.sampler.features.selects.ListSelectSingle;
 import com.itmill.toolkit.demo.sampler.features.selects.NativeSelection;
@@ -134,6 +137,9 @@ public class FeatureSet extends Feature {
                     new TwinColumnSelect(), //
                     new NativeSelection(), //
                     new ComboBoxPlain(), //
+                    new ComboBoxStartsWith(), //
+                    new ComboBoxContains(), //
+                    new ComboBoxNewItems(), //
 
             }); 
         }   

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java
new file mode 100644 (file)
index 0000000..f91f9c2
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java
@@ -0,0 +1,35 @@
+package com.itmill.toolkit.demo.sampler.features.selects;\r
+\r
+import com.itmill.toolkit.demo.sampler.APIResource;\r
+import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
+import com.itmill.toolkit.ui.ComboBox;\r
+\r
+public class ComboBoxContains extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A drop-down selection component with single item selection."\r
+                + " A 'contains' filter has been used with this combo box,"\r
+                + " so you can key in some text and only the options"\r
+                + " containing your input will be shown.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(ComboBox.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, ComboBoxStartsWith.class,\r
+                ComboBoxNewItems.class };\r
+    }\r
+\r
+    @Override\r
+    public NamedExternalResource[] getRelatedResources() {\r
+        // TODO Auto-generated method stub\r
+        return null;\r
+    }\r
+\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.png b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.png
new file mode 100644 (file)
index 0000000..d803238
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContainsExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContainsExample.java
new file mode 100644 (file)
index 0000000..8630e89
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContainsExample.java
@@ -0,0 +1,37 @@
+package com.itmill.toolkit.demo.sampler.features.selects;\r
+\r
+import com.itmill.toolkit.data.Property;\r
+import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
+import com.itmill.toolkit.ui.ComboBox;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+import com.itmill.toolkit.ui.AbstractSelect.Filtering;\r
+\r
+public class ComboBoxContainsExample extends VerticalLayout implements\r
+        Property.ValueChangeListener {\r
+\r
+    private static final String[] cities = new String[] { "Berlin", "Brussels",\r
+            "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" };\r
+\r
+    public ComboBoxContainsExample() {\r
+        setSpacing(true);\r
+\r
+        ComboBox l = new ComboBox("Please select a city");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+\r
+        l.setFilteringMode(Filtering.FILTERINGMODE_CONTAINS);\r
+        l.setImmediate(true);\r
+        l.addListener(this);\r
+\r
+        addComponent(l);\r
+    }\r
+\r
+    /*\r
+     * Shows a notification when a selection is made.\r
+     */\r
+    public void valueChange(ValueChangeEvent event) {\r
+        getWindow().showNotification("Selected city: " + event.getProperty());\r
+\r
+    }\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java
new file mode 100644 (file)
index 0000000..7d8b60b
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java
@@ -0,0 +1,35 @@
+package com.itmill.toolkit.demo.sampler.features.selects;\r
+\r
+import com.itmill.toolkit.demo.sampler.APIResource;\r
+import com.itmill.toolkit.demo.sampler.Feature;\r
+import com.itmill.toolkit.demo.sampler.NamedExternalResource;\r
+import com.itmill.toolkit.ui.ComboBox;\r
+\r
+public class ComboBoxNewItems extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A drop-down selection component with single item selection."\r
+                + " This selection box also allows you to input your own"\r
+                + " choice. Your input will also be added to the selection"\r
+                + " of available choices.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(ComboBox.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, ComboBoxStartsWith.class,\r
+                ComboBoxContains.class };\r
+    }\r
+\r
+    @Override\r
+    public NamedExternalResource[] getRelatedResources() {\r
+        // TODO Auto-generated method stub\r
+        return null;\r
+    }\r
+\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.png b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.png
new file mode 100644 (file)
index 0000000..a7950b1
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java
new file mode 100644 (file)
index 0000000..2c4e57c
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java
@@ -0,0 +1,50 @@
+package com.itmill.toolkit.demo.sampler.features.selects;\r
+\r
+import com.itmill.toolkit.data.Property;\r
+import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
+import com.itmill.toolkit.ui.ComboBox;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+import com.itmill.toolkit.ui.AbstractSelect.Filtering;\r
+\r
+public class ComboBoxNewItemsExample extends VerticalLayout implements\r
+        Property.ValueChangeListener {\r
+\r
+    private static final String[] cities = new String[] { "Berlin", "Brussels",\r
+            "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" };\r
+    private ComboBox l;\r
+\r
+    public ComboBoxNewItemsExample() {\r
+        setSpacing(true);\r
+\r
+        l = new ComboBox("Please select a city");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+\r
+        l.setFilteringMode(Filtering.FILTERINGMODE_OFF);\r
+        l.setNewItemsAllowed(true);\r
+        l.setImmediate(true);\r
+        l.addListener(this);\r
+\r
+        addComponent(l);\r
+    }\r
+\r
+    /*\r
+     * Shows a notification when a selection is made.\r
+     */\r
+    public void valueChange(ValueChangeEvent event) {\r
+        Boolean newItem = true;\r
+        String s = event.getProperty().toString();\r
+\r
+        for (int i = 0; i < cities.length; i++) {\r
+            if (s == null || s.equals(cities[i])) {\r
+                newItem = false;\r
+            }\r
+        }\r
+        if (newItem) {\r
+            getWindow().showNotification("Selected an added item: " + s);\r
+        } else {\r
+            getWindow().showNotification("Selected city: " + s);\r
+        }\r
+    }\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
index 8bfa0b3ecdc8188a4fb352c681bf928ae11c897c..8f993b35954a0c0145419d311c16e0f7bd28438a 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
@@ -20,8 +20,8 @@ public class ComboBoxPlain extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ListSelectSingle.class, NativeSelection.class,\r
-                ListSelectMultiple.class, TwinColumnSelect.class };\r
+        return new Class[] { ComboBoxStartsWith.class, ComboBoxContains.class,\r
+                ComboBoxNewItems.class };\r
     }\r
 \r
     @Override\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java
index 25907566c539f39cbe996ff35f7fb57e4d266682..d90e549262a9d07a6f262ee5a14a26b9d5ad69ee 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java
@@ -22,9 +22,8 @@ public class ComboBoxStartsWith extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ComboBoxPlain.class, ListSelectSingle.class,\r
-                NativeSelection.class, ListSelectMultiple.class,\r
-                TwinColumnSelect.class };\r
+        return new Class[] { ComboBoxPlain.class, ComboBoxContains.class,\r
+                ComboBoxNewItems.class };\r
     }\r
 \r
     @Override\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
index d1c345634aea84b2369f10db15cdabca4bf9754b..372fcfc11967c3090f4f142ed81937f3c8d5e01c 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
@@ -22,8 +22,8 @@ public class ListSelectMultiple extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
-                ListSelectSingle.class, TwinColumnSelect.class };\r
+        return new Class[] { NativeSelection.class, ListSelectSingle.class,\r
+                TwinColumnSelect.class };\r
     }\r
 \r
     @Override\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
index cc495d3560949cf4fc90926937814beaa5182758..ba149e25492cb0eb8aedf44e95645db2f728229a 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
@@ -20,8 +20,8 @@ public class ListSelectSingle extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
-                ListSelectMultiple.class, TwinColumnSelect.class };\r
+        return new Class[] { NativeSelection.class, ListSelectMultiple.class,\r
+                TwinColumnSelect.class };\r
     }\r
 \r
     @Override\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
index 3bcf5253a1ccfe741140101741f7f60d0d4339b9..b6b54ef2d1cbcff41353239e4b20300ac38386eb 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
@@ -19,8 +19,8 @@ public class NativeSelection extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ComboBoxPlain.class, ListSelectSingle.class,\r
-                ListSelectMultiple.class, TwinColumnSelect.class };\r
+        return new Class[] { ListSelectSingle.class, ListSelectMultiple.class,\r
+                TwinColumnSelect.class };\r
     }\r
 \r
     @Override\r

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
index 3410ac64c609cf19f17063a971147e1fc993f24d..d91ebb297c44c21da00568cf63d719108f6c9fae 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
@@ -25,8 +25,8 @@ public class TwinColumnSelect extends Feature {
 \r
     @Override\r
     public Class[] getRelatedFeatures() {\r
-        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
-                ListSelectMultiple.class, ListSelectSingle.class };\r
+        return new Class[] { NativeSelection.class, ListSelectMultiple.class,\r
+                ListSelectSingle.class };\r
     }\r
 \r
     @Override\r