You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/12/07 01:11:06 UTC
svn commit: r1042874 - in
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete:
AbstractAutoCompleteBehavior.java AutoCompleteBehavior.java
Author: pedro
Date: Tue Dec 7 00:11:05 2010
New Revision: 1042874
URL: http://svn.apache.org/viewvc?rev=1042874&view=rev
Log:
- code cleanup
- removing the preselect variable at AbstractAutoCompleteBehavior that is already on AutoCompleteSettings
Issue: WICKET-3235
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=1042874&r1=1042873&r2=1042874&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java Tue Dec 7 00:11:05 2010
@@ -38,9 +38,30 @@ public abstract class AbstractAutoComple
private static final long serialVersionUID = 1L;
- protected boolean preselect = false;
+ protected AutoCompleteSettings settings;
- protected AutoCompleteSettings settings = new AutoCompleteSettings();
+ /**
+ * 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)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java?rev=1042874&r1=1042873&r2=1042874&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java Tue Dec 7 00:11:05 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.extensions.aja
import java.util.Iterator;
import org.apache.wicket.Application;
-import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -80,16 +79,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;
}