Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv15247/src/freenet
Modified Files:
OpenConnectionManager.java
Log Message:
More work on the OCM PeerHandler HTML interface
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -w -r1.130 -r1.131
--- OpenConnectionManager.java 19 Oct 2003 20:22:24 -0000 1.130
+++ OpenConnectionManager.java 20 Oct 2003 00:05:50 -0000 1.131
@@ -65,7 +65,7 @@
private boolean logDEBUG = true;
private final boolean doHardConnectionLimit = true; // set true to enable
special debugging for the Curus Bug (simultaneous connect attempts to the same node)!.
FIXME: set false before release
- private boolean peerHandlerHTMLMode = false; //If true then we will render the
OCM HTML page in PeerHandler mode, else in Connectionsmode
+ private boolean peerHandlerHTMLMode = true; //If true then we will render the OCM
HTML page in PeerHandler mode, else in Connectionsmode
private int iPeerHandlerSortingMode = 0; //The sorting mode to be used when in
peerHandlermode
private NumberFormat nf = NumberFormat.getInstance();
private ConnectionsHTMLRenderer connectionsHTMLRenderer = new
ConnectionsHTMLRenderer();
@@ -1959,6 +1959,20 @@
pw.println("<TR height = 3px><TD COLSPAN=2><IMG height = 3
width="+v1.barLength+"
SRC='/servlet/coloredpixel?color="+v1.barColor+"'></IMG></TD></TR>");
if(v2 != null)
pw.println("<TR height = 3px><TD COLSPAN=2><IMG height
= 3 width="+v2.barLength+"
SRC='/servlet/coloredpixel?color="+v2.barColor+"'></IMG></TD></TR>");
+ }
+ protected void renderSortingTool(PrintWriter pw, HttpServletRequest
req){
+ pw.println("<TABLE>");
+ if(viewLevel==0)
+ pw.println(renderSortingLink(req.getRequestURI(),"Data
queued",PeerHandler.PeerHandlerComparator.COMBINEDQUEUE));
+ else{
+ pw.println(renderSortingLink(req.getRequestURI(),"Data
queued out",PeerHandler.PeerHandlerComparator.SENDQUEUE));
+
//pw.println(renderSortingLink(req.getRequestURI(),"Data queued
out",PeerHandler.PeerHandlerComparator.SENDQUEUE));
+ }
+ pw.println("/<TABLE>");
+ }
+ protected String renderSortingLink(String scriptName, String label,
int clickSortingMode) {
+ String sImgClause = "<img src='/servlet/images/aqua/s_ar_" +
(iSortingMode < 0 ? "up" : "down") + "_olive.gif' height = '9' width = '10'>";
+ return "<TR><TD><A HREF='" + scriptName + "?setSorting=" +
(iSortingMode == clickSortingMode ? ("-" + clickSortingMode) : new
Long(clickSortingMode).toString()) + "'>" + (Math.abs(iSortingMode) ==
clickSortingMode ? sImgClause : "") + " " + label.replaceAll(" ", " ") +
"</A></TD></TR>";
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
