Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv18179/src/freenet/client/http
Modified Files:
NodeStatusServlet.java
Log Message:
6317:
Make most xfer rates bytes/sec, fix conversion errors leading to crazy estimates,
change transferSucceeded arguments.
Add min/max xfer rates to node RT status summary page.
Logging.
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -w -r1.79 -r1.80
--- NodeStatusServlet.java 31 Oct 2003 20:58:07 -0000 1.79
+++ NodeStatusServlet.java 7 Nov 2003 18:17:15 -0000 1.80
@@ -1831,7 +1831,7 @@
if (rtType == null) {
return refValues;
}
-
+ int colJoin = refValues.length;
boolean failing = true;
boolean isCPRT = rtType.equals("freenet.node.rt.CPAlgoRoutingTable");
boolean isNGRT = rtType.equals("freenet.node.rt.NGRoutingTable");
@@ -1842,13 +1842,13 @@
refValues[2+ngrtadd] = "none";
failing = false;
}
- int col = isCPRT ? 12 : 15;
- refValues[col] = refValues[col].toString() + "/" +
- refValues[col+1];
- if(refValues[col].equals("0/0")) {
- refValues[col] = "<font color=\"red\">0/0</font>";
+ colJoin = isCPRT ? 12 : 15;
+ refValues[colJoin] = refValues[colJoin].toString() + "/" +
+ refValues[colJoin+1];
+ if(refValues[colJoin].equals("0/0")) {
+ refValues[colJoin] = "<font color=\"red\">0/0</font>";
} else {
- refValues[col] = "<font color=\"green\">"+refValues[col]+
+ refValues[colJoin] = "<font color=\"green\">"+refValues[colJoin]+
"</font>";
}
long lastTry = ((Long)refValues[5+ngrtadd]).longValue();
@@ -1926,13 +1926,19 @@
"\">"+refValues[0]+"</a>";
}
- // WTF?
- final int y = refValues.length-1;
- Object[] o = new Object[y];
- for(int x=0;x<y;x++)
- o[x] = refValues[x];
-
- return o;
+// // WTF?
+// final int y = refValues.length-1;
+// Object[] o = new Object[y];
+// // Up to colJoin
+// for(int x=0;x<=colJoin;x++)
+// o[x] = refValues[x];
+//
+// // After colJoin
+// for(int x=(colJoin+2);x<refValues.length;x++) {
+// o[x-1] = refValues[x];
+// }
+ return refValues;
+// return o;
}
////////////////////////////////////////////////////////////
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
