From de05408170b4a66070e85f3f91b26f2dffb4b743 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 13 Feb 2009 08:41:09 +0000
Subject: [PATCH] Sampler: password textfield sample added, separate icon for
 related category.

svn changeset:6827/svn branch:trunk
---
 .../ITMILL/themes/sampler/icons/category.gif  | Bin 0 -> 240 bytes
 .../toolkit/demo/sampler/FeatureSet.java      |   2 +
 .../toolkit/demo/sampler/FeatureView.java     |   4 +-
 .../features/text/75-TextFieldSecret.png      | Bin 0 -> 5297 bytes
 .../features/text/TextFieldSecret.java        |  41 ++++++++++++++++++
 .../features/text/TextFieldSecretExample.java |  40 +++++++++++++++++
 .../features/text/TextFieldSingle.java        |  15 ++++---
 .../features/text/TextFieldSingleExample.java |   1 -
 8 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 WebContent/ITMILL/themes/sampler/icons/category.gif
 create mode 100644 src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSecret.png
 create mode 100644 src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java
 create mode 100644 src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java

diff --git a/WebContent/ITMILL/themes/sampler/icons/category.gif b/WebContent/ITMILL/themes/sampler/icons/category.gif
new file mode 100644
index 0000000000000000000000000000000000000000..15a5ad37873d039e51c984f2598f4a6cba87104d
GIT binary patch
literal 240
zcmV<M01y91Nk%w1VGsZi0E8X@>&8+3^S0~HG5`DX_vDxJ+k@-8M)>Nr>$W}p^Tho3
z==}80>(iM0?yURn!};l<_T#GS&3W<FcI&b?>#j2G&T01Gjrr=m|M$-S_r>eai|f&h
z|Mt`N=CJ?&|NsC0A^8LW0018VEC2ui01yBW000GT;3tk`X`X0WGK>~QD&t{vRsn#Z
z3!_Y9nP4Um$nZp)K@DJNA`lbG2uD>|9gagnDgq3?ibmr>AXpsS4}e1ylP!h9Aq`lF
q$L4}W(n%W<Zg~<F6%c+23kwMj7Y7{>5Ep(=loOVhX)2m3Apkpcjdtq*

literal 0
HcmV?d00001

diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
index 01f1b434d7..c573d19efa 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
@@ -70,6 +70,7 @@ import com.itmill.toolkit.demo.sampler.features.text.LabelPreformatted;
 import com.itmill.toolkit.demo.sampler.features.text.LabelRich;
 import com.itmill.toolkit.demo.sampler.features.text.RichTextEditor;
 import com.itmill.toolkit.demo.sampler.features.text.TextArea;
+import com.itmill.toolkit.demo.sampler.features.text.TextFieldSecret;
 import com.itmill.toolkit.demo.sampler.features.text.TextFieldSingle;
 import com.itmill.toolkit.demo.sampler.features.trees.TreeActions;
 import com.itmill.toolkit.demo.sampler.features.trees.TreeMouseEvents;
@@ -349,6 +350,7 @@ public class FeatureSet extends Feature {
                     new Feature[] {
                     //      
                             new TextFieldSingle(), //
+                            new TextFieldSecret(), //
                             new TextArea(), //
                             new RichTextEditor(), //
                     });
diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureView.java b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
index 9f234a4703..8458d23991 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureView.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
@@ -200,7 +200,9 @@ public class FeatureView extends HorizontalLayout {
                         ActiveLink al = new ActiveLink(f.getName(),
                                 new ExternalResource(getApplication().getURL()
                                         + "#" + path));
-                        al.setIcon(new ThemeResource("icons/sample.png"));
+                        al.setIcon(new ThemeResource(
+                                (f instanceof FeatureSet ? "icons/category.gif"
+                                        : "icons/sample.png")));
                         al.addListener(new LinkActivatedListener() {
                             public void linkActivated(LinkActivatedEvent event) {
                                 if (event.isLinkOpened()) {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSecret.png b/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSecret.png
new file mode 100644
index 0000000000000000000000000000000000000000..929c79e05ae75f89a82e4f686de244f5adf1f587
GIT binary patch
literal 5297
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
Dr^Pd_

literal 0
HcmV?d00001

diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java
new file mode 100644
index 0000000000..d743ed0648
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java
@@ -0,0 +1,41 @@
+package com.itmill.toolkit.demo.sampler.features.text;
+
+import com.itmill.toolkit.demo.sampler.APIResource;
+import com.itmill.toolkit.demo.sampler.Feature;
+import com.itmill.toolkit.demo.sampler.FeatureSet;
+import com.itmill.toolkit.demo.sampler.NamedExternalResource;
+import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
+import com.itmill.toolkit.ui.TextField;
+
+public class TextFieldSecret extends Feature {
+    @Override
+    public String getName() {
+        return "Text field, secret (password)";
+    }
+
+    @Override
+    public String getDescription() {
+        return "For sensitive data input, such as passwords, the text field can"
+                + " also be set into secret mode where the input will not be"
+                + " echoed to display.";
+    }
+
+    @Override
+    public APIResource[] getRelatedAPI() {
+        return new APIResource[] { new APIResource(TextField.class) };
+    }
+
+    @Override
+    public Class[] getRelatedFeatures() {
+        // TODO update CB -ref to 'suggest' pattern, when available
+        return new Class[] { TextFieldSingle.class, ComboBoxNewItems.class,
+                FeatureSet.Texts.class };
+    }
+
+    @Override
+    public NamedExternalResource[] getRelatedResources() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java
new file mode 100644
index 0000000000..51f5c9ec8f
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java
@@ -0,0 +1,40 @@
+package com.itmill.toolkit.demo.sampler.features.text;
+
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
+import com.itmill.toolkit.ui.Button.ClickEvent;
+
+public class TextFieldSecretExample extends VerticalLayout {
+
+    private final TextField username;
+    private final TextField password;
+
+    public TextFieldSecretExample() {
+        setSizeUndefined(); // let content 'push' size
+        setSpacing(true);
+
+        // Username
+        username = new TextField("Username");
+        addComponent(username);
+
+        // Password
+        password = new TextField("Password");
+        password.setSecret(true);
+        addComponent(password);
+
+        // Login button
+        Button loginButton = new Button("Login", new Button.ClickListener() {
+            // inline click listener
+            public void buttonClick(ClickEvent event) {
+                getWindow().showNotification(
+                        "User: " + username.getValue() + " Password: "
+                                + password.getValue());
+
+            }
+        });
+        addComponent(loginButton);
+        setComponentAlignment(loginButton, "right");
+
+    }
+}
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java
index 23a114bfa3..a10b53a4aa 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java
@@ -4,19 +4,22 @@ import com.itmill.toolkit.demo.sampler.APIResource;
 import com.itmill.toolkit.demo.sampler.Feature;
 import com.itmill.toolkit.demo.sampler.FeatureSet;
 import com.itmill.toolkit.demo.sampler.NamedExternalResource;
+import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
 import com.itmill.toolkit.ui.TextField;
 
 public class TextFieldSingle extends Feature {
     @Override
     public String getName() {
-        return "Textfield";
+        return "Text field";
     }
 
     @Override
     public String getDescription() {
-        return "For sensitive data input, the textfield can"
-                + " also be set into secret mode where the input will not be"
-                + " echoed to display.";
+        return "A single-line TextField is a fundamental UI building blocks"
+                + " with numerous uses.<br/>"
+                + "If the input would benefit from remembering previous values,"
+                + " you might want to consider using a ComboBox it it's "
+                + " 'suggesting mode' instead.";
     }
 
     @Override
@@ -26,7 +29,9 @@ public class TextFieldSingle extends Feature {
 
     @Override
     public Class[] getRelatedFeatures() {
-        return new Class[] { FeatureSet.Texts.class };
+        // TODO update CB -ref to 'suggest' pattern, when available
+        return new Class[] { TextFieldSecret.class, ComboBoxNewItems.class,
+                FeatureSet.Texts.class };
     }
 
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java
index a8f01c9870..2639becc29 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java
@@ -16,7 +16,6 @@ public class TextFieldSingleExample extends VerticalLayout implements
         editor.addListener(this);
         editor.setImmediate(true);
         // editor.setColumns(5); // guarantees that at least 5 chars fit
-        // editor.setSecret(true); // e.g. for passwords
 
         addComponent(editor);
     }
-- 
2.39.5