First test commit. Hope I don't break anything.

svn changeset:6437/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
index 3e92e9ec79985a2f7fdb1381512ae944366c7148..5271ffba5239163a4d070ded81822509e458684e 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
@@ -20,6 +20,11 @@ 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.ComboBoxPlain;
+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;
+import com.itmill.toolkit.demo.sampler.features.selects.TwinColumnSelect;
 
 /**
  * Contains the FeatureSet implementation and the structure for the feature
@@ -61,6 +66,7 @@ public class FeatureSet extends Feature {
                     new Buttons(), //
                     new Links(), //
                     new Notifications(), //
+                    new Selects(), //
             });
         }
     }
@@ -115,6 +121,20 @@ public class FeatureSet extends Feature {
         }
     }
 
+    public static class Selects extends FeatureSet {
+        public Selects() {
+            super("Selects", new Feature[] {
+            //
+                    new ListSelectSingle(), //  
+                    new ListSelectMultiple(), //
+                    new TwinColumnSelect(), //
+                    new NativeSelection(), //
+                    new ComboBoxPlain(), //
+
+            });
+        }
+    }
+
     // ----------------------------------------------------------
     /*
      * FeatureSet implementation follows.

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
new file mode 100644 (file)
index 0000000..8bfa0b3
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
@@ -0,0 +1,33 @@
+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 ComboBoxPlain extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A drop-down selection component with single item selection."\r
+                + " No special features used in this example";\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[] { ListSelectSingle.class, NativeSelection.class,\r
+                ListSelectMultiple.class, TwinColumnSelect.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/ComboBoxPlain.png b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.png
new file mode 100644 (file)
index 0000000..1c044f9
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlainExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlainExample.java
new file mode 100644 (file)
index 0000000..5fce013
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlainExample.java
@@ -0,0 +1,38 @@
+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
+\r
+public class ComboBoxPlainExample 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 ComboBoxPlainExample() {\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.setNullSelectionAllowed(false);\r
+        l.setValue("Berlin");\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
+    @Override\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/ListSelectMultiple.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
new file mode 100644 (file)
index 0000000..d1c3456
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.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.ListSelect;\r
+\r
+public class ListSelectMultiple extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A simple list select component with multiple item selection."\r
+                + " A null selection is also allowed in this example."\r
+                + "<br>You can select multiple items from the list by holding"\r
+                + " the CTRL of SHIFT key while clicking the items.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(ListSelect.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
+                ListSelectSingle.class, TwinColumnSelect.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/ListSelectMultiple.png b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.png
new file mode 100644 (file)
index 0000000..8c6052f
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultipleExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultipleExample.java
new file mode 100644 (file)
index 0000000..fafe9cd
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultipleExample.java
@@ -0,0 +1,38 @@
+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.ListSelect;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+\r
+public class ListSelectMultipleExample 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 ListSelectMultipleExample() {\r
+        setSpacing(true);\r
+\r
+        ListSelect l = new ListSelect("Please select some cities");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+        l.setRows(7);\r
+        l.setNullSelectionAllowed(true);\r
+        l.setMultiSelect(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
+    @Override\r
+    public void valueChange(ValueChangeEvent event) {\r
+        getWindow().showNotification("Selected cities: " + event.getProperty());\r
+\r
+    }\r
+}\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
new file mode 100644 (file)
index 0000000..cc495d3
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
@@ -0,0 +1,33 @@
+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.ListSelect;\r
+\r
+public class ListSelectSingle extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A simple list select component with single item selection."\r
+                + " A null selection is not allowed in this example.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(ListSelect.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
+                ListSelectMultiple.class, TwinColumnSelect.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/ListSelectSingle.png b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.png
new file mode 100644 (file)
index 0000000..ac55b53
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingleExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingleExample.java
new file mode 100644 (file)
index 0000000..f08b871
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingleExample.java
@@ -0,0 +1,38 @@
+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.ListSelect;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+\r
+public class ListSelectSingleExample 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 ListSelectSingleExample() {\r
+        setSpacing(true);\r
+\r
+        ListSelect l = new ListSelect("Please select a city");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+        l.setRows(7);\r
+        l.setNullSelectionAllowed(false);\r
+        l.setValue("Berlin");\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
+    @Override\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/NativeSelection.java b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
new file mode 100644 (file)
index 0000000..3bcf525
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
@@ -0,0 +1,32 @@
+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.NativeSelect;\r
+\r
+public class NativeSelection extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "A native selection component provides a simple drop-down list for selecting one item.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(NativeSelect.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, ListSelectSingle.class,\r
+                ListSelectMultiple.class, TwinColumnSelect.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/NativeSelection.png b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.png
new file mode 100644 (file)
index 0000000..480cc80
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelectionExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelectionExample.java
new file mode 100644 (file)
index 0000000..e8af151
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelectionExample.java
@@ -0,0 +1,38 @@
+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.NativeSelect;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+\r
+public class NativeSelectionExample 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 NativeSelectionExample() {\r
+        setSpacing(true);\r
+\r
+        NativeSelect l = new NativeSelect("Please select a city");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+\r
+        l.setNullSelectionAllowed(false);\r
+        l.setValue("Berlin");\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
+    @Override\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/TwinColumnSelect.java b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
new file mode 100644 (file)
index 0000000..3410ac6
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
@@ -0,0 +1,38 @@
+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.TwinColSelect;\r
+\r
+public class TwinColumnSelect extends Feature {\r
+\r
+    @Override\r
+    public String getDescription() {\r
+        return "The TwinColumnSelect is a multiple selection component"\r
+                + " that shows two lists side by side. The list on the left"\r
+                + " shows the available items and the list on the right shows"\r
+                + " the selected items. <br>You can select items"\r
+                + " from the list on the left and click on the >> button to move"\r
+                + " them to the list on the right. Items can be moved back by"\r
+                + " selecting them and clicking on the << button.";\r
+    }\r
+\r
+    @Override\r
+    public APIResource[] getRelatedAPI() {\r
+        return new APIResource[] { new APIResource(TwinColSelect.class) };\r
+    }\r
+\r
+    @Override\r
+    public Class[] getRelatedFeatures() {\r
+        return new Class[] { ComboBoxPlain.class, NativeSelection.class,\r
+                ListSelectMultiple.class, ListSelectSingle.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/TwinColumnSelect.png b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.png
new file mode 100644 (file)
index 0000000..b799a9e
Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.png differ

diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelectExample.java b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelectExample.java
new file mode 100644 (file)
index 0000000..06044a3
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelectExample.java
@@ -0,0 +1,40 @@
+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.TwinColSelect;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+\r
+public class TwinColumnSelectExample 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 TwinColumnSelectExample() {\r
+        setSpacing(true);\r
+\r
+        TwinColSelect l = new TwinColSelect("Please select some cities");\r
+        for (int i = 0; i < cities.length; i++) {\r
+            l.addItem(cities[i]);\r
+        }\r
+        l.setRows(7);\r
+        l.setNullSelectionAllowed(true);\r
+        l.setMultiSelect(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
+    @Override\r
+    public void valueChange(ValueChangeEvent event) {\r
+        if (!event.getProperty().toString().equals("[]")) {\r
+            getWindow().showNotification(\r
+                    "Selected cities: " + event.getProperty());\r
+        }\r
+    }\r
+}\r