Author: nextgens
Date: 2006-08-29 17:10:21 +0000 (Tue, 29 Aug 2006)
New Revision: 10292
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
Log:
remove some backward compatibility code, use SimpleVersion everywhere on the
/darknet/ page
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-29 11:05:05 UTC (rev 10291)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-29 17:10:21 UTC (rev 10292)
@@ -340,11 +340,7 @@
peerRow.addChild("td", "class",
"peer-status").addChild("span", "class", peerNodeStatus.getStatusCSSName(),
statusString + (peerNodeStatus.isFetchingARK() ? "*" : ""));
// name column
- if
(Integer.parseInt(peerNodeStatus.getSimpleVersion()) > 476) {
- peerRow.addChild("td", "class",
"peer-name").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" +
peerNodeStatus.hashCode(), peerNodeStatus.getName());
- } else {
- peerRow.addChild("td", "class",
"peer-name").addChild("#", peerNodeStatus.getName()); // TODO: This branch can
probably be removed at some point
- }
+ peerRow.addChild("td", "class",
"peer-name").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" +
peerNodeStatus.hashCode(), peerNodeStatus.getName());
// address column
if (advancedEnabled) {
@@ -357,9 +353,9 @@
// version column
if (peerNodeStatus.getStatusValue() !=
Node.PEER_NODE_STATUS_NEVER_CONNECTED &&
(peerNodeStatus.isPublicInvalidVersion() ||
peerNodeStatus.isPublicReverseInvalidVersion())) { // Don't draw attention to
a version problem if NEVER CONNECTED
- peerRow.addChild("td", "class",
"peer-version").addChild("span", "class", "peer_version_problem",
advancedEnabled ? peerNodeStatus.getVersion() :
peerNodeStatus.getSimpleVersion());
+ peerRow.addChild("td", "class",
"peer-version").addChild("span", "class", "peer_version_problem",
peerNodeStatus.getSimpleVersion());
} else {
- peerRow.addChild("td", "class",
"peer-version").addChild("#", advancedEnabled ? peerNodeStatus.getVersion() :
peerNodeStatus.getSimpleVersion());
+ peerRow.addChild("td", "class",
"peer-version").addChild("#", peerNodeStatus.getSimpleVersion());
}
// location column
