From: Teppo Kurki Date: Wed, 7 Jan 2009 15:07:49 +0000 (+0000) Subject: First test commit. Hope I don't break anything. X-Git-Tag: 6.7.0.beta1~3403 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e8e030bb88e17fc5068033eed8e44fe89111210d;p=vaadin-framework.git 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 3e92e9ec79..5271ffba52 100644 --- 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 index 0000000000..8bfa0b3ecd --- /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; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.ComboBox; + +public class ComboBoxPlain extends Feature { + + @Override + public String getDescription() { + return "A drop-down selection component with single item selection." + + " No special features used in this example"; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(ComboBox.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { ListSelectSingle.class, NativeSelection.class, + ListSelectMultiple.class, TwinColumnSelect.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} 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 index 0000000000..1c044f9b97 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 index 0000000000..5fce013388 --- /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; + +import com.itmill.toolkit.data.Property; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.ComboBox; +import com.itmill.toolkit.ui.VerticalLayout; + +public class ComboBoxPlainExample extends VerticalLayout implements + Property.ValueChangeListener { + + private static final String[] cities = new String[] { "Berlin", "Brussels", + "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" }; + + public ComboBoxPlainExample() { + setSpacing(true); + + ComboBox l = new ComboBox("Please select a city"); + for (int i = 0; i < cities.length; i++) { + l.addItem(cities[i]); + } + + l.setNullSelectionAllowed(false); + l.setValue("Berlin"); + l.setImmediate(true); + l.addListener(this); + + addComponent(l); + } + + /* + * Shows a notification when a selection is made. + */ + @Override + public void valueChange(ValueChangeEvent event) { + getWindow().showNotification("Selected city: " + event.getProperty()); + + } +} 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 index 0000000000..d1c345634a --- /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; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.ListSelect; + +public class ListSelectMultiple extends Feature { + + @Override + public String getDescription() { + return "A simple list select component with multiple item selection." + + " A null selection is also allowed in this example." + + "
You can select multiple items from the list by holding" + + " the CTRL of SHIFT key while clicking the items."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(ListSelect.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { ComboBoxPlain.class, NativeSelection.class, + ListSelectSingle.class, TwinColumnSelect.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} 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 index 0000000000..8c6052f6c2 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 index 0000000000..fafe9cd0d6 --- /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; + +import com.itmill.toolkit.data.Property; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.ListSelect; +import com.itmill.toolkit.ui.VerticalLayout; + +public class ListSelectMultipleExample extends VerticalLayout implements + Property.ValueChangeListener { + + private static final String[] cities = new String[] { "Berlin", "Brussels", + "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" }; + + public ListSelectMultipleExample() { + setSpacing(true); + + ListSelect l = new ListSelect("Please select some cities"); + for (int i = 0; i < cities.length; i++) { + l.addItem(cities[i]); + } + l.setRows(7); + l.setNullSelectionAllowed(true); + l.setMultiSelect(true); + l.setImmediate(true); + l.addListener(this); + + addComponent(l); + } + + /* + * Shows a notification when a selection is made. + */ + @Override + public void valueChange(ValueChangeEvent event) { + getWindow().showNotification("Selected cities: " + event.getProperty()); + + } +} 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 index 0000000000..cc495d3560 --- /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; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.ListSelect; + +public class ListSelectSingle extends Feature { + + @Override + public String getDescription() { + return "A simple list select component with single item selection." + + " A null selection is not allowed in this example."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(ListSelect.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { ComboBoxPlain.class, NativeSelection.class, + ListSelectMultiple.class, TwinColumnSelect.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} 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 index 0000000000..ac55b53858 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 index 0000000000..f08b871083 --- /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; + +import com.itmill.toolkit.data.Property; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.ListSelect; +import com.itmill.toolkit.ui.VerticalLayout; + +public class ListSelectSingleExample extends VerticalLayout implements + Property.ValueChangeListener { + + private static final String[] cities = new String[] { "Berlin", "Brussels", + "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" }; + + public ListSelectSingleExample() { + setSpacing(true); + + ListSelect l = new ListSelect("Please select a city"); + for (int i = 0; i < cities.length; i++) { + l.addItem(cities[i]); + } + l.setRows(7); + l.setNullSelectionAllowed(false); + l.setValue("Berlin"); + l.setImmediate(true); + l.addListener(this); + + addComponent(l); + } + + /* + * Shows a notification when a selection is made. + */ + @Override + public void valueChange(ValueChangeEvent event) { + getWindow().showNotification("Selected city: " + event.getProperty()); + + } +} 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 index 0000000000..3bcf5253a1 --- /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; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.NativeSelect; + +public class NativeSelection extends Feature { + + @Override + public String getDescription() { + return "A native selection component provides a simple drop-down list for selecting one item."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(NativeSelect.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { ComboBoxPlain.class, ListSelectSingle.class, + ListSelectMultiple.class, TwinColumnSelect.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} 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 index 0000000000..480cc8035f 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 index 0000000000..e8af151ef3 --- /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; + +import com.itmill.toolkit.data.Property; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.NativeSelect; +import com.itmill.toolkit.ui.VerticalLayout; + +public class NativeSelectionExample extends VerticalLayout implements + Property.ValueChangeListener { + + private static final String[] cities = new String[] { "Berlin", "Brussels", + "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" }; + + public NativeSelectionExample() { + setSpacing(true); + + NativeSelect l = new NativeSelect("Please select a city"); + for (int i = 0; i < cities.length; i++) { + l.addItem(cities[i]); + } + + l.setNullSelectionAllowed(false); + l.setValue("Berlin"); + l.setImmediate(true); + l.addListener(this); + + addComponent(l); + } + + /* + * Shows a notification when a selection is made. + */ + @Override + public void valueChange(ValueChangeEvent event) { + getWindow().showNotification("Selected city: " + event.getProperty()); + + } +} 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 index 0000000000..3410ac64c6 --- /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; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.TwinColSelect; + +public class TwinColumnSelect extends Feature { + + @Override + public String getDescription() { + return "The TwinColumnSelect is a multiple selection component" + + " that shows two lists side by side. The list on the left" + + " shows the available items and the list on the right shows" + + " the selected items.
You can select items" + + " from the list on the left and click on the >> button to move" + + " them to the list on the right. Items can be moved back by" + + " selecting them and clicking on the << button."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(TwinColSelect.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { ComboBoxPlain.class, NativeSelection.class, + ListSelectMultiple.class, ListSelectSingle.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} 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 index 0000000000..b799a9e9c2 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 index 0000000000..06044a32be --- /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; + +import com.itmill.toolkit.data.Property; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.TwinColSelect; +import com.itmill.toolkit.ui.VerticalLayout; + +public class TwinColumnSelectExample extends VerticalLayout implements + Property.ValueChangeListener { + + private static final String[] cities = new String[] { "Berlin", "Brussels", + "Helsinki", "Madrid", "Oslo", "Paris", "Stockholm" }; + + public TwinColumnSelectExample() { + setSpacing(true); + + TwinColSelect l = new TwinColSelect("Please select some cities"); + for (int i = 0; i < cities.length; i++) { + l.addItem(cities[i]); + } + l.setRows(7); + l.setNullSelectionAllowed(true); + l.setMultiSelect(true); + l.setImmediate(true); + l.addListener(this); + + addComponent(l); + } + + /* + * Shows a notification when a selection is made. + */ + @Override + public void valueChange(ValueChangeEvent event) { + if (!event.getProperty().toString().equals("[]")) { + getWindow().showNotification( + "Selected cities: " + event.getProperty()); + } + } +}