svn commit: r1450678 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java

[ilgrosso]

Author: ilgrosso
Date: Wed Feb 27 08:45:52 2013
New Revision: 1450678

URL: http://svn.apache.org/r1450678
Log:
Merge from 1_0_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1450235-1450674

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1450678&r1=1450677&r2=1450678&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
 Wed Feb 27 08:45:52 2013
@@ -25,11 +25,11 @@ import org.apache.syncope.console.pages.
 import org.apache.syncope.console.pages.panels.ResourcesPanel;
 import org.apache.syncope.console.pages.panels.UserDetailsPanel;
 import org.apache.syncope.console.pages.panels.VirtualAttributesPanel;
-import 
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 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.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
@@ -177,12 +177,12 @@ public abstract class UserModalPage exte
     }
 
     protected AjaxButton getOnSubmit() {
-        return new ClearIndicatingAjaxButton("apply", new 
ResourceModel("submit"), pageRef) {
+        return 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) {
                 try {
                     submitAction(target, form);