[MMBASE SCM] r41993 - mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext

[michiel]

Author: michiel
Date: 2010-04-20 19:06:13 +0200 (Tue, 20 Apr 2010)
New Revision: 41993

Modified:
   
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/Authenticate.java
   
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
Log:
didn't compile

Modified: 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/Authenticate.java
===================================================================
--- 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/Authenticate.java
      2010-04-20 16:55:41 UTC (rev 41992)
+++ 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/Authenticate.java
      2010-04-20 17:06:13 UTC (rev 41993)
@@ -201,7 +201,7 @@
                                                            + "  and 'class' 
are supported");
         }
         if (node == null)  return null;
-        return new User(node, getKey(), type);
+        return new User(Authenticate.this, node, getKey(), type);
     }
 
     public static User getLoggedInExtraAdmin(String userName) {
@@ -279,7 +279,7 @@
         private long   l;
         private Rank   r = Rank.ADMIN;
         LocalAdmin(String user, String app) {
-            super(new AdminVirtualNode(), Authenticate.this.getKey(), app);
+            super(Authenticate.this, new AdminVirtualNode(), 
Authenticate.this.getKey(), app);
             l = extraAdminsUniqueNumber;
             userName = user;
         }

Modified: 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
===================================================================
--- 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
      2010-04-20 16:55:41 UTC (rev 41992)
+++ 
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
      2010-04-20 17:06:13 UTC (rev 41993)
@@ -42,8 +42,8 @@
     /**
      * @javadoc
      */
-    public User(MMObjectNode n, long l, String app) {
-        super(app);
+    public User(Authentication a, MMObjectNode n, long l, String app) {
+        super(a, app, getIdentifier(n));
         if (n == null) throw new IllegalArgumentException();
         node = n;
         key = l;
@@ -52,21 +52,20 @@
         }
     }
 
-    // javadoc inherited
-    public String getIdentifier()  {
-        if (node == null) {
+    private static String getIdentifier(MMObjectNode n)  {
+        if (n == null) {
             return "anonymous";
         } else {
-            MMObjectBuilder builder = node.getBuilder();
+            MMObjectBuilder builder = n.getBuilder();
             if (builder.hasField(Users.FIELD_USERNAME)) {
-                return node.getStringValue(Users.FIELD_USERNAME);
+                return n.getStringValue(Users.FIELD_USERNAME);
             } else {
                 return null;
             }
         }
     }
 
-    // javadoc inherited
+    @Override
     public Rank getRank() throws SecurityException {
         if (node == null) {
             return Rank.ANONYMOUS;
@@ -75,7 +74,7 @@
         }
     }
 
-    // javadoc inherited
+    @Override
     public String getOwnerField() {
         if (node == null) {
             return "system";
@@ -159,6 +158,7 @@
         out.writeLong(key);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof User) {
             User ou = (User) o;
@@ -171,6 +171,7 @@
         }
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         result = HashCodeUtil.hashCode(result, node);

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs