luetzkendorf 2004/11/24 08:22:46
Modified: src/webdav/server/org/apache/slide/webdav/util
DirectoryIndexGenerator.java PropertyHelper.java
PropertyRetrieverImpl.java WebdavStatus.java
src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
Log:
some cleanup and optimizations
Revision Changes Path
1.11 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java
Index: DirectoryIndexGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DirectoryIndexGenerator.java 30 Oct 2004 08:45:21 -0000 1.10
+++ DirectoryIndexGenerator.java 24 Nov 2004 16:22:45 -0000 1.11
@@ -255,7 +255,7 @@
boolean shade = false;
while (resources.hasMoreElements()) {
- String currentResource =
((ObjectNode)resources.nextElement()).getPath().toString();
+ String currentResource =
((ObjectNode)resources.nextElement()).getUri();
NodeRevisionDescriptor currentDescriptor = null;
permissionsList = null;
locksList = null;
1.84 +1 -1
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- PropertyHelper.java 8 Nov 2004 10:13:59 -0000 1.83
+++ PropertyHelper.java 24 Nov 2004 16:22:45 -0000 1.84
@@ -1852,7 +1852,7 @@
actionNamespace = DNSP;
}
- Element actionElm = new Element(new
UriPath(actionUriAsString).lastSegment(), actionNamespace);
+ Element actionElm = new
Element(UriPath.getLastSegment(actionUriAsString), actionNamespace);
privilegeElm.addContent(actionElm);
}
return privilegeElm;
1.41 +1 -1
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PropertyRetrieverImpl.java 8 Nov 2004 10:13:59 -0000 1.40
+++ PropertyRetrieverImpl.java 24 Nov 2004 16:22:45 -0000 1.41
@@ -189,7 +189,7 @@
revisionDescriptor = new NodeRevisionDescriptor(0);
if (!Configuration.useBinding(nsaToken.getUri(sToken,
uri).getStore())) {
- revisionDescriptor.setName(new
UriPath(uri).lastSegment());
+ revisionDescriptor.setName(UriPath.getLastSegment(uri));
}
}
1.2 +4 -12
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavStatus.java
Index: WebdavStatus.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavStatus.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebdavStatus.java 2 Aug 2004 16:36:06 -0000 1.1
+++ WebdavStatus.java 24 Nov 2004 16:22:45 -0000 1.2
@@ -38,15 +38,7 @@
public static String getStatusText(int nHttpStatusCode) {
- Integer intKey = new Integer(nHttpStatusCode);
-
- if (!mapStatusCodes.containsKey(intKey)) {
- // No information
- return null;
-
- } else {
- return (String) mapStatusCodes.get(intKey);
- }
+ return (String) mapStatusCodes.get(new Integer(nHttpStatusCode));
}
1.109 +1 -1
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- PropFindMethod.java 8 Nov 2004 10:13:19 -0000 1.108
+++ PropFindMethod.java 24 Nov 2004 16:22:45 -0000 1.109
@@ -485,7 +485,7 @@
revisionDescriptor = new NodeRevisionDescriptor(0);
if (!Configuration.useBinding(token.getUri(lightSToken,
object.getUri()).getStore())) {
- revisionDescriptor.setName(new
UriPath(object.getUri()).lastSegment());
+
revisionDescriptor.setName(UriPath.getLastSegment(object.getUri()));
}
hrefElement.setText(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
