Author: toad
Date: 2008-04-05 19:05:13 +0000 (Sat, 05 Apr 2008)
New Revision: 19043
Modified:
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Fix #2136: Add a slash to the end of the uri for completed directory uploads.
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-04-05
18:58:35 UTC (rev 19042)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-04-05
19:05:13 UTC (rev 19043)
@@ -868,10 +868,10 @@
return panicBox;
}
- private HTMLNode createIdentifierCell(FreenetURI uri, String
identifier) {
+ private HTMLNode createIdentifierCell(FreenetURI uri, String
identifier, boolean directory) {
HTMLNode identifierCell = new HTMLNode("td", "class",
"request-identifier");
if (uri != null) {
- identifierCell.addChild("span", "class",
"identifier_with_uri").addChild("a", "href", "/" + uri, identifier);
+ identifierCell.addChild("span", "class",
"identifier_with_uri").addChild("a", "href", "/" + uri + '/', identifier);
} else {
identifierCell.addChild("span", "class",
"identifier_without_uri", identifier);
}
@@ -992,11 +992,11 @@
int column = columns[columnIndex];
if (column == LIST_IDENTIFIER) {
if (clientRequest instanceof ClientGet)
{
-
requestRow.addChild(createIdentifierCell(((ClientGet) clientRequest).getURI(),
clientRequest.getIdentifier()));
+
requestRow.addChild(createIdentifierCell(((ClientGet) clientRequest).getURI(),
clientRequest.getIdentifier(), false));
} else if (clientRequest instanceof
ClientPutDir) {
-
requestRow.addChild(createIdentifierCell(((ClientPutDir)
clientRequest).getFinalURI(), clientRequest.getIdentifier()));
+
requestRow.addChild(createIdentifierCell(((ClientPutDir)
clientRequest).getFinalURI(), clientRequest.getIdentifier(), true));
} else if (clientRequest instanceof
ClientPut) {
-
requestRow.addChild(createIdentifierCell(((ClientPut)
clientRequest).getFinalURI(), clientRequest.getIdentifier()));
+
requestRow.addChild(createIdentifierCell(((ClientPut)
clientRequest).getFinalURI(), clientRequest.getIdentifier(), false));
}
} else if (column == LIST_SIZE) {
if (clientRequest instanceof ClientGet)
{
