cvs commit: jakarta-slide/src/share/org/apache/slide/security NodePermission.java

[remm]

remm        01/05/20 14:24:11

  Modified:    src/share/org/apache/slide/security NodePermission.java
  Log:
  - Add a new revision number field to the permissions.
  - Add a new constructor (which allows setting the revision number.
  - Add accessor / mutator for the revision number field.
  
  Revision  Changes    Path
  1.6       +53 -4     
jakarta-slide/src/share/org/apache/slide/security/NodePermission.java
  
  Index: NodePermission.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/NodePermission.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NodePermission.java       2000/12/01 07:17:35     1.5
  +++ NodePermission.java       2001/05/20 21:24:11     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/NodePermission.java,v 1.5 
2000/12/01 07:17:35 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2000/12/01 07:17:35 $
  + * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/NodePermission.java,v 1.6 
2001/05/20 21:24:11 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/05/20 21:24:11 $
    *
    * ====================================================================
    *
  @@ -67,13 +67,14 @@
   import java.io.Serializable;
   import org.apache.slide.common.*;
   import org.apache.slide.structure.*;
  +import org.apache.slide.content.NodeRevisionNumber;
   import org.apache.slide.util.Messages;
   
   /**
    * Permission object.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public final class NodePermission implements Serializable, Cloneable {
       
  @@ -183,6 +184,28 @@
       }
       
       
  +    /**
  +     * Constructor 7.
  +     * 
  +     * @param object Object
  +     * @param revisionNumber Revision number
  +     * @param subject Subject
  +     * @param action Action
  +     * @param inheritable Inheritance flag
  +     * @param negative Negative flag
  +     */
  +    public NodePermission(ObjectNode object, NodeRevisionNumber revisionNumber,
  +                          SubjectNode subject, ActionNode action, 
  +                          boolean inheritable, boolean negative) {
  +        this(object, subject, action);
  +        this.inheritable = inheritable;
  +        if (revisionNumber != null)
  +            this.inheritable = false;
  +        this.negative = negative;
  +        this.revisionNumber = revisionNumber;
  +    }
  +    
  +    
       // ----------------------------------------------------- Instance Variables
       
       
  @@ -193,6 +216,12 @@
       
       
       /**
  +     * Revision number.
  +     */
  +    protected NodeRevisionNumber revisionNumber;
  +    
  +    
  +    /**
        * Subject Uri.
        */
       protected String subjectUri;
  @@ -320,6 +349,26 @@
        */
       void setSubject(String subjectUri) {
           this.subjectUri = subjectUri;
  +    }
  +    
  +    
  +    /**
  +     * Revision number accessor.
  +     * 
  +     * @return Revision number to which this permission applies
  +     */
  +    public NodeRevisionNumber getRevisionNumber() {
  +        return revisionNumber;
  +    }
  +    
  +    
  +    /**
  +     * Revision number mutator.
  +     * 
  +     * @param revisionNumber Revision number
  +     */
  +    void setRevisionNumber(NodeRevisionNumber revisionNumber) {
  +        this.revisionNumber = revisionNumber;
       }