]> source.dussan.org Git - vaadin-framework.git/commitdiff
Sorted and renamed samples, small example changes, made Feature.getName() abstract.
authorMarc Englund <marc.englund@itmill.com>
Tue, 10 Feb 2009 19:44:21 +0000 (19:44 +0000)
committerMarc Englund <marc.englund@itmill.com>
Tue, 10 Feb 2009 19:44:21 +0000 (19:44 +0000)
svn changeset:6789/svn branch:trunk

55 files changed:
src/com/itmill/toolkit/demo/sampler/Feature.java
src/com/itmill/toolkit/demo/sampler/FeatureSet.java
src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java
src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java
src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java
src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java
src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java
src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java
src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java
src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java
src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java
src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java
src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java
src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java
src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java
src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java
src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java
src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java
src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java
src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java
src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java
src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java
src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java
src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java
src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java
src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java
src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java
src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java
src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java
src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java
src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java
src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java
src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java
src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java
src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java
src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java
src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java
src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java
src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java
src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java
src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java
src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java
src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java
src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java
src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java
src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java
src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java
src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java
src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java
src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java
src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java

index 8fb488000849d0324e698b8bd99666c43ecb05bc..a63902aad44f1007d5c0c0025a6573245b22fb4c 100644 (file)
@@ -28,14 +28,11 @@ abstract public class Feature {
     private String javaSource = null;
 
     /**
-     * Gets the name of this feature. Defaults to class simplename, override if
-     * needed. Try not to exceed 25 characters too much.
+     * Gets the name of this feature. Try not to exceed 25 characters too much.
      * 
      * @return
      */
-    public String getName() {
-        return getClass().getSimpleName();
-    }
+    abstract public String getName();
 
     /**
      * Gets the description for this feature. Should describe what the example
@@ -57,8 +54,8 @@ abstract public class Feature {
      * May return null, if the example has no related resources.
      * </p>
      * <p>
-     * The name of the NamedExternalResource will be shown in the UI. <br/>
-     * Note that Javadoc should be referenced via {@link #getRelatedAPI()}.
+     * The name of the NamedExternalResource will be shown in the UI. <br/> Note
+     * that Javadoc should be referenced via {@link #getRelatedAPI()}.
      * </p>
      * 
      * @see #getThemeBase()
@@ -166,7 +163,7 @@ abstract public class Feature {
 
     /**
      * Gets the name used when resolving the path for this feature. Usually no
-     * need to overrride.
+     * need to override.
      * 
      * @return
      */
index 8f1ef44afc1bdaf3c9fc6b4c36299e5fdaae0b3f..1ab90fde413ff1fceb4fc61be4923e7b1c7e5ee7 100644 (file)
@@ -119,21 +119,21 @@ public class FeatureSet extends Feature {
         public Components() {
             super("Components", new Feature[] {
             //
-                    new Commons(), //
+                    new Common(), //
+                    new Accordions(), //
                     new Buttons(), //
+                    new Dates(), //
+                    new Forms(), // 
+                    new Layouts(), //
                     new Links(), //
                     new Notifications(), //
-                    new Selects(), //
-                    new Layouts(), //
-                    new Tabsheets(), //
-                    new Accordions(), //
                     new Panels(), //
-                    new Forms(), // not done yet
-                    new Windows(), //
+                    new Selects(), //
                     new Tables(),//
+                    new Tabsheets(), //
                     new Texts(), //
                     new Trees(), //
-                    new Dates(), //
+                    new Windows(), //
             });
         }
     }
@@ -178,9 +178,9 @@ public class FeatureSet extends Feature {
         }
     }
 
-    public static class Commons extends FeatureSet {
-        public Commons() {
-            super("Commons", new Feature[] {
+    public static class Common extends FeatureSet {
+        public Common() {
+            super("Common", new Feature[] {
             //
                     new Tooltips(), // 
                     new Icons(), //
@@ -285,18 +285,18 @@ public class FeatureSet extends Feature {
         public Tables() {
             super("Table (Grid)", new Feature[] {
             //        
-                    new TableColumnHeaders(), //
-                    new TableRowHeaders(), //
                     new TableHeaderIcons(), //
+                    new TableColumnHeaders(), //
                     new TableColumnReordering(), //
                     new TableColumnCollapsing(), //
-                    new TableSorting(), //
                     new TableColumnAlignment(), //
-                    new TableActions(), //
-                    new TableLazyLoading(), //
-                    new TableRowStyling(), //
                     new TableCellStyling(), //
+                    new TableSorting(), //
+                    new TableRowHeaders(), //
+                    new TableRowStyling(), //
+                    new TableActions(), //
                     new TableMouseEvents(), //
+                    new TableLazyLoading(), //
             });
         }
     }
index a405b1dd86ce3c56c48c957f124002d540140743..aadf405edba4f93ff7040001220fe8ed0d7063d7 100644 (file)
@@ -693,8 +693,7 @@ public class SamplerApplication extends Application {
                     b.setIcon(res);
                     b.setWidth("75px");
                     b.setHeight("75px");
-                    b.setDescription("<h3>" + f.getName() + "</h3>"
-                            + f.getDescription());
+                    b.setDescription("<h3>" + f.getName() + "</h3>");
                     b.addListener(new Button.ClickListener() {
                         public void buttonClick(ClickEvent event) {
                             ((SamplerWindow) getWindow()).setFeature(f);
index 06701652042abe654edba734acc2975740583321..2841f07d03c84152186804a0f5ea217d220aefb1 100644 (file)
@@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.Accordion;
 public class AccordionDisabled extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Accordion - Disabling tabs";\r
+        return "Accordion, disabled tabs";\r
     }\r
 \r
     @Override\r
index aaebc9aa49f01f4680d995d2f537d6f060c88244..fff0628d3ce9c60fe61e397cc85df0a3db3213e4 100644 (file)
@@ -10,6 +10,11 @@ import com.itmill.toolkit.ui.Link;
 
 public class ProminentPrimaryAction extends Feature {
 
+    @Override
+    public String getName() {
+        return "Prominent primary action";
+    }
+
     @Override
     public String getDescription() {
         return "A primary action is an action that is clearly the"
index 996ea8d66c00861eebe63341ff9ec251347f68b6..9e78fbe375a1219ca07656a37a73cb633bdce029 100644 (file)
@@ -12,6 +12,11 @@ import com.itmill.toolkit.ui.Button;
 
 public class ButtonLink extends Feature {
 
+    @Override
+    public String getName() {
+        return "Link button";
+    }
+
     @Override
     public String getDescription() {
         return "A link-styled button; works like a Button but looks like a Link.<br/>"
index 6988bee270937741e58c7f3e686ea21303694c9e..19915db7264bd04bbf3d7efe2359420ac1915e17 100644 (file)
@@ -8,6 +8,11 @@ import com.itmill.toolkit.ui.Button;
 
 public class ButtonPush extends Feature {
 
+    @Override
+    public String getName() {
+        return "Push button";
+    }
+
     @Override
     public String getDescription() {
         return "A basic push-button.";
index 585a218f568798377346d6bdbe8a4320b2bd5a02..6101151f744e13e182803f3ac3a254e240ff0803 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Button;
 
 public class ButtonSwitch extends Feature {
 
+    @Override
+    public String getName() {
+        return "Switch button";
+    }
+
     @Override
     public String getDescription() {
         return "A switch button works like a regular button, triggering a server-side event, but it's state is 'sticky' - it toggles on or off, instead of popping right back out.<br/>Also know as a CheckBox.";
index 2f1a9286a9548bd051470cdd05df48d0f63fb051..6589c70c4a9e77dbc6f8326642c48139ec68fdec 100644 (file)
@@ -25,6 +25,11 @@ public class Errors extends Feature {
             + "If there is no component causing the error, consider using a"
             + " (styled) Label or a Notification to indicate the error.";
 
+    @Override
+    public String getName() {
+        return "Error indicator";
+    }
+
     public String getDescription() {
         return desc;
     }
index 3ac547809da4eedd53af6446df9213e7a3e8e93c..057ebf96084d12570d45cbb7d28ec373c2cc7c33 100644 (file)
@@ -14,6 +14,11 @@ import com.itmill.toolkit.ui.Component;
 
 public class Icons extends Feature {
 
+    @Override
+    public String getName() {
+        return "Icons";
+    }
+
     @Override
     public String getDescription() {
         return "Most components can have an <i>icon</i>,"
index 4b729aefefb0dea96ca33d2fcaea3c5e55c050d2..20a5d9d8d65cbc0560e7828bf8d9e3c1a58108c2 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.AbstractComponent;
 
 public class Tooltips extends Feature {
 
+    @Override
+    public String getName() {
+        return "Tooltips";
+    }
+
     @Override
     public String getDescription() {
         return "Most components can have a <i>description</i>,"
index 2bbbfce8ae78f15d76dfaba63525142861a33aa9..566578303ccb203f7d7a97143cf1ff4d64e754f9 100644 (file)
@@ -12,6 +12,11 @@ import com.itmill.toolkit.ui.Form;
 
 public class Validation extends Feature {
 
+    @Override
+    public String getName() {
+        return "Validation";
+    }
+
     private static final String desc = "Fields can have Validators that check"
             + " entered values. This is most useful when used within a Form, but"
             + " but can be used to validate single, stand-alone Fields as well.";
index 6b2b41216c024d5c889899768604a73c481f1e58..2af5a13ae08e4eb9adf50e0efce78b9bfe5112ff 100644 (file)
@@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.InlineDateField;
 public class DateInline extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Date selection inline";\r
+        return "Inline date selection";\r
     }\r
 \r
     @Override\r
index 1f50d78611d770f920e92bd565c1dfc711852693..931d3190c14be50040c529c0b8b3adf2093f7909 100644 (file)
@@ -11,7 +11,7 @@ import com.itmill.toolkit.ui.InlineDateField;
 public class DateLocale extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Date selection - Locale";\r
+        return "Date selection, locale";\r
     }\r
 \r
     @Override\r
index 373f2bfc3497803accf5942e3482f6c89fca7325..babca8cec561592172775dae9f65a13a38620ad9 100644 (file)
@@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.PopupDateField;
 public class DatePopup extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Date selection pop-up";\r
+        return "Pop-up date selection";\r
     }\r
 \r
     @Override\r
index 174d1b23264782176d18600f12246aeb3cbca614..dde24187acb71ac3301f54e75cb62a13ec64960f 100644 (file)
@@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.InlineDateField;
 public class DateResolution extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Date selection - Resolution";\r
+        return "Date selection, resolution";\r
     }\r
 \r
     @Override\r
index ec47e4746654d4755b0225f8a039dd07d7b8edee..36e90cd711df02439dd1d4e4afc889363b4dfa48 100644 (file)
@@ -13,6 +13,11 @@ import com.itmill.toolkit.ui.Form;
 
 public class FormBasic extends Feature {
 
+    @Override
+    public String getName() {
+        return "Form";
+    }
+
     @Override
     public Component getExample() {
         return new FormPojoExample();
index cc94464e460e4266904822535106cc75b67d750b..28d46b2a4cb87aef95b94bddb5cee9e3c86ad8cc 100644 (file)
@@ -13,6 +13,11 @@ import com.itmill.toolkit.ui.Form;
 
 public class FormPojo extends Feature {
 
+    @Override
+    public String getName() {
+        return "Bean-bound form";
+    }
+
     @Override
     public Component getExample() {
         return new FormPojoExample();
index 7c10562a7420eb621e41ab2ba08926c3bf2613a9..7db6f43898bdb71838c1db85af3d9c7b895e070f 100644 (file)
@@ -8,6 +8,11 @@ import com.itmill.toolkit.ui.Link;
 
 public class LinkCurrentWindow extends Feature {
 
+    @Override
+    public String getName() {
+        return "Link";
+    }
+
     @Override
     public String getDescription() {
         return "An external link - this is the basic HTML-style link, changing"
index ae2ee5b0002323d4eb9377cfbb8be594d2e37002..2759c08146e20bd5d289b9015ef90bba0c3396a0 100644 (file)
@@ -8,6 +8,11 @@ import com.itmill.toolkit.ui.Link;
 
 public class LinkNoDecorations extends Feature {
 
+    @Override
+    public String getName() {
+        return "Link, configure window";
+    }
+
     @Override
     public String getDescription() {
         return "An basic HTML-style (external) link, opening a browser window"
index 05abb6f09554736cbc0282984e3d103f865600a8..bd6a02706ebf01efd5f84e1e80d9e9ccb78a001c 100644 (file)
@@ -8,6 +8,11 @@ import com.itmill.toolkit.ui.Link;
 
 public class LinkSizedWindow extends Feature {
 
+    @Override
+    public String getName() {
+        return "Link, sized window";
+    }
+
     @Override
     public String getDescription() {
         return "An basic HTML-style (external) link, opening a small window w/o"
index f4d2afe3beb0589d5c93b6ee2f52aec391ccbe78..77fb90f4256c912ca3ae3d767177383ec885df97 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window;
 
 public class NotificationCustom extends Feature {
 
+    @Override
+    public String getName() {
+        return "Customized notification";
+    }
+
     @Override
     public String getDescription() {
         return "Notifications are lightweight informational messages,"
index 2ca8e6a08a49421e26fbffe4d335ba1d13cdf84c..b89dd925d5a378a544cffcab4e25a4509373f538 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window;
 
 public class NotificationError extends Feature {
 
+    @Override
+    public String getName() {
+        return "Error notification";
+    }
+
     @Override
     public String getDescription() {
         return "Notifications are lightweight informational messages,"
index 406cb101b615679f239c2c60c9a164844c712509..fa2c41b74fa9b4d6c0a7eaf144396a059065cce8 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window;
 
 public class NotificationHumanized extends Feature {
 
+    @Override
+    public String getName() {
+        return "Humanized notification";
+    }
+
     @Override
     public String getDescription() {
         return "Notifications are lightweight informational messages,"
index f55223fe9cb218254007346b1dd0f4494a5a33c1..c1551fc72cb62c47a281e463569e80f889727a31 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window;
 
 public class NotificationTray extends Feature {
 
+    @Override
+    public String getName() {
+        return "Tray notification";
+    }
+
     @Override
     public String getDescription() {
         return "Notifications are lightweight informational messages,"
index da0f477d0d908f6c9710623bfec500fb7c7fc33b..421088906e3b11a7895eb7cec6024716c3cca481 100644 (file)
@@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window;
 
 public class NotificationWarning extends Feature {
 
+    @Override
+    public String getName() {
+        return "Warning notification";
+    }
+
     @Override
     public String getDescription() {
         return "Notifications are lightweight informational messages,"
index ab834ca2ff337e5935dd7a2da4d44010552a7ec4..3186994559bd5815e5e52a94e662e122c3d4db52 100644 (file)
@@ -10,7 +10,7 @@ import com.itmill.toolkit.ui.Panel;
 public class PanelBasic extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Panel with caption";\r
+        return "Panel";\r
     }\r
 \r
     @Override\r
index 7a7905c92e369cc3cb864f9d84e7a54e70c29811..0a07130e013fb6b2885b02aa2d582aeda2ff3d06 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox;
 public class ComboBoxContains extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Combobox - Contains";\r
+        return "Combobox, suggesting (contains)";\r
     }\r
 \r
     @Override\r
index 8417dc0f3de278eb19647662b7d2212850105342..293adaf76d47b033f7a11f08a246eb6a1490334e 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox;
 public class ComboBoxNewItems extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Combobox - Add items";\r
+        return "Combobox, enter new items";\r
     }\r
 \r
     @Override\r
index 46a694956ed97d2b6e66552627ad28e5a42e547d..ccabcae41131bc736e144383fa843b98772dcf3c 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox;
 public class ComboBoxStartsWith extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Combobox - Starts with";\r
+        return "Combobox, suggesting (starts-with)";\r
     }\r
 \r
     @Override\r
index e71680643dd25620b5f66253d4ee2a6413929086..adb609ce7853efdc817485018b735b6baa00df2b 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ListSelect;
 public class ListSelectMultiple extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Listselect - Multi";\r
+        return "List select, multiple selections";\r
     }\r
 \r
     @Override\r
index e8865ae20a2c458c445ef2b54d1408ea91a3e93c..dc1ee06185977d4644fdc40089657b84057b4ab9 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ListSelect;
 public class ListSelectSingle extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Listselect - Single";\r
+        return "List select, single selection";\r
     }\r
 \r
     @Override\r
index 98a8a89f0404fca1c0eebfc2e2499857d3b994c5..9ce8ae57060f877d4831bcf867e1ef11ac6dd7a6 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TwinColSelect;
 public class TwinColumnSelect extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Twin column select";\r
+        return "Twin column select (list builder)";\r
     }\r
 \r
     @Override\r
@@ -35,8 +35,9 @@ public class TwinColumnSelect extends Feature {
 \r
     @Override\r
     public NamedExternalResource[] getRelatedResources() {\r
-        // TODO Auto-generated method stub\r
-        return null;\r
+        return new NamedExternalResource[] { new NamedExternalResource(\r
+                "Open Source Design Pattern Library; List Builder",\r
+                "http://www.uidesignpatterns.org/content/list-builder") };\r
     }\r
 \r
 }\r
index f16ef3084b72b640fca8a90a3a7d3eaba7037f13..08b1367a0b954ae36f3de8f16d08c58de04b2dda 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableActions extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, context menu";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 8883b66846a9237b12f6281d3c7a4222c578143c..bb39a844cca553909609619daaba16ac51d342cd 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableCellStyling extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, styling cells";
+    }
+
     @Override
     public Component getExample() {
         return new TableStylingExample();
index 25f411e8e3edadb5e71b1349d1ceca9fbe4a8961..516166d6a5a2dd56fc74e6a98e1de8d9263f3923 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableColumnAlignment extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, column alignment";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 9f616f4d8b9b281a27323aef21ea036e81bf6d55..d9fc25fde6a2db6e1a7acf6d6ba1a881a1e15f16 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableColumnCollapsing extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, column collapsing";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 1c8fd4e697d0836158b946c1e8615d37cefaa5ae..9d6a1e68e61d843d17b43cc12488a1c1c28ad3a4 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableColumnHeaders extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, column headers";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 571980562e462d34de0063b0a9b17856f1c83ceb..67654b98345b91d2702709fc3356c0f4402d5d68 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableColumnReordering extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, column drag&drop";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 6e9c019c2aa95d93dd87d84a2f5dc1190d3d09a2..da50cf4b3a84242c0aa1f137c344963e44d5cb8f 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableHeaderIcons extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, icons in headers";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index e7f41e03adebaf8b060cd35a701f94f0285f5fba..0883ee1659fdf1dffa8b87a8bb959c932b4a0825 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableLazyLoading extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, lazy loading";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index d51ad4dd38be6020b6ce4e7e297244933cef3244..a4875279dce46b0acca9ad9127d12fbfbf40c385 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableMouseEvents extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, mouse events";
+    }
+
     @Override
     public Component getExample() {
         return new TableStylingExample();
index 6ce014fe7217e8b20c97c89366303859da866e5a..4d0ffe316f78bc9917308f2b7f94cb4d596c48b9 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableRowHeaders extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, row headers";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index 883064f8d0f410e2ff0d35bbe03614473f685aba..a165e3e527b94d14681ae61632c23cfe56c78968 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableRowStyling extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, row styling";
+    }
+
     @Override
     public Component getExample() {
         return new TableStylingExample();
index a52a3cd1259ee47b15092102d3eac1856058c090..f8ec3588fa7ac6a631e49bc71c4e8d02de91f514 100644 (file)
@@ -9,6 +9,11 @@ import com.itmill.toolkit.ui.Table;
 
 public class TableSorting extends Feature {
 
+    @Override
+    public String getName() {
+        return "Table, sorting";
+    }
+
     @Override
     public Component getExample() {
         return new TableMainFeaturesExample();
index ffa5898c26b29bb37a31648907e63228030dcd48..5822c8e14fa8f82dcf2492df4dcdb3a1e5616c2c 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TabSheet;
 public class TabSheetDisabled extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tabsheet - Disabling tabs";\r
+        return "Tabsheet, disabled tabs";\r
     }\r
 \r
     @Override\r
index 8155727bbc4fef71656439b6f48f69eed2fb6c37..d0f01e9582bcc6526ebba183bb0f28541922c715 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TabSheet;
 public class TabSheetScrolling extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tabsheet - Scrolling tabs";\r
+        return "Tabsheet, scrolling tabs";\r
     }\r
 \r
     @Override\r
index b65c5ff538f3b8a8537f556b02e49c849b40d6c3..241cad83d2be0a76d91d171433da6a4f0f738c5b 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label;
 public class LabelPlain extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Label - Plain text";\r
+        return "Label, plain text";\r
     }\r
 \r
     @Override\r
index 7658991dc60a9f0120fc1c1ecd806c3287e7ce8f..0a73ef1ad850f813a7aec2ed0f7e85433f6406ff 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label;
 public class LabelPreformatted extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Label - Preformatted";\r
+        return "Label, preformatted";\r
     }\r
 \r
     @Override\r
index 2772effd13e0236b3c547d8d0c975e6ea1fe16d8..2efe72525e005941d8a88f3f7a1ca1a2d80289c9 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label;
 public class LabelRich extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Label - Rich text";\r
+        return "Label, rich text";\r
     }\r
 \r
     @Override\r
index c49058daf363beff107b5a7c9a441c0b0c5180db..942b15db4ac266db024965ef2cb8975a45e52d4d 100644 (file)
@@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.Tree;
 public class TreeActions extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tree - Actions";\r
+        return "Tree, context menu";\r
     }\r
 \r
     @Override\r
index 646fe6087091ee12029f248703d75116a8197c76..6dfa186aedeb437f001031d81ade44307ba3a7a0 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree;
 public class TreeMouseEvents extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tree - Mouse events";\r
+        return "Tree, mouse events";\r
     }\r
 \r
     @Override\r
index cd85db564431a4b9ddedfe14fecde26c0bedc043..3dce33f3fac5030512b7596b0475b9a47ed57f59 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree;
 public class TreeMultiSelect extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tree - Multiselect";\r
+        return "Tree, multiple selections";\r
     }\r
 \r
     @Override\r
index c012b81d56f7dbaa11cdd5d68ea6fe9c0c04c752..5d421b4d91ba36fe5146bcf56ecaeb73c91c639e 100644 (file)
@@ -1,8 +1,11 @@
 package com.itmill.toolkit.demo.sampler.features.trees;\r
 \r
+import java.util.Iterator;\r
 import java.util.Set;\r
 \r
 import com.itmill.toolkit.data.Item;\r
+import com.itmill.toolkit.data.Property.ValueChangeEvent;\r
+import com.itmill.toolkit.data.Property.ValueChangeListener;\r
 import com.itmill.toolkit.demo.sampler.ExampleUtil;\r
 import com.itmill.toolkit.event.Action;\r
 import com.itmill.toolkit.ui.AbstractSelect;\r
@@ -12,58 +15,62 @@ import com.itmill.toolkit.ui.VerticalLayout;
 import com.itmill.toolkit.ui.Button.ClickEvent;\r
 \r
 public class TreeMultiSelectExample extends VerticalLayout implements\r
-        Button.ClickListener, Action.Handler {\r
+        Action.Handler {\r
 \r
     private static final Action ACTION_ADD = new Action("Add child item");\r
     private static final Action ACTION_DELETE = new Action("Delete");\r
     private static final Action[] ACTIONS = new Action[] { ACTION_ADD,\r
             ACTION_DELETE };\r
 \r
-    private Tree t;\r
-    private Button delete;\r
-    private int itemId;\r
+    private Tree tree;\r
+    private Button deleteButton;\r
 \r
     public TreeMultiSelectExample() {\r
         setSpacing(true);\r
 \r
         // Create new Tree object using a hierarchical container from\r
         // ExampleUtil class\r
-        t = new Tree("Hardware Inventory", ExampleUtil.getHardwareContainer());\r
+        tree = new Tree("Hardware Inventory", ExampleUtil\r
+                .getHardwareContainer());\r
+        // Set multiselect mode\r
+        tree.setMultiSelect(true);\r
+        tree.setImmediate(true);\r
+        tree.addListener(new ValueChangeListener() {\r
+            public void valueChange(ValueChangeEvent event) {\r
+                Tree t = (Tree) event.getProperty();\r
+                // enable if something is selected, returns a set\r
+                deleteButton.setEnabled(t.getValue() != null\r
+                        && ((Set) t.getValue()).size() > 0);\r
+            }\r
+        });\r
 \r
         // Add Actionhandler\r
-\r
-        t.addActionHandler(this);\r
-\r
-        t.setImmediate(true);\r
+        tree.addActionHandler(this);\r
 \r
         // Set tree to show the 'name' property as caption for items\r
-        t.setItemCaptionPropertyId(ExampleUtil.hw_PROPERTY_NAME);\r
-        t.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY);\r
-\r
-        // Starting itemId # for new items\r
-        itemId = t.getContainerDataSource().size();\r
+        tree.setItemCaptionPropertyId(ExampleUtil.hw_PROPERTY_NAME);\r
+        tree.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY);\r
 \r
         // Expand whole tree\r
-        for (int i = 0; i < itemId; i++) {\r
-            t.expandItemsRecursively(i);\r
+        for (Iterator it = tree.rootItemIds().iterator(); it.hasNext();) {\r
+            tree.expandItemsRecursively(it.next());\r
         }\r
 \r
-        // Create the 'delete button'\r
-        delete = new Button("Delete", this, "buttonClick");\r
+        // Create the 'delete button', inline click-listener\r
+        deleteButton = new Button("Delete", new Button.ClickListener() {\r
+            public void buttonClick(ClickEvent event) {\r
+                // Delete all the selected objects\r
+                Object[] toDelete = ((Set<Object>) tree.getValue()).toArray();\r
+                for (int i = 0; i < toDelete.length; i++) {\r
+                    handleAction(ACTION_DELETE, tree, toDelete[i]);\r
+                }\r
+            }\r
+        });\r
+        deleteButton.setEnabled(false);\r
 \r
-        addComponent(delete);\r
-        addComponent(t);\r
+        addComponent(deleteButton);\r
+        addComponent(tree);\r
 \r
-        // Set multiselect mode\r
-        t.setMultiSelect(true);\r
-    }\r
-\r
-    public void buttonClick(ClickEvent event) {\r
-        // Delete all the selected objects\r
-        Object[] toDelete = ((Set<Object>) t.getValue()).toArray();\r
-        for (int i = 0; i < toDelete.length; i++) {\r
-            handleAction(ACTION_DELETE, t, toDelete[i]);\r
-        }\r
     }\r
 \r
     /*\r
@@ -79,24 +86,24 @@ public class TreeMultiSelectExample extends VerticalLayout implements
     public void handleAction(Action action, Object sender, Object target) {\r
         if (action == ACTION_ADD) {\r
             // Allow children for the target item\r
-            t.setChildrenAllowed(target, true);\r
+            tree.setChildrenAllowed(target, true);\r
 \r
             // Create new item, disallow children, add name, set parent\r
-            Item i = t.addItem(itemId);\r
-            t.setChildrenAllowed(itemId, false);\r
+            Object itemId = tree.addItem();\r
+            tree.setChildrenAllowed(itemId, false);\r
             String newItemName = "New Item # " + itemId;\r
-            i.getItemProperty(ExampleUtil.hw_PROPERTY_NAME).setValue(\r
+            Item item = tree.getItem(itemId);\r
+            item.getItemProperty(ExampleUtil.hw_PROPERTY_NAME).setValue(\r
                     newItemName);\r
-            t.setParent(itemId, target);\r
-            t.expandItem(target);\r
-            itemId++;\r
+            tree.setParent(itemId, target);\r
+            tree.expandItem(target);\r
         } else if (action == ACTION_DELETE) {\r
-            Object parent = t.getParent(target);\r
-            t.removeItem(target);\r
+            Object parent = tree.getParent(target);\r
+            tree.removeItem(target);\r
             // If the deleted object's parent has no more children, set it's\r
             // childrenallowed property to false\r
-            if (parent != null && t.getChildren(parent).size() == 0) {\r
-                t.setChildrenAllowed(parent, false);\r
+            if (parent != null && tree.getChildren(parent).size() == 0) {\r
+                tree.setChildrenAllowed(parent, false);\r
             }\r
         }\r
     }\r
index 09eff2247a81e13295ab867309ba17be8e0c5db2..08b113970f83a02216d55d5afd3987b97746fd67 100644 (file)
@@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree;
 public class TreeSingleSelect extends Feature {\r
     @Override\r
     public String getName() {\r
-        return "Tree - Single select";\r
+        return "Tree, single selection";\r
     }\r
 \r
     @Override\r