[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind AbstractResour
From:       pnever () apache ! org
Date:       2002-04-30 12:40:11
[Download RAW message or body]

pnever      02/04/30 05:40:11

  Modified:    src/webdav/server/org/apache/slide/webdav/util/resourcekind
                        AbstractResourceKind.java
  Log:
  Revised determineResourceKind() method
  
  Revision  Changes    Path
  1.10      +22 -17    \
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
  
  Index: AbstractResourceKind.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractResourceKind.java	29 Apr 2002 16:51:24 -0000	1.9
  +++ AbstractResourceKind.java	30 Apr 2002 12:40:11 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v \
                1.9 2002/04/29 16:51:24 pnever Exp $
  - * $Revision: 1.9 $
  - * $Date: 2002/04/29 16:51:24 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v \
1.10 2002/04/30 12:40:11 pnever Exp $  + * $Revision: 1.10 $
  + * $Date: 2002/04/30 12:40:11 $
    *
    * ====================================================================
    *
  @@ -67,11 +67,15 @@
   
   import java.lang.reflect.*;
   
  +import org.apache.slide.common.NamespaceAccessToken;
  +
  +import org.apache.slide.content.NodeRevisionDescriptors;
   import org.apache.slide.content.NodeRevisionDescriptor;
   import org.apache.slide.webdav.util.WebdavConstants;
   import org.apache.slide.webdav.util.DeltavConstants;
   import org.apache.slide.webdav.util.AclConstants;
   import org.apache.slide.webdav.util.DaslConstants;
  +import org.apache.slide.webdav.util.UriHandler;
   
   /**
    * Abstraction of a WebDAV-compliant resource kind.
  @@ -156,37 +160,38 @@
       
       /**
        * Factory method.
  -     * @deprecated
        */
  -    static public ResourceKind determineResourceKind( NodeRevisionDescriptor nrd ) \
                {
  -        return determineResourceKind( null, nrd );
  +    static public ResourceKind determineResourceKind( NamespaceAccessToken \
nsaToken, NodeRevisionDescriptors nrds, NodeRevisionDescriptor nrd ) {  +        \
UriHandler uh = UriHandler.getUriHandler( nsaToken, nrds, nrd );  +        return \
determineResourceKind( nsaToken, uh.toString(), nrd );  }
       
       /**
        * Factory method.
        */
  -    static public ResourceKind determineResourceKind( String resourcePath, \
NodeRevisionDescriptor nrd ) {  +    static public ResourceKind \
determineResourceKind( NamespaceAccessToken nsaToken, String resourcePath, \
NodeRevisionDescriptor nrd ) {  +        UriHandler uh = UriHandler.getUriHandler( \
nsaToken, resourcePath );  
           if( nrd == null ) {
               return DeltavCompliantUnmappedUrlImpl.getInstance();
           }
  -        else if( nrd.exists(P_CHECKED_IN) ) {
  -            return CheckedInVersionControlledImpl.getInstance();
  -        }
  -        else if( nrd.exists(P_CHECKED_OUT) ) {
  -            return CheckedOutVersionControlledImpl.getInstance();
  +        else if( uh.isHistoryUri() ) {
  +            return VersionHistoryImpl.getInstance();
           }
  -        else if( nrd.exists(P_VERSION_NAME) ) {
  +        else if( uh.isVersionUri() ) {
               return VersionImpl.getInstance();
           }
  -        else if( nrd.exists(P_WORKSPACE_CHECKOUT_SET) ) {
  +        else if( uh.isWorkspaceUri() ) {
               return WorkspaceImpl.getInstance();
           }
  -        else if( nrd.exists(P_AUTO_UPDATE) ) {
  +        else if( uh.isWorkingresourceUri() ) {
               return WorkingImpl.getInstance();
           }
  -        else if( nrd.propertyValueContains(P_RESOURCETYPE, E_VERSION_HISTORY) ) {
  -            return VersionHistoryImpl.getInstance();
  +        else if( nrd.exists(P_CHECKED_IN) ) {
  +            return CheckedInVersionControlledImpl.getInstance();
  +        }
  +        else if( nrd.exists(P_CHECKED_OUT) ) {
  +            return CheckedOutVersionControlledImpl.getInstance();
           }
           else if( nrd.propertyValueContains(P_RESOURCETYPE, E_PRINCIPAL) ) {
               return PrincipalImpl.getInstance();
  
  
  

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


[prev in list] [next in list] [prev in thread] [next in thread]