git commit: ISIS-339: autocomplete only fire if a character has been entered.

[da...@apache.org]

Updated Branches:
  refs/heads/master fad081ff9 -> 27c766e09


ISIS-339: autocomplete only fire if a character has been entered.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/27c766e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/27c766e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/27c766e0

Branch: refs/heads/master
Commit: 27c766e09e6cc058cc437b8ab28e04ee917fcc81
Parents: fad081f
Author: Dan Haywood <da...@apache.org>
Authored: Thu Feb 14 15:41:44 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Feb 14 15:41:44 2013 +0000

----------------------------------------------------------------------
 .../widgets/entitylink/EntityLinkSelect2Panel.java |    5 ++-
 .../dom/src/main/java/dom/todo/ToDoItem.java       |   23 ++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/27c766e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
index 6d2aa62..b5014c2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
@@ -72,6 +72,8 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
 
     private static final String ID_ENTITY_CLEAR_LINK = "entityClearLink";
     private static final String ID_FEEDBACK = "feedback";
+    
+    private static final int MIN_INPUT_LENGTH = 1;
 
     private Select2Choice<ObjectAdapterMemento> autoCompleteField;
     private Link<String> entityDetailsLink;
@@ -147,7 +149,7 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
     @Override
     public String getInput() {
         final ObjectAdapter pendingElseCurrentAdapter = getEntityModel().getPendingElseCurrentAdapter();
-        return pendingElseCurrentAdapter != null? pendingElseCurrentAdapter.titleString(): "[null]";
+        return pendingElseCurrentAdapter != null? pendingElseCurrentAdapter.titleString(): "(no object)";
     }
 
     @Override
@@ -206,6 +208,7 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
             
         };
         autoCompleteField = new Select2Choice<ObjectAdapterMemento>(ID_AUTO_COMPLETE, model, provider);
+        autoCompleteField.getSettings().setMinimumInputLength(MIN_INPUT_LENGTH);
         addOrReplace(autoCompleteField);
         
         // no need for link, since can see in drop-down

http://git-wip-us.apache.org/repos/asf/isis/blob/27c766e0/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 7a4e757..efaa2d8 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -18,11 +18,13 @@
  */
 package dom.todo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import javax.jdo.JDOHelper;
+import javax.jdo.annotations.Column;
 import javax.jdo.annotations.Element;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.Join;
@@ -77,7 +79,7 @@ import com.google.common.collect.Lists;
         value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && category == :category"),
     @javax.jdo.annotations.Query(
             name="todo_autoComplete", language="JDOQL",  
-            value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && description.startsWith(:description)")
+            value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && description.indexOf(:description) >= 0")
 })
 @javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER, column="VERSION")
 @ObjectType("TODO")
@@ -463,6 +465,25 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
     }
     // }}
 
+    
+    // {{ Cost (property)
+    
+    private BigDecimal cost;
+
+    @Optional
+    @Column(scale=4)
+    @MemberOrder(sequence = "99")
+    public BigDecimal getCost() {
+        return cost;
+    }
+
+    public void setCost(final BigDecimal cost) {
+        this.cost = cost;
+    }
+    // }}
+
+
+    
     // {{ injected: DomainObjectContainer
     @SuppressWarnings("unused")
     private DomainObjectContainer container;