[Exist-commits] eXist-1.0/src/org/exist/security Permission.java,1.3,1.4

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/security
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19067/src/org/exist/security

Modified Files:
	Permission.java 
Log Message:
Implemented lazy evaluation for XQuery enclosed expressions.

Index: Permission.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/security/Permission.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Permission.java	18 Jun 2003 15:39:14 -0000	1.3
--- Permission.java	3 May 2004 13:08:46 -0000	1.4
***************
*** 7,13 ****
  import java.util.Properties;
  import java.util.StringTokenizer;
  import org.exist.util.SyntaxException;
- import org.exist.util.VariableByteInputStream;
- import org.exist.util.VariableByteOutputStream;
  
  /**
--- 7,12 ----
  import java.util.Properties;
  import java.util.StringTokenizer;
+ 
  import org.exist.util.SyntaxException;
  
  /**
***************
*** 163,172 ****
          permissions = istream.readByte();
      }
- 
-     public void read( VariableByteInputStream istream ) throws IOException {
-         owner = istream.readUTF();
-         ownerGroup = istream.readUTF();
-         permissions = istream.readByte();
-     }
      
      /**
--- 162,165 ----
***************
*** 339,349 ****
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  perm  Description of the Parameter
-      *@return       Description of the Return Value
-      */
      private final boolean validateGroup( int perm ) {
          perm = perm << 3;
--- 332,335 ----
***************
*** 351,372 ****
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  perm  Description of the Parameter
-      *@return       Description of the Return Value
-      */
      private final boolean validatePublic( int perm ) {
          return ( permissions & perm ) == perm;
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  perm  Description of the Parameter
-      *@return       Description of the Return Value
-      */
      private final boolean validateUser( int perm ) {
          perm = perm << 6;
--- 337,344 ----
***************
*** 374,384 ****
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  ostream          Description of the Parameter
-      *@exception  IOException  Description of the Exception
-      */
      public void write( DataOutput ostream ) throws IOException {
          ostream.writeUTF( owner );
--- 346,349 ----
***************
*** 387,397 ****
      }
      
-     public void write( VariableByteOutputStream ostream )
-     throws IOException {
-         ostream.writeUTF( owner );
-         ostream.writeUTF( ownerGroup );
-         ostream.writeByte( (byte)permissions );
-     }
-     
      public void store( String prefix, Properties props ) {
      	props.setProperty( prefix + ".owner", owner );
--- 352,355 ----