pnever      02/05/22 09:24:54

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        UriHandler.java
  Log:
  - Slide-proprietary live properties are now protected
  - Enhanced method isHistoryUri()
  - Bug fixing
  
  Revision  Changes    Path
  1.14      +12 -4     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
  
  Index: UriHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- UriHandler.java   20 May 2002 12:09:34 -0000      1.13
  +++ UriHandler.java   22 May 2002 16:24:54 -0000      1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
 1.13 2002/05/20 12:09:34 pnever Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/05/20 12:09:34 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
 1.14 2002/05/22 16:24:54 pnever Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/05/22 16:24:54 $
    *
    * ====================================================================
    *
  @@ -157,6 +157,7 @@
                   nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
                                                 nextHnProp.getValue(),
                                                 NamespaceCache.SLIDE_URI);
  +                nextHnProp.setKind( NodeProperty.Kind.PROTECTED );
                   hpathNrd.setProperty( nextHnProp );
               }
           }
  @@ -165,6 +166,7 @@
                   new NodeProperty(I_NEXT_HISTORY_NAME,
                                    I_INITIAL_HISTORY_NAME,
                                    NamespaceCache.SLIDE_URI);
  +            nextHnProp.setKind( NodeProperty.Kind.PROTECTED );
               hpathNrd.setProperty( nextHnProp );
           }
           
  @@ -215,6 +217,7 @@
                   nextWrnProp = new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
                                                  nextWrnProp.getValue(),
                                                  NamespaceCache.SLIDE_URI);
  +                nextWrnProp.setKind( NodeProperty.Kind.PROTECTED );
                   wrpathNrd.setProperty( nextWrnProp );
               }
           }
  @@ -224,6 +227,7 @@
                   new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
                                    I_INITIAL_WORKINGRESOURCE_NAME,
                                    NamespaceCache.SLIDE_URI );
  +            nextWrnProp.setKind( NodeProperty.Kind.PROTECTED );
               wrpathNrd.setProperty( nextWrnProp );
           }
           
  @@ -358,8 +362,12 @@
                   if( !hpathTokens[i].equals(uriTokens[i]) )
                       return false;
               }
  +            try {
  +                Integer.parseInt( uriTokens[uriTokens.length - 1] );
               return true;
           }
  +            catch( NumberFormatException x ) {};
  +        }
           return false;
       }
       
  @@ -401,7 +409,7 @@
        * Return true, if this is a valid workingresource URI
        */
       public boolean isWorkingresourceUri() {
  -        UriHandler wrpathHandler = HistoryPathHandler.getHistoryPathHandler();
  +        UriHandler wrpathHandler = 
WorkingresourcePathHandler.getWorkingresourcePathHandler();
           String[] wrpathTokens = wrpathHandler.getUriTokens();
           
           if( (wrpathTokens.length + 1) == uriTokens.length ) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to