You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2002/12/03 11:15:14 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util UriHandler.java
pnever 2002/12/03 02:15:14
Modified: src/webdav/server/org/apache/slide/webdav/util
UriHandler.java
Log:
Added isRootUri() and extended isRestrictedUri()
Revision Changes Path
1.24 +37 -10 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- UriHandler.java 27 Nov 2002 13:15:57 -0000 1.23
+++ UriHandler.java 3 Dec 2002 10:15:13 -0000 1.24
@@ -387,6 +387,13 @@
}
/**
+ * Return true, if this URI determines the root.
+ */
+ public boolean isRootUri() {
+ return (uriTokens.length == 0);
+ }
+
+ /**
* Return true, if this URI determines the history path.
*/
public boolean isHistoryPathUri() {
@@ -667,13 +674,33 @@
* @return <code>true</code> if the usage of the URI is restricted.
*/
public boolean isRestrictedUri() {
- return isVersionUri() ||
- isHistoryUri() ||
- isHistoryPathUri() ||
- isWorkspaceUri() ||
- isWorkspacePathUri() ||
- isWorkingresourceUri() ||
- isWorkingresourcePathUri();
+ if( isRootUri() )
+ return true;
+ if( isVersionUri() )
+ return true;
+ if( isHistoryUri() )
+ return true;
+ if( isHistoryPathUri() )
+ return true;
+ if( isWorkspaceUri() )
+ return true;
+ if( isWorkspacePathUri() )
+ return true;
+ if( isWorkingresourceUri() )
+ return true;
+ if( isWorkingresourcePathUri() )
+ return true;
+
+ UriHandler p = getParentUriHandler();
+ if( p != null ) {
+ if( p.isRootUri() )
+ return true;
+ if( p.isHistoryPathUri() )
+ return true;
+ if( p.isWorkingresourcePathUri() )
+ return true;
+ }
+ return false;
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>