Author: zothar
Date: 2006-12-18 22:47:56 +0000 (Mon, 18 Dec 2006)
New Revision: 11475
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Move Peer Location Distribution circle to /stats/ page
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-12-18 22:18:17 UTC (rev 11474)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-12-18 22:47:56 UTC (rev 11475)
@@ -542,18 +542,6 @@
actionSelect.addChild("option", "value",
"remove", "Remove selected peers");
peerForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "doAction", "Go" });
- // BEGIN PEER LOCATION DISTRIBUTION CIRCLE
- if (advancedEnabled) {
- HTMLNode peerCircleTable =
peerTableInfobox.addChild("table", "class", "column");
- HTMLNode peerCircleTableRow =
peerCircleTable.addChild("tr");
- HTMLNode nextPeerCircleTableCell =
peerCircleTableRow.addChild("td", "class", "first");
- //
- HTMLNode peerCircleInfobox =
nextPeerCircleTableCell.addChild("div", "class", "infobox");
- peerCircleInfobox.addChild("div", "class",
"infobox-header", "Peer Location Distribution");
- HTMLNode peerCircleInfoboxContent =
peerCircleInfobox.addChild("div", "class", "infobox-content");
- addPeerCircle(peerCircleInfoboxContent);
- }
- // END PEER LOCATION DISTRIBUTION CIRCLE
}
// END PEER TABLE
}
@@ -617,39 +605,6 @@
this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
}
- private final static int PEER_CIRCLE_RADIUS = 100;
-
- private void addPeerCircle (HTMLNode htmlNode)
- {
- HTMLNode peerCircleInfoboxContentDiv = htmlNode.addChild("div",
new String[] { "style", "class" }, new String[] {"position: relative; height: "
+ (PEER_CIRCLE_RADIUS * 2 + 10) + "px", "peercircle" });
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0), "mark"
}, "|");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.125), "mark"
}, "+");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.25), "mark"
}, "--");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.375), "mark"
}, "+");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.5), "mark"
}, "|");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.625), "mark"
}, "+");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.75), "mark"
}, "--");
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.875), "mark"
}, "+");
- //
- PeerNodeStatus[] peerNodeStatuses = node.getPeerNodeStatuses();
- for (int peerIndex = 0, peerCount = peerNodeStatuses.length;
peerIndex < peerCount; peerIndex++) {
- PeerNodeStatus peerNodeStatus =
peerNodeStatuses[peerIndex];
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] {
generatePeerCircleStyleString(peerNodeStatus.getLocation()),
((peerNodeStatus.isConnected())?"connected":"disconnected") }, "x");
- }
- //
- peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] {
generatePeerCircleStyleString(node.getLocation()), "me" }, "x");
- }
-
- private String generatePeerCircleStyleString (double peerLocation)
- {
- peerLocation *= Math.PI * 2;
- //
- double x = PEER_CIRCLE_RADIUS + Math.sin(peerLocation) *
PEER_CIRCLE_RADIUS;
- double y = PEER_CIRCLE_RADIUS - Math.cos(peerLocation) *
PEER_CIRCLE_RADIUS;
- //
- return "position: absolute; top: " + y + "px; left: " + x + "px";
- }
-
private String sortString(boolean isReversed, String type) {
return (isReversed ? ("?sortBy="+type) :
("?sortBy="+type+"&reversed"));
}
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2006-12-18 22:18:17 UTC (rev 11474)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2006-12-18 22:47:56 UTC (rev 11475)
@@ -524,9 +524,52 @@
} else {
versionInfoboxList.addChild("li",
"Freenet-ext Build #" + NodeStarter.extBuildNumber + " r" +
NodeStarter.extRevisionNumber);
}
+
+ // peer distribution box
+ overviewTableRow = overviewTable.addChild("tr");
+ nextTableCell = overviewTableRow.addChild("td",
"class", "first");
+ HTMLNode peerCircleInfobox =
nextTableCell.addChild("div", "class", "infobox");
+ peerCircleInfobox.addChild("div", "class",
"infobox-header", "Peer Location Distribution");
+ HTMLNode peerCircleInfoboxContent =
peerCircleInfobox.addChild("div", "class", "infobox-content");
+ addPeerCircle(peerCircleInfoboxContent);
}
}
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
}
+
+ private final static int PEER_CIRCLE_RADIUS = 100;
+
+ private void addPeerCircle (HTMLNode htmlNode) {
+ HTMLNode peerCircleInfoboxContentDiv = htmlNode.addChild("div",
new String[] { "style", "class" }, new String[] {"position: relative; height: "
+ (PEER_CIRCLE_RADIUS * 2 + 10) + "px", "peercircle" });
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0, false),
"mark" }, "|");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.125, false),
"mark" }, "+");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.25, false),
"mark" }, "--");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.375, false),
"mark" }, "+");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.5, false),
"mark" }, "|");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.625, false),
"mark" }, "+");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.75, false),
"mark" }, "--");
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] { generatePeerCircleStyleString(0.875, false),
"mark" }, "+");
+ //
+ PeerNodeStatus[] peerNodeStatuses = node.getPeerNodeStatuses();
+ for (int peerIndex = 0, peerCount = peerNodeStatuses.length;
peerIndex < peerCount; peerIndex++) {
+ PeerNodeStatus peerNodeStatus =
peerNodeStatuses[peerIndex];
+ peerCircleInfoboxContentDiv.addChild("span", new
String[] { "style", "class" }, new String[] {
generatePeerCircleStyleString(peerNodeStatus.getLocation(), false),
((peerNodeStatus.isConnected())?"connected":"disconnected") }, "x");
+ }
+ //
+ peerCircleInfoboxContentDiv.addChild("span", new String[] {
"style", "class" }, new String[] {
generatePeerCircleStyleString(node.getLocation(), true), "me" }, "x");
+ }
+
+ private String generatePeerCircleStyleString (double peerLocation,
boolean me) {
+ peerLocation *= Math.PI * 2;
+ //
+ int offset = 0;
+ if( me ) {
+ offset = 10;
+ }
+ double x = PEER_CIRCLE_RADIUS + Math.sin(peerLocation) *
(PEER_CIRCLE_RADIUS - offset);
+ double y = PEER_CIRCLE_RADIUS - Math.cos(peerLocation) *
(PEER_CIRCLE_RADIUS - offset);
+ //
+ return "position: absolute; top: " + y + "px; left: " + x +
"px";
+ }
}
