Author: ilgrosso
Date: Thu Feb 21 16:26:16 2013
New Revision: 1448710
URL: http://svn.apache.org/r1448710
Log:
[SYNCOPE-321] Replacing back ClearIndicatingAjax... with IndicatingAjax in
modal windows
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1448710&r1=1448709&r2=1448710&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
Thu Feb 21 16:26:16 2013
@@ -23,13 +23,13 @@ import org.apache.syncope.common.to.Deri
import org.apache.syncope.common.types.AttributableType;
import
org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.JexlHelpUtil;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -78,12 +78,12 @@ public class DerivedSchemaModalPage exte
name.setEnabled(createFlag);
- final AjaxButton submit = new ClearIndicatingAjaxButton("apply", new
ResourceModel("submit"), pageRef) {
+ final AjaxButton submit = new IndicatingAjaxButton("apply", new
ResourceModel("submit")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target,
final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form
form) {
DerivedSchemaTO schemaTO = (DerivedSchemaTO)
form.getDefaultModelObject();
try {
@@ -109,12 +109,12 @@ public class DerivedSchemaModalPage exte
}
};
- final AjaxButton cancel = new ClearIndicatingAjaxButton("cancel", new
ResourceModel("cancel"), pageRef) {
+ final AjaxButton cancel = new IndicatingAjaxButton("cancel", new
ResourceModel("cancel")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target,
final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final
Form<?> form) {
window.close(target);
}
};
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1448710&r1=1448709&r2=1448710&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
Thu Feb 21 16:26:16 2013
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.to.AbstractAttributableTO;
@@ -87,7 +88,7 @@ public class AttributesPanel extends Pan
schemaTOs =
schemaRestClient.getSchemas(AttributableType.MEMBERSHIP);
}
- final Map<String, SchemaTO> schemas = new HashMap<String,
SchemaTO>();
+ final Map<String, SchemaTO> schemas = new TreeMap<String,
SchemaTO>();
for (SchemaTO schemaTO : schemaTOs) {
schemas.put(schemaTO.getName(), schemaTO);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java?rev=1448710&r1=1448709&r2=1448710&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
Thu Feb 21 16:26:16 2013
@@ -25,7 +25,6 @@ import org.apache.syncope.common.to.Role
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.console.rest.SchemaRestClient;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.wicket.Component;
import org.apache.wicket.PageReference;
@@ -35,6 +34,7 @@ import org.apache.wicket.ajax.attributes
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -90,13 +90,13 @@ public class DerivedAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new
ClearIndicatingAjaxButton("addAttributeBtn",
- new ResourceModel("addAttributeBtn"), pageRef) {
+ AjaxButton addAttributeBtn = new
IndicatingAjaxButton("addAttributeBtn",
+ new ResourceModel("addAttributeBtn")) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target,
final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final
Form<?> form) {
entityTO.getDerivedAttributes().add(new AttributeTO());
target.add(attributesContainer);
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java?rev=1448710&r1=1448709&r2=1448710&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
Thu Feb 21 16:26:16 2013
@@ -29,7 +29,6 @@ import org.apache.syncope.common.to.User
import org.apache.syncope.common.to.VirtualSchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.console.rest.SchemaRestClient;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
@@ -40,6 +39,7 @@ import org.apache.wicket.ajax.attributes
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -101,13 +101,13 @@ public class VirtualAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new
ClearIndicatingAjaxButton("addAttributeBtn",
- new ResourceModel("addAttributeBtn"), pageRef) {
+ AjaxButton addAttributeBtn = new
IndicatingAjaxButton("addAttributeBtn",
+ new ResourceModel("addAttributeBtn")) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target,
final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final
Form<?> form) {
entityTO.addVirtualAttribute(new AttributeTO());
target.add(attributesContainer);
}
