Merge from master

Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f0883ca5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f0883ca5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f0883ca5

Branch: refs/heads/master
Commit: f0883ca5f10e5b282f91da98916b9b3486c15a27
Parents: d011626
Author: Marco Di Sabatino Di Diodoro <[email protected]>
Authored: Fri Aug 14 10:30:08 2015 +0200
Committer: Marco Di Sabatino Di Diodoro <[email protected]>
Committed: Fri Aug 14 10:30:08 2015 +0200

----------------------------------------------------------------------
 .../apache/syncope/client/console/pages/StatusModalPage.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/f0883ca5/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
index c97e44c..57e5a0c 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java
@@ -39,7 +39,7 @@ import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.lib.types.ResourceAssociationActionType;
+import org.apache.syncope.common.lib.types.ResourceAssociationAction;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -401,7 +401,7 @@ public class StatusModalPage<T extends AnyTO> extends 
AbstractStatusModalPage {
 
                     if (anyTO instanceof UserTO) {
                         StatusModalPage.this.passwordManagement(
-                                target, 
ResourceAssociationActionType.PROVISION, table.getModelObject());
+                                target, ResourceAssociationAction.PROVISION, 
table.getModelObject());
                     } else {
                         try {
                             final BulkActionResult bulkActionResult = 
groupRestClient.provision(
@@ -458,7 +458,7 @@ public class StatusModalPage<T extends AnyTO> extends 
AbstractStatusModalPage {
                 public void onClick(final AjaxRequestTarget target, final 
Serializable ignore) {
                     if (anyTO instanceof UserTO) {
                         StatusModalPage.this.passwordManagement(
-                                target, ResourceAssociationActionType.ASSIGN, 
table.getModelObject());
+                                target, ResourceAssociationAction.ASSIGN, 
table.getModelObject());
                     } else {
                         try {
                             final BulkActionResult bulkActionResult = 
groupRestClient.assign(
@@ -546,7 +546,7 @@ public class StatusModalPage<T extends AnyTO> extends 
AbstractStatusModalPage {
 
     private void passwordManagement(
             final AjaxRequestTarget target,
-            final ResourceAssociationActionType type,
+            final ResourceAssociationAction type,
             final Collection<StatusBean> selection) {
 
         final ClearIndicatingAjaxButton goon =

Reply via email to