From e7a60f1ce4606de7d186c201f4fe569171893d83 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Tue, 10 Feb 2009 19:44:21 +0000 Subject: [PATCH] Sorted and renamed samples, small example changes, made Feature.getName() abstract. svn changeset:6789/svn branch:trunk --- .../itmill/toolkit/demo/sampler/Feature.java | 13 ++- .../toolkit/demo/sampler/FeatureSet.java | 34 +++---- .../demo/sampler/SamplerApplication.java | 3 +- .../accordions/AccordionDisabled.java | 2 +- .../blueprints/ProminentPrimaryAction.java | 5 ++ .../sampler/features/buttons/ButtonLink.java | 5 ++ .../sampler/features/buttons/ButtonPush.java | 5 ++ .../features/buttons/ButtonSwitch.java | 5 ++ .../demo/sampler/features/commons/Errors.java | 5 ++ .../demo/sampler/features/commons/Icons.java | 5 ++ .../sampler/features/commons/Tooltips.java | 5 ++ .../sampler/features/commons/Validation.java | 5 ++ .../sampler/features/dates/DateInline.java | 2 +- .../sampler/features/dates/DateLocale.java | 2 +- .../sampler/features/dates/DatePopup.java | 2 +- .../features/dates/DateResolution.java | 2 +- .../demo/sampler/features/form/FormBasic.java | 5 ++ .../demo/sampler/features/form/FormPojo.java | 5 ++ .../features/link/LinkCurrentWindow.java | 5 ++ .../features/link/LinkNoDecorations.java | 5 ++ .../features/link/LinkSizedWindow.java | 5 ++ .../notifications/NotificationCustom.java | 5 ++ .../notifications/NotificationError.java | 5 ++ .../notifications/NotificationHumanized.java | 5 ++ .../notifications/NotificationTray.java | 5 ++ .../notifications/NotificationWarning.java | 5 ++ .../sampler/features/panels/PanelBasic.java | 2 +- .../features/selects/ComboBoxContains.java | 2 +- .../features/selects/ComboBoxNewItems.java | 2 +- .../features/selects/ComboBoxStartsWith.java | 2 +- .../features/selects/ListSelectMultiple.java | 2 +- .../features/selects/ListSelectSingle.java | 2 +- .../features/selects/TwinColumnSelect.java | 7 +- .../sampler/features/table/TableActions.java | 5 ++ .../features/table/TableCellStyling.java | 5 ++ .../features/table/TableColumnAlignment.java | 5 ++ .../features/table/TableColumnCollapsing.java | 5 ++ .../features/table/TableColumnHeaders.java | 5 ++ .../features/table/TableColumnReordering.java | 5 ++ .../features/table/TableHeaderIcons.java | 5 ++ .../features/table/TableLazyLoading.java | 5 ++ .../features/table/TableMouseEvents.java | 5 ++ .../features/table/TableRowHeaders.java | 5 ++ .../features/table/TableRowStyling.java | 5 ++ .../sampler/features/table/TableSorting.java | 5 ++ .../features/tabsheets/TabSheetDisabled.java | 2 +- .../features/tabsheets/TabSheetScrolling.java | 2 +- .../sampler/features/text/LabelPlain.java | 2 +- .../features/text/LabelPreformatted.java | 2 +- .../demo/sampler/features/text/LabelRich.java | 2 +- .../sampler/features/trees/TreeActions.java | 2 +- .../features/trees/TreeMouseEvents.java | 2 +- .../features/trees/TreeMultiSelect.java | 2 +- .../trees/TreeMultiSelectExample.java | 89 ++++++++++--------- .../features/trees/TreeSingleSelect.java | 2 +- 55 files changed, 245 insertions(+), 91 deletions(-) diff --git a/src/com/itmill/toolkit/demo/sampler/Feature.java b/src/com/itmill/toolkit/demo/sampler/Feature.java index 8fb4880008..a63902aad4 100644 --- a/src/com/itmill/toolkit/demo/sampler/Feature.java +++ b/src/com/itmill/toolkit/demo/sampler/Feature.java @@ -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. *

*

- * The name of the NamedExternalResource will be shown in the UI.
- * Note that Javadoc should be referenced via {@link #getRelatedAPI()}. + * The name of the NamedExternalResource will be shown in the UI.
Note + * that Javadoc should be referenced via {@link #getRelatedAPI()}. *

* * @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 */ diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java index 8f1ef44afc..1ab90fde41 100644 --- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java +++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java @@ -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(), // }); } } diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java index a405b1dd86..aadf405edb 100644 --- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java +++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java @@ -693,8 +693,7 @@ public class SamplerApplication extends Application { b.setIcon(res); b.setWidth("75px"); b.setHeight("75px"); - b.setDescription("

" + f.getName() + "

" - + f.getDescription()); + b.setDescription("

" + f.getName() + "

"); b.addListener(new Button.ClickListener() { public void buttonClick(ClickEvent event) { ((SamplerWindow) getWindow()).setFeature(f); diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java index 0670165204..2841f07d03 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java +++ b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java @@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.Accordion; public class AccordionDisabled extends Feature { @Override public String getName() { - return "Accordion - Disabling tabs"; + return "Accordion, disabled tabs"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java index aaebc9aa49..fff0628d3c 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java +++ b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java @@ -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" diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java index 996ea8d66c..9e78fbe375 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java @@ -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.
" diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java index 6988bee270..19915db726 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java @@ -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."; diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java index 585a218f56..6101151f74 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java @@ -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.
Also know as a CheckBox."; diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java index 2f1a9286a9..6589c70c4a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java @@ -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; } diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java index 3ac547809d..057ebf9608 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java @@ -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 icon," diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java index 4b729aefef..20a5d9d8d6 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java @@ -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 description," diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java index 2bbbfce8ae..566578303c 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java @@ -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."; diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java b/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java index 6b2b41216c..2af5a13ae0 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java +++ b/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java @@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.InlineDateField; public class DateInline extends Feature { @Override public String getName() { - return "Date selection inline"; + return "Inline date selection"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java b/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java index 1f50d78611..931d3190c1 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java +++ b/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java @@ -11,7 +11,7 @@ import com.itmill.toolkit.ui.InlineDateField; public class DateLocale extends Feature { @Override public String getName() { - return "Date selection - Locale"; + return "Date selection, locale"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java b/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java index 373f2bfc34..babca8cec5 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java +++ b/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java @@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.PopupDateField; public class DatePopup extends Feature { @Override public String getName() { - return "Date selection pop-up"; + return "Pop-up date selection"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java b/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java index 174d1b2326..dde24187ac 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java +++ b/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java @@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.InlineDateField; public class DateResolution extends Feature { @Override public String getName() { - return "Date selection - Resolution"; + return "Date selection, resolution"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java b/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java index ec47e47466..36e90cd711 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java +++ b/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java b/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java index cc94464e46..28d46b2a4c 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java +++ b/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java index 7c10562a74..7db6f43898 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java @@ -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" diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java index ae2ee5b000..2759c08146 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java @@ -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" diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java index 05abb6f095..bd6a02706e 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java @@ -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" diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java index f4d2afe3be..77fb90f425 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java @@ -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," diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java index 2ca8e6a08a..b89dd925d5 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java @@ -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," diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java index 406cb101b6..fa2c41b74f 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java @@ -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," diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java index f55223fe9c..c1551fc72c 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java @@ -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," diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java index da0f477d0d..421088906e 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java @@ -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," diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java index ab834ca2ff..3186994559 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java +++ b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java @@ -10,7 +10,7 @@ import com.itmill.toolkit.ui.Panel; public class PanelBasic extends Feature { @Override public String getName() { - return "Panel with caption"; + return "Panel"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java index 7a7905c92e..0a07130e01 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox; public class ComboBoxContains extends Feature { @Override public String getName() { - return "Combobox - Contains"; + return "Combobox, suggesting (contains)"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java index 8417dc0f3d..293adaf76d 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox; public class ComboBoxNewItems extends Feature { @Override public String getName() { - return "Combobox - Add items"; + return "Combobox, enter new items"; } @Override 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 46a694956e..ccabcae411 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ComboBox; public class ComboBoxStartsWith extends Feature { @Override public String getName() { - return "Combobox - Starts with"; + return "Combobox, suggesting (starts-with)"; } @Override 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 e71680643d..adb609ce78 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ListSelect; public class ListSelectMultiple extends Feature { @Override public String getName() { - return "Listselect - Multi"; + return "List select, multiple selections"; } @Override 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 e8865ae20a..dc1ee06185 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.ListSelect; public class ListSelectSingle extends Feature { @Override public String getName() { - return "Listselect - Single"; + return "List select, single selection"; } @Override 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 98a8a89f04..9ce8ae5706 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TwinColSelect; public class TwinColumnSelect extends Feature { @Override public String getName() { - return "Twin column select"; + return "Twin column select (list builder)"; } @Override @@ -35,8 +35,9 @@ public class TwinColumnSelect extends Feature { @Override public NamedExternalResource[] getRelatedResources() { - // TODO Auto-generated method stub - return null; + return new NamedExternalResource[] { new NamedExternalResource( + "Open Source Design Pattern Library; List Builder", + "http://www.uidesignpatterns.org/content/list-builder") }; } } diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java index f16ef3084b..08b1367a0b 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java index 8883b66846..bb39a844cc 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java index 25f411e8e3..516166d6a5 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java index 9f616f4d8b..d9fc25fde6 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java index 1c8fd4e697..9d6a1e68e6 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java index 571980562e..67654b9834 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java index 6e9c019c2a..da50cf4b3a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java index e7f41e03ad..0883ee1659 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java index d51ad4dd38..a4875279dc 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java index 6ce014fe72..4d0ffe316f 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java index 883064f8d0..a165e3e527 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java b/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java index a52a3cd125..f8ec3588fa 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java +++ b/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java @@ -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(); diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java index ffa5898c26..5822c8e14f 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java +++ b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TabSheet; public class TabSheetDisabled extends Feature { @Override public String getName() { - return "Tabsheet - Disabling tabs"; + return "Tabsheet, disabled tabs"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java index 8155727bbc..d0f01e9582 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java +++ b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.TabSheet; public class TabSheetScrolling extends Feature { @Override public String getName() { - return "Tabsheet - Scrolling tabs"; + return "Tabsheet, scrolling tabs"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java b/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java index b65c5ff538..241cad83d2 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java +++ b/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label; public class LabelPlain extends Feature { @Override public String getName() { - return "Label - Plain text"; + return "Label, plain text"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java b/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java index 7658991dc6..0a73ef1ad8 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java +++ b/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label; public class LabelPreformatted extends Feature { @Override public String getName() { - return "Label - Preformatted"; + return "Label, preformatted"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java b/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java index 2772effd13..2efe72525e 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java +++ b/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Label; public class LabelRich extends Feature { @Override public String getName() { - return "Label - Rich text"; + return "Label, rich text"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java index c49058daf3..942b15db4a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java +++ b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java @@ -9,7 +9,7 @@ import com.itmill.toolkit.ui.Tree; public class TreeActions extends Feature { @Override public String getName() { - return "Tree - Actions"; + return "Tree, context menu"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java index 646fe60870..6dfa186aed 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java +++ b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree; public class TreeMouseEvents extends Feature { @Override public String getName() { - return "Tree - Mouse events"; + return "Tree, mouse events"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java index cd85db5644..3dce33f3fa 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java +++ b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree; public class TreeMultiSelect extends Feature { @Override public String getName() { - return "Tree - Multiselect"; + return "Tree, multiple selections"; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java index c012b81d56..5d421b4d91 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java +++ b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java @@ -1,8 +1,11 @@ package com.itmill.toolkit.demo.sampler.features.trees; +import java.util.Iterator; import java.util.Set; import com.itmill.toolkit.data.Item; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.data.Property.ValueChangeListener; import com.itmill.toolkit.demo.sampler.ExampleUtil; import com.itmill.toolkit.event.Action; import com.itmill.toolkit.ui.AbstractSelect; @@ -12,58 +15,62 @@ import com.itmill.toolkit.ui.VerticalLayout; import com.itmill.toolkit.ui.Button.ClickEvent; public class TreeMultiSelectExample extends VerticalLayout implements - Button.ClickListener, Action.Handler { + Action.Handler { private static final Action ACTION_ADD = new Action("Add child item"); private static final Action ACTION_DELETE = new Action("Delete"); private static final Action[] ACTIONS = new Action[] { ACTION_ADD, ACTION_DELETE }; - private Tree t; - private Button delete; - private int itemId; + private Tree tree; + private Button deleteButton; public TreeMultiSelectExample() { setSpacing(true); // Create new Tree object using a hierarchical container from // ExampleUtil class - t = new Tree("Hardware Inventory", ExampleUtil.getHardwareContainer()); + tree = new Tree("Hardware Inventory", ExampleUtil + .getHardwareContainer()); + // Set multiselect mode + tree.setMultiSelect(true); + tree.setImmediate(true); + tree.addListener(new ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + Tree t = (Tree) event.getProperty(); + // enable if something is selected, returns a set + deleteButton.setEnabled(t.getValue() != null + && ((Set) t.getValue()).size() > 0); + } + }); // Add Actionhandler - - t.addActionHandler(this); - - t.setImmediate(true); + tree.addActionHandler(this); // Set tree to show the 'name' property as caption for items - t.setItemCaptionPropertyId(ExampleUtil.hw_PROPERTY_NAME); - t.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY); - - // Starting itemId # for new items - itemId = t.getContainerDataSource().size(); + tree.setItemCaptionPropertyId(ExampleUtil.hw_PROPERTY_NAME); + tree.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY); // Expand whole tree - for (int i = 0; i < itemId; i++) { - t.expandItemsRecursively(i); + for (Iterator it = tree.rootItemIds().iterator(); it.hasNext();) { + tree.expandItemsRecursively(it.next()); } - // Create the 'delete button' - delete = new Button("Delete", this, "buttonClick"); + // Create the 'delete button', inline click-listener + deleteButton = new Button("Delete", new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + // Delete all the selected objects + Object[] toDelete = ((Set) tree.getValue()).toArray(); + for (int i = 0; i < toDelete.length; i++) { + handleAction(ACTION_DELETE, tree, toDelete[i]); + } + } + }); + deleteButton.setEnabled(false); - addComponent(delete); - addComponent(t); + addComponent(deleteButton); + addComponent(tree); - // Set multiselect mode - t.setMultiSelect(true); - } - - public void buttonClick(ClickEvent event) { - // Delete all the selected objects - Object[] toDelete = ((Set) t.getValue()).toArray(); - for (int i = 0; i < toDelete.length; i++) { - handleAction(ACTION_DELETE, t, toDelete[i]); - } } /* @@ -79,24 +86,24 @@ public class TreeMultiSelectExample extends VerticalLayout implements public void handleAction(Action action, Object sender, Object target) { if (action == ACTION_ADD) { // Allow children for the target item - t.setChildrenAllowed(target, true); + tree.setChildrenAllowed(target, true); // Create new item, disallow children, add name, set parent - Item i = t.addItem(itemId); - t.setChildrenAllowed(itemId, false); + Object itemId = tree.addItem(); + tree.setChildrenAllowed(itemId, false); String newItemName = "New Item # " + itemId; - i.getItemProperty(ExampleUtil.hw_PROPERTY_NAME).setValue( + Item item = tree.getItem(itemId); + item.getItemProperty(ExampleUtil.hw_PROPERTY_NAME).setValue( newItemName); - t.setParent(itemId, target); - t.expandItem(target); - itemId++; + tree.setParent(itemId, target); + tree.expandItem(target); } else if (action == ACTION_DELETE) { - Object parent = t.getParent(target); - t.removeItem(target); + Object parent = tree.getParent(target); + tree.removeItem(target); // If the deleted object's parent has no more children, set it's // childrenallowed property to false - if (parent != null && t.getChildren(parent).size() == 0) { - t.setChildrenAllowed(parent, false); + if (parent != null && tree.getChildren(parent).size() == 0) { + tree.setChildrenAllowed(parent, false); } } } diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java index 09eff2247a..08b113970f 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java +++ b/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java @@ -8,7 +8,7 @@ import com.itmill.toolkit.ui.Tree; public class TreeSingleSelect extends Feature { @Override public String getName() { - return "Tree - Single select"; + return "Tree, single selection"; } @Override -- 2.39.5