svn commit: r1042867 - in /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete: AbstractAutoCompleteBehavior.java AutoCompleteBehavior.java

[pedro]

Author: pedro
Date: Mon Dec  6 23:51:23 2010
New Revision: 1042867

URL: http://svn.apache.org/viewvc?rev=1042867&view=rev
Log:
- code cleanup
- deprecating the preselect variable that was no longer used and start to 
consider its value (it is protected, we can't just remove it )

Issue: WICKET-3235

Modified:
    
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
    
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java

Modified: 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=1042867&r1=1042866&r2=1042867&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
 Mon Dec  6 23:51:23 2010
@@ -37,9 +37,36 @@ public abstract class AbstractAutoComple
 
        private static final long serialVersionUID = 1L;
 
+       /**
+        * Use {...@link AutoCompleteSettings#setPreselect(boolean)}
+        */
+       @Deprecated
        protected boolean preselect = false;
 
-       protected AutoCompleteSettings settings = new AutoCompleteSettings();
+       protected AutoCompleteSettings settings;
+
+       /**
+        * Constructor that creates an default {...@link AutoCompleteSettings}
+        */
+       public AbstractAutoCompleteBehavior()
+       {
+               this(new AutoCompleteSettings());
+       }
+
+       /**
+        * Constructor
+        * 
+        * @param settings
+        *            settings for the autocomplete list
+        */
+       public AbstractAutoCompleteBehavior(AutoCompleteSettings settings)
+       {
+               if (settings == null)
+               {
+                       settings = new AutoCompleteSettings();
+               }
+               this.settings = settings;
+       }
 
        /**
         * @see 
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
@@ -79,7 +106,7 @@ public abstract class AbstractAutoComple
        protected final String constructSettingsJS()
        {
                final StringBuilder sb = new StringBuilder();
-               sb.append("{preselect: ").append(settings.getPreselect());
+               sb.append("{preselect: ").append(settings.getPreselect() || 
preselect);
                sb.append(",maxHeight: ").append(settings.getMaxHeightInPx());
                sb.append(",adjustInputWidth: 
").append(settings.isAdjustInputWidth());
                sb.append(",useSmartPositioning: 
").append(settings.getUseSmartPositioning());

Modified: 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java?rev=1042867&r1=1042866&r2=1042867&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
 Mon Dec  6 23:51:23 2010
@@ -78,16 +78,12 @@ public abstract class AutoCompleteBehavi
         */
        public AutoCompleteBehavior(IAutoCompleteRenderer<T> renderer, 
AutoCompleteSettings settings)
        {
+               super(settings);
                if (renderer == null)
                {
                        throw new IllegalArgumentException("renderer cannot be 
null");
                }
-               if (settings == null)
-               {
-                       settings = new AutoCompleteSettings();
-               }
                this.renderer = renderer;
-               this.settings = settings;
        }