now using the simplified user management interface.

[utils] / security / impl / src / main / java / org / wamblee / security / authorization / GroupUserCondition.java

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
index 5b39387e41823982eb2ecbb9b54bd2c06feccf13..8386d35b1f1859ac8030ecdc0aa399ee1ddcd566 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
@@ -19,8 +19,10 @@ package org.wamblee.security.authorization;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 
 import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserAdministration;
 
 
 /**
@@ -36,6 +38,9 @@ public class GroupUserCondition extends AbstractUserCondition {
      */
     @Column(name = "GRP")
     private String group;
+    
+    @Transient
+    private UserAdministration admin; 
 
     /**
      * Constructs the condition.
@@ -54,16 +59,15 @@ public class GroupUserCondition extends AbstractUserCondition {
     protected GroupUserCondition() {
         group = null;
     }
+    
+    @Override
+    public void setUserAdmin(UserAdministration aAdmin) {
+        admin = aAdmin;   
+    }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.wamblee.security.authorization.UserCondition#matches(org.wamblee.
-     * usermgt.UserAccessor)
-     */
-    public boolean matches(User aUser) {
-        return aUser.isInGroup(group);
+    @Override
+    public boolean matches(String aUser) {
+        return admin.isInGroup(aUser, group);
     }
 
     /**