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/19 16:20:42 UTC
svn commit: r1458328 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
Author: fmartelli
Date: Tue Mar 19 15:20:42 2013
New Revision: 1458328
URL: http://svn.apache.org/r1458328
Log:
SYNCOPE-339 fixed
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1457726-1458327
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1458328&r1=1458327&r2=1458328&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java Tue Mar 19 15:20:42 2013
@@ -42,7 +42,7 @@ public class AjaxDropDownChoicePanel<T e
field = new DropDownChoice<T>(
"dropDownChoiceField", model, Collections.<T>emptyList(), new ChoiceRenderer<T>());
-
+
add(field.setLabel(new Model(name)).setOutputMarkupId(true));
if (enableOnBlur) {
@@ -75,11 +75,9 @@ public class AjaxDropDownChoicePanel<T e
@Override
public FieldPanel clone() {
- AjaxDropDownChoicePanel<T> panel = (AjaxDropDownChoicePanel<T>) super.clone();
-
- setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
- setChoices(((DropDownChoice) field).getChoices());
-
+ final AjaxDropDownChoicePanel<T> panel = (AjaxDropDownChoicePanel<T>) super.clone();
+ panel.setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
+ panel.setChoices(((DropDownChoice) field).getChoices());
return panel;
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1458328&r1=1458327&r2=1458328&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java Tue Mar 19 15:20:42 2013
@@ -90,4 +90,11 @@ public class AjaxTextFieldPanel extends
this.choices = choices;
}
}
+
+ @Override
+ public FieldPanel clone() {
+ final AjaxTextFieldPanel panel = (AjaxTextFieldPanel) super.clone();
+ panel.setChoices(choices);
+ return panel;
+ }
}