adammurdoch    2002/10/31 02:30:44

  Modified:    vfs/src/java/org/apache/commons/vfs FileName.java
               vfs/src/java/org/apache/commons/vfs/provider
                        DefaultFileName.java
  Log:
  Added isDescendent( name, scope ).
  
  Revision  Changes    Path
  1.6       +5 -0      
jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileName.java
  
  Index: FileName.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileName.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileName.java     27 Oct 2002 08:06:37 -0000      1.5
  +++ FileName.java     31 Oct 2002 10:30:44 -0000      1.6
  @@ -173,4 +173,9 @@
        * Determines if another file name is a descendent of this file name.
        */
       boolean isDescendent( FileName descendent );
  +
  +    /**
  +     * Determines if another file name is a descendent of this file name.
  +     */
  +    boolean isDescendent( FileName descendent, NameScope nameScope );
   }
  
  
  
  1.5       +11 -2     
jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileName.java
  
  Index: DefaultFileName.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileName.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultFileName.java      27 Oct 2002 08:06:37 -0000      1.4
  +++ DefaultFileName.java      31 Oct 2002 10:30:44 -0000      1.5
  @@ -217,12 +217,21 @@
       /**
        * Determines if another file name is a descendent of this file name.
        */
  -    public boolean isDescendent( FileName descendent )
  +    public boolean isDescendent( final FileName descendent )
  +    {
  +        return isDescendent( descendent, NameScope.DESCENDENT );
  +    }
  +
  +    /**
  +     * Determines if another file name is a descendent of this file name.
  +     */
  +    public boolean isDescendent( final FileName descendent,
  +                                 final NameScope scope )
       {
           if ( !descendent.getRootURI().equals( rootPrefix ) )
           {
               return false;
           }
  -        return parser.checkName( absPath, descendent.getPath(), 
NameScope.DESCENDENT );
  +        return parser.checkName( absPath, descendent.getPath(), scope );
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>

Reply via email to