You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/03/13 10:31:50 UTC
svn commit: r1455848 - in
/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console:
pages/panels/ResourceMappingPanel.java
wicket/markup/html/form/AjaxTextFieldPanel.java
Author: fmartelli
Date: Wed Mar 13 09:31:49 2013
New Revision: 1455848
URL: http://svn.apache.org/r1455848
Log:
SYNCOPE-336 fixed into the branch 1_0_X
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1455848&r1=1455847&r2=1455848&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Wed Mar 13 09:31:49 2013
@@ -259,15 +259,10 @@ public class ResourceMappingPanel extend
final FieldPanel extAttrName;
- if (schemaNames.isEmpty()) {
- extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
- "extAttrNames").getObject(), new PropertyModel<String>(mappingTO, "extAttrName"));
-
- } else {
- extAttrName = new AjaxDropDownChoicePanel<String>("extAttrName", new ResourceModel("extAttrNames",
- "extAttrNames").getObject(), new PropertyModel(mappingTO, "extAttrName"));
- ((AjaxDropDownChoicePanel) extAttrName).setChoices(schemaNames);
- }
+ extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
+ "extAttrNames").getObject(), new PropertyModel<String>(mappingTO, "extAttrName"));
+
+ ((AjaxTextFieldPanel) extAttrName).setChoices(schemaNames);
boolean required = false;
if (mappingTO != null && !mappingTO.isAccountid() && !mappingTO.isPassword()) {
Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1455848&r1=1455847&r2=1455848&view=diff
==============================================================================
--- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java (original)
+++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java Wed Mar 13 09:31:49 2013
@@ -23,8 +23,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteSettings;
import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -40,13 +42,18 @@ public class AjaxTextFieldPanel extends
super(id, name, model);
- field = new AutoCompleteTextField<String>("textField", model) {
+ final AutoCompleteSettings settings = new AutoCompleteSettings();
+ settings.setShowCompleteListOnFocusGain(true);
+ settings.setShowListOnEmptyInput(true);
+
+ field = new AutoCompleteTextField<String>("textField", model, settings) {
private static final long serialVersionUID = -6648767303091874219L;
@Override
- protected Iterator<String> getChoices(String input) {
- final Pattern pattern = Pattern.compile(Pattern.quote(input) + ".*", Pattern.CASE_INSENSITIVE);
+ protected Iterator<String> getChoices(final String input) {
+ final Pattern pattern = Pattern.compile(
+ (StringUtils.isNotBlank(input) ? Pattern.quote(input) : "") + ".*", Pattern.CASE_INSENSITIVE);
final List<String> result = new ArrayList<String>();