directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-105 - String is incompatible with expected argument type
Date Mon, 25 May 2015 04:23:47 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master ce0ed9c45 -> e387f6cdb


FC-105 - String is incompatible with expected argument type


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/e387f6cd
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/e387f6cd
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/e387f6cd

Branch: refs/heads/master
Commit: e387f6cdbbfe26b72a9e6af5dc69e3774e04ffec
Parents: ce0ed9c
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sun May 24 23:23:30 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sun May 24 23:23:30 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/directory/fortress/web/panel/OUListPanel.java  | 2 +-
 .../org/apache/directory/fortress/web/panel/ObjectListPanel.java   | 2 +-
 .../org/apache/directory/fortress/web/panel/PwPolicyListPanel.java | 2 +-
 .../org/apache/directory/fortress/web/panel/RoleListPanel.java     | 2 +-
 .../java/org/apache/directory/fortress/web/panel/SDListPanel.java  | 2 +-
 .../org/apache/directory/fortress/web/panel/UserListPanel.java     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
index 893bfc1..1b459e2 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
@@ -264,7 +264,7 @@ public class OUListPanel extends FormComponentPanel
             OrgUnit orgUnit = ( OrgUnit ) node.getUserObject();
             log.debug( ".removeSelectedItems ou node: " + orgUnit.getName() );
             List<OrgUnit> orgUnits = ( ( List<OrgUnit> ) getDefaultModel().getObject()
);
-            orgUnits.remove( orgUnit.getName() );
+            orgUnits.remove( orgUnit );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
index d54fb2e..606040f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
@@ -233,7 +233,7 @@ public class ObjectListPanel extends FormComponentPanel
             PermObj permObj = ( PermObj ) node.getUserObject();
             log.debug( ".removeSelectedItems user node: " + permObj.getObjName() );
             List<PermObj> permObjs = ( ( List<PermObj> ) getDefaultModel().getObject()
);
-            permObjs.remove( permObj.getObjName() );
+            permObjs.remove( permObj );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
index dd1bbeb..48db1c5 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
@@ -298,7 +298,7 @@ public class PwPolicyListPanel extends FormComponentPanel
             PwPolicy policy = ( PwPolicy ) node.getUserObject();
             log.debug( ".removeSelectedItems policy node: " + policy.getName() );
             List<PwPolicy> policies = ( ( List<PwPolicy> ) getDefaultModel().getObject()
);
-            policies.remove( policy.getName() );
+            policies.remove( policy );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
index 71d9d0c..c6f4f7a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
@@ -292,7 +292,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
             Role role = ( Role ) node.getUserObject();
             log.debug( ".removeSelectedItems role node: " + role.getName() );
             List<Role> roles = ( ( List<Role> ) getDefaultModel().getObject()
);
-            roles.remove( role.getName() );
+            roles.remove( role );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
index 27805b2..cfae5c1 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
@@ -384,7 +384,7 @@ public class SDListPanel extends FormComponentPanel
             SDSet sdSet = ( SDSet ) node.getUserObject();
             log.debug( ".removeSelectedItems sdset node: " + sdSet.getName() );
             List<SDSet> sdSets = ( ( List<SDSet> ) getDefaultModel().getObject()
);
-            sdSets.remove( sdSet.getName() );
+            sdSets.remove( sdSet );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/e387f6cd/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
index 5f3f4e0..82d0afe 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
@@ -664,7 +664,7 @@ public class UserListPanel extends FormComponentPanel
             User user = ( User ) node.getUserObject();
             LOG.debug( ".removeSelectedItems user node: " + user.getUserId() );
             List<User> users = ( ( List<User> ) getDefaultModel().getObject()
);
-            users.remove( user.getUserId() );
+            users.remove( user );
         }
     }
 


Mime
View raw message