svn commit: r393914 - in /incubator/roller/branches/roller-newbackend/src/org/roller/pojos: RoleData.java UserData.java

[agilliland]

Author: agilliland
Date: Thu Apr 13 13:16:24 2006
New Revision: 393914

URL: http://svn.apache.org/viewcvs?rev=393914&view=rev
Log:
switching to use HashSet for roles Set in UserData.
setting private access on setRoles() method in UserData to force use of 
grantRole() and revokeRole() methods.
removing id from equals() method of RoleData because we can't count on id 
having a value when comparing transient vs. persistent/detached objects.


Modified:
    
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/RoleData.java
    
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/UserData.java

Modified: 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/RoleData.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/pojos/RoleData.java?rev=393914&r1=393913&r2=393914&view=diff
==============================================================================
--- 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/RoleData.java 
(original)
+++ 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/RoleData.java 
Thu Apr 13 13:16:24 2006
@@ -114,14 +114,6 @@
          RoleData lTest = (RoleData) pOther;
          boolean lEquals = true;
 
-         if( this.id == null )
-         {
-            lEquals = lEquals && ( lTest.getId() == null );
-         }
-         else
-         {
-            lEquals = lEquals && this.id.equals( lTest.getId() );
-         }
          if( this.userName == null )
          {
             lEquals = lEquals && ( lTest.getUserName() == null );

Modified: 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/UserData.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/pojos/UserData.java?rev=393914&r1=393913&r2=393914&view=diff
==============================================================================
--- 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/UserData.java 
(original)
+++ 
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/UserData.java 
Thu Apr 13 13:16:24 2006
@@ -3,16 +3,14 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 
 import org.roller.RollerException;
 import org.roller.config.RollerConfig;
 import org.roller.model.Roller;
-import org.roller.model.RollerFactory;
-import org.roller.model.UserManager;
 import org.roller.util.PojoUtil;
 import org.roller.util.Utilities;
 
@@ -49,7 +47,7 @@
     private String  timeZone;
     private Boolean enabled = Boolean.TRUE;
     
-    private Set roles = new TreeSet();
+    private Set roles = new HashSet();
     private List permissions = new ArrayList();
     
     public UserData() {
@@ -393,7 +391,10 @@
         return roles;
     }
     
-    public void setRoles(Set roles) {
+    /**
+     * this is private to force the use of grant/revokeRole() methods.
+     */
+    private void setRoles(Set roles) {
         this.roles = roles;
     }