lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac Group.java User.java Role.java
Date Fri, 30 May 2003 15:25:54 GMT
andreas     2003/05/30 08:25:54

  Modified:    src/java/org/apache/lenya/cms/ac Group.java User.java
                        Role.java
  Log:
  added some assertions
  
  Revision  Changes    Path
  1.2       +2 -1      cocoon-lenya/src/java/org/apache/lenya/cms/ac/Group.java
  
  Index: Group.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/Group.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Group.java	28 May 2003 14:45:18 -0000	1.1
  +++ Group.java	30 May 2003 15:25:53 -0000	1.2
  @@ -101,6 +101,7 @@
   	 * @param role
   	 */
   	public void addRole(Role role) {
  +        assert role != null;
   		roles.add(role);
   		role.addGroup(this);
   	}
  
  
  
  1.5       +2 -1      cocoon-lenya/src/java/org/apache/lenya/cms/ac/User.java
  
  Index: User.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/User.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- User.java	30 May 2003 10:45:00 -0000	1.4
  +++ User.java	30 May 2003 15:25:53 -0000	1.5
  @@ -141,6 +141,7 @@
   	 * @param set
   	 */
   	public void addGroup(Group group) {
  +        assert group != null;
   		groups.add(group);
   		group.addUser(this);
   	}
  
  
  
  1.6       +1 -3      cocoon-lenya/src/java/org/apache/lenya/cms/ac/Role.java
  
  Index: Role.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/Role.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Role.java	28 May 2003 14:45:18 -0000	1.5
  +++ Role.java	30 May 2003 15:25:53 -0000	1.6
  @@ -31,6 +31,7 @@
       }
       
       public void addGroup(Group group) {
  +        assert group != null;
       	groups.add(group);
       }
       
  @@ -48,9 +49,6 @@
           if (otherObject instanceof Role) {
               Role otherRole = (Role) otherObject;
               equals = getName().equals(otherRole.getName());
  -        }
  -        else {
  -            equals = super.equals(otherObject);
           }
           
           return equals;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org


Mime
View raw message