[Bedework-commit] access r91 - in trunk/src/edu/rpi/cmt/access: . test

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-24 14:30:52 -0500 (Mon, 24 Nov 2008)
New Revision: 91

Modified:
   trunk/src/edu/rpi/cmt/access/AccessPrincipal.java
   trunk/src/edu/rpi/cmt/access/test/Group.java
   trunk/src/edu/rpi/cmt/access/test/User.java
Log:
Delete principal type definitions in AccessPrincipal and use the WhoDefs version instead.

Required mapping pre 3.5 restore principal kind

Modified: trunk/src/edu/rpi/cmt/access/AccessPrincipal.java
===================================================================
--- trunk/src/edu/rpi/cmt/access/AccessPrincipal.java	2008-11-21 18:39:23 UTC (rev 90)
+++ trunk/src/edu/rpi/cmt/access/AccessPrincipal.java	2008-11-24 19:30:52 UTC (rev 91)
@@ -34,29 +34,9 @@
  *
  */
 public interface AccessPrincipal extends Serializable {
-  /** The kind of Principal returned by getKind() */
-
-  // XXX change to use whoType? from WhoDefs
-
-  /** user */
-  public static final int principalUser = 0;
-
-  /** group */
-  public static final int principalGroup = 1;
-
-  /** ticket * /
-  public static final int principalTicket = 2;
-
-  / ** projector etc * /
-  public static final int principalResource = 3;
-
-  / ** room, building etc * /
-  public static final int principalVenue = 4;
-
-  /** host */
-  public static final int principalHost = /*5*/2;
-
-  /** Return the kind of Principal, e.g. user/group etc
+  /** Return the kind of Principal, e.g. user/group etc.
+   * Values come from Ace.whoTypeXXX
+   *
    * @return int kind
    */
   public int getKind();

Modified: trunk/src/edu/rpi/cmt/access/test/Group.java
===================================================================
--- trunk/src/edu/rpi/cmt/access/test/Group.java	2008-11-21 18:39:23 UTC (rev 90)
+++ trunk/src/edu/rpi/cmt/access/test/Group.java	2008-11-24 19:30:52 UTC (rev 91)
@@ -25,6 +25,8 @@
 */
 package edu.rpi.cmt.access.test;
 
+import edu.rpi.cmt.access.Ace;
+
 import java.util.Collection;
 import java.util.TreeSet;
 
@@ -57,7 +59,7 @@
   }
 
   public int getKind() {
-    return principalGroup;
+    return Ace.whoTypeGroup;
   }
 
   /** Set the members of the group.

Modified: trunk/src/edu/rpi/cmt/access/test/User.java
===================================================================
--- trunk/src/edu/rpi/cmt/access/test/User.java	2008-11-21 18:39:23 UTC (rev 90)
+++ trunk/src/edu/rpi/cmt/access/test/User.java	2008-11-24 19:30:52 UTC (rev 91)
@@ -53,6 +53,8 @@
 */
 package edu.rpi.cmt.access.test;
 
+import edu.rpi.cmt.access.Ace;
+
 /** Value object to represent a calendar user.
  *
  *   @author Mike Douglass douglm at rpi.edu
@@ -79,7 +81,7 @@
   }
 
   public int getKind() {
-    return principalUser;
+    return Ace.whoTypeUser;
   }
 
   /* ====================================================================