Author: toad
Date: 2008-04-05 19:07:17 +0000 (Sat, 05 Apr 2008)
New Revision: 19044
Modified:
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Rest of the fix.
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-04-05
19:05:13 UTC (rev 19043)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-04-05
19:07:17 UTC (rev 19044)
@@ -871,7 +871,7 @@
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 + (directory ? "/" :
""), identifier);
} else {
identifierCell.addChild("span", "class",
"identifier_without_uri", identifier);
}
@@ -916,10 +916,10 @@
return sizeCell;
}
- private HTMLNode createKeyCell(FreenetURI uri) {
+ private HTMLNode createKeyCell(FreenetURI uri, boolean addSlash) {
HTMLNode keyCell = new HTMLNode("td", "class", "request-key");
if (uri != null) {
- keyCell.addChild("span", "class",
"key_is").addChild("a", "href", '/' + uri.toString(), uri.toShortString());
+ keyCell.addChild("span", "class",
"key_is").addChild("a", "href", '/' + uri.toString() + (addSlash ? "/" : ""),
uri.toShortString());
} else {
keyCell.addChild("span", "class", "key_unknown",
L10n.getString("QueueToadlet.unknown"));
}
@@ -1016,11 +1016,11 @@
requestRow.addChild(createPersistenceCell(clientRequest.isPersistent(),
clientRequest.isPersistentForever()));
} else if (column == LIST_KEY) {
if (clientRequest instanceof ClientGet)
{
-
requestRow.addChild(createKeyCell(((ClientGet) clientRequest).getURI()));
+
requestRow.addChild(createKeyCell(((ClientGet) clientRequest).getURI(), false));
} else if (clientRequest instanceof
ClientPut) {
-
requestRow.addChild(createKeyCell(((ClientPut) clientRequest).getFinalURI()));
+
requestRow.addChild(createKeyCell(((ClientPut) clientRequest).getFinalURI(),
false));
}else {
-
requestRow.addChild(createKeyCell(((ClientPutDir)
clientRequest).getFinalURI()));
+
requestRow.addChild(createKeyCell(((ClientPutDir) clientRequest).getFinalURI(),
true));
}
} else if (column == LIST_FILENAME) {
if (clientRequest instanceof ClientGet)
{
