Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv21901/src/freenet
Modified Files:
ConnectionHandlerComparator.java OpenConnectionManager.java
Log Message:
Fix up the HTML generating code somewhat.
Display peer node version when on viewLevel > 0
Index: ConnectionHandlerComparator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandlerComparator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- ConnectionHandlerComparator.java 4 Oct 2003 01:16:55 -0000 1.9
+++ ConnectionHandlerComparator.java 15 Oct 2003 09:48:50 -0000 1.10
@@ -26,6 +26,9 @@
public static final int DATARECEIVED = 14;
public static final int COMBINEDQUEUE = 15;
public static final int COMBINED_DATA_TRANSFERED = 16;
+ public static final int PEER_NODE_VERSION = 17;
+ public static final int PEER_ARK_REVISION = 18;
+
private int iCompareMode =UNORDERED;
@@ -105,6 +108,22 @@
return
secondaryCompare(iSign,new
Long(ch1.receiveQueueSize()+ch1.sendQueueSize()).compareTo(new
Long(ch2.receiveQueueSize()+ch2.sendQueueSize())),ch1,ch2);
case COMBINED_DATA_TRANSFERED:
return
secondaryCompare(iSign,new
Long(ch1.totalDataSent()+ch1.totalDataReceived()).compareTo(new
Long(ch2.totalDataSent()+ch2.totalDataReceived())),ch1,ch2);
+ case PEER_NODE_VERSION:
+ {
+ NodeReference n1 =
ch1.targetReference();
+ NodeReference n2 =
ch2.targetReference();
+ String
s1=(n1==null?"":n1.getVersion());
+ String
s2=(n2==null?"":n2.getVersion());
+ return
secondaryCompare(iSign,s1.compareTo(s2),ch1,ch2);
+ }
+ case PEER_ARK_REVISION:
+ {
+ NodeReference n1 =
ch1.targetReference();
+ NodeReference n2 =
ch2.targetReference();
+ Long l1=(n1==null?new Long(-1):new
Long(n1.revision()));
+ Long l2=(n2==null?new Long(-1):new
Long(n2.revision()));
+ return
secondaryCompare(iSign,l1.compareTo(l2),ch1,ch2);
+ }
default:
return 0;
}
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -w -r1.122 -r1.123
--- OpenConnectionManager.java 14 Oct 2003 22:43:47 -0000 1.122
+++ OpenConnectionManager.java 15 Oct 2003 09:48:50 -0000 1.123
@@ -757,10 +757,10 @@
private String format(long bytes) {
if (bytes == 0) return "None";
- if (bytes>(2L<<32)) return nf.format(bytes>>30) + " GiB";
- if (bytes>(2<<22)) return nf.format(bytes>>20) + " MiB";
- if (bytes>(2<<12)) return nf.format(bytes>>10) + " KiB";
- return nf.format(bytes) + " Bytes";
+ if (bytes>(2L<<32)) return (nf.format(bytes>>30) + " GiB").replaceAll("
"," ");
+ if (bytes>(2<<22)) return (nf.format(bytes>>20) + " MiB").replaceAll("
"," ");
+ if (bytes>(2<<12)) return (nf.format(bytes>>10) + " KiB").replaceAll("
"," ");
+ return (nf.format(bytes) + " Bytes").replaceAll(" "," ");
}
/**
@@ -930,6 +930,16 @@
: ch.peerIdentity().toString().replaceAll("
"," ")
)
);
+ if(useOldStyle || viewLevel > 0) {
+ NodeReference nTarget = ch.targetReference();
+ String peerVersion;
+ if(nTarget==null || nTarget.getVersion().length() == 0)
+ peerVersion ="<Unknown>";
+ else
+ peerVersion =n.getVersion();
+ buffer.append
+ (sep + peerVersion.replaceAll(" "," "));
+ }
//int x = ch.sendingCount();
//if(x > 0) sending++;;
@@ -949,49 +959,23 @@
buffer.append(sepAlignRight+ch.messages());
if(useOldStyle || viewLevel > 0){
//if(ch.sending())
- // buffer.append
- // (sepAlignRight +
- // (viewLevel > 1
- // ? String.valueOf(ch.sendQueueSize())
- // : format(ch.sendQueueSize())
- // )
- // );
+ //buffer.append(sepAlignRight
+renderQueueSize(viewLevel > 1,ch.sendQueueSize()));
//else
// buffer.append(sepAlignRight+"-");
- buffer.append
- (sepAlignRight +
- (viewLevel > 1
- ? String.valueOf(ch.totalDataSent())
- : format(ch.totalDataSent())
- ).replaceAll(" "," ")
- );
+ buffer.append(sepAlignRight +renderQueueSize(viewLevel
> 1,ch.totalDataSent()));
+
if(ch.receiving())
- buffer.append
- (sepAlignRight +
- (viewLevel > 1
- ?
String.valueOf(ch.receiveQueueSize())
- : format(ch.receiveQueueSize())
- ).replaceAll(" "," ")
- );
+ buffer.append(sepAlignRight
+renderQueueSize(viewLevel > 1,ch.receiveQueueSize()));
+
else
buffer.append(sepAlignRight+"-");
- buffer.append
- (sepAlignRight +
- (viewLevel > 1
- ? String.valueOf(ch.totalDataReceived())
- : format(ch.totalDataReceived())
- ).replaceAll(" "," ")
- );
+ buffer.append(sepAlignRight +
renderQueueSize(viewLevel > 1,ch.totalDataReceived()));
}else{
if(ch.sending()||ch.receiving())
buffer.append(sepAlignRight+format(ch.sendQueueSize()));
else
buffer.append(sepAlignRight+"-");
- buffer.append
- (sepAlignRight +
- format(ch.totalDataSent() +
ch.totalDataReceived()
- ).replaceAll(" "," ")
- );
+ buffer.append(sepAlignRight +
renderQueueSize(false,ch.totalDataSent() + ch.totalDataReceived()));
}
//sendQueueSize += ch.sendQueueSize();
receiveQueueSize += ch.receiveQueueSize();
@@ -1054,15 +1038,15 @@
" ("+sending+"/"+receiving+")</td></tr>");
if(viewLevel>0) {
pw.println("<tr><td>Data waiting to be
transmitted/received</td><td width =10></td><td>" +
- format(sendQueueSize).replaceAll("
"," ") +
+ format(sendQueueSize)+
"/"+
-
format(receiveQueueSize).replaceAll(" "," ") +
+ format(receiveQueueSize) +
"</td></tr>");
pw.println("<tr><td>Amount of data
transmitted/received over currently open connections</td>" +
"<td width =10></td><td>" +
- format(totalDataSent).replaceAll("
"," ") +
+ format(totalDataSent) +
"/" +
-
format(totalDataReceived).replaceAll(" "," ") +
+ format(totalDataReceived) +
"</td></tr>");
pw.println("<tr><td>Outbound connections that are to
peers not in the routingtable</td>" +
"<td width =10></td><td>" +
@@ -1105,115 +1089,73 @@
pw.println("</table></td></tr></table>");
}
if(!useOldStyle)
- if(viewLevel==2)
- pw.println("<font size = 1><A HREF =
'"+req.getRequestURI()+"?setLevel=1'>[Less details]</A></font>");
- else if(viewLevel==0)
- pw.println("<font size = 1><A HREF =
'"+req.getRequestURI()+"?setLevel=1'>[More details]</A></font>");
- else{
- pw.println("<font size = 1><A HREF =
'"+req.getRequestURI()+"?setLevel=2'>[More details]</A></font>");
- pw.println("<font size = 1><A HREF =
'"+req.getRequestURI()+"?setLevel=0'>[Less details]</A></font>");
- }
-
+
pw.print(renderViewLevelSelectorLink(req.getRequestURI(),viewLevel));
else
pw.print("<br><br>");
pw.println("<table border=1 cellspacing = 0>\n");
- String sImgClause = "<img src='/servlet/images/aqua/s_ar_" +
- (iSortingMode < 0 ? "up" : "down") +
- "_olive.gif' height = '9' width = '10'>";
-
pw.print("<tr>");
if(!useOldStyle)
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" + (iSortingMode==9?"-9":"9") +
"'>" +
- (Math.abs(iSortingMode) == 9
- ? sImgClause
- : "" ) +
- " Type</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.OUTBOUND,"Type"));
if(useOldStyle || viewLevel>1) {
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==1?"-1":"1") + "'>" +
- (Math.abs(iSortingMode)==1?sImgClause:"") + "
Peer address</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==11?"-11":"11") + "'>" +
- (Math.abs(iSortingMode)==11?sImgClause:"") +
" Routing address</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.PEER_ADDRESS,"Peer
address"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.ROUTING_ADDRESS,"Routing
address"));
}else
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==11?"-11":"11") + "'>" +
- (Math.abs(iSortingMode)==11?sImgClause:"") +
" Peer</A></th>");
- if(useOldStyle || viewLevel>1)
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==2?"-2":"2") + "'>" +
- (Math.abs(iSortingMode)==2?sImgClause:"") + "
Peer identity</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.ROUTING_ADDRESS,"Peer"));
+ if(useOldStyle || viewLevel>1){
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.PEER_IDENTITY,"Peer
identity"));
+ }
+ if(useOldStyle || viewLevel>0)
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.PEER_NODE_VERSION,"Peer
node version"));
if(useOldStyle)
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==5?"-5":"5") + "'>" +
- (Math.abs(iSortingMode)==5?sImgClause:"") + "
Receiving</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode==6?"-6":"6") + "'>" +
- (Math.abs(iSortingMode)==6?sImgClause:"") + "
Messages</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.RECEIVING,"Receiving"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.MESSAGES,"Messages"));
if(useOldStyle || viewLevel>0) {
- //pw.print("<th><A HREF='" + req.getRequestURI() +
- // "?setSorting=" +
- // (iSortingMode==4?"-4":"4") + "'>" +
- // (Math.abs(iSortingMode)==4?sImgClause:"") + "
Send queue</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
-
(iSortingMode==ConnectionHandlerComparator.DATASENT?"-":"") +
- ConnectionHandlerComparator.DATASENT + "'>" +
-
(Math.abs(iSortingMode)==ConnectionHandlerComparator.DATASENT?sImgClause:"") +
- " Data sent</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
-
(iSortingMode==ConnectionHandlerComparator.RECEIVEQUEUE?"-":"") +
- ConnectionHandlerComparator.RECEIVEQUEUE +
"'>" +
-
(Math.abs(iSortingMode)==ConnectionHandlerComparator.RECEIVEQUEUE?sImgClause:"") +
- " Receive queue</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
-
(iSortingMode==ConnectionHandlerComparator.DATARECEIVED?"-":"") +
- ConnectionHandlerComparator.DATARECEIVED +
"'>" +
-
(Math.abs(iSortingMode)==ConnectionHandlerComparator.DATARECEIVED?sImgClause:"") +
- " Data received</A></th>");
+
//pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.SENDQUEUE,"Data
sent"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.DATASENT,"Send
queue"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.RECEIVEQUEUE,"Receive
queue"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.DATARECEIVED,"Data
received"));
} else {
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
-
(iSortingMode==ConnectionHandlerComparator.COMBINEDQUEUE?"-":"") +
- ConnectionHandlerComparator.COMBINEDQUEUE +
"'>" +
-
(Math.abs(iSortingMode)==ConnectionHandlerComparator.COMBINEDQUEUE?sImgClause:"") +
- " Queue</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
-
(iSortingMode==ConnectionHandlerComparator.COMBINED_DATA_TRANSFERED?"-":"") +
-
ConnectionHandlerComparator.COMBINED_DATA_TRANSFERED + "'>" +
-
(Math.abs(iSortingMode)==ConnectionHandlerComparator.COMBINED_DATA_TRANSFERED?sImgClause:"")
+
- " Data transfered</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.COMBINEDQUEUE,"Queue"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.COMBINED_DATA_TRANSFERED,"Data
transfered"));
}
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode == 7 ? "-7" : "7") + "'>" +
- (Math.abs(iSortingMode) == 7 ? sImgClause : "") + "
Idletime</A></th>");
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode == 8 ? "-8" : "8") + "'>" +
- (Math.abs(iSortingMode) == 8 ? sImgClause : "") + "
Lifetime</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.IDLETIME,"Idletime"));
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.LIFETIME,"Lifetime"));
if(useOldStyle)
- pw.print("<th><A HREF='" + req.getRequestURI() +
- "?setSorting=" +
- (iSortingMode == 9 ? "-9" : "9") + "'>" +
- (Math.abs(iSortingMode) == 9 ? sImgClause :
"") + " Type</A></th>");
+
pw.print(renderTableHeader(req.getRequestURI(),iSortingMode,ConnectionHandlerComparator.OUTBOUND,"Type"));
pw.println(buffer.toString());
pw.println("</table>");
+ }
+
+ private String renderQueueSize(boolean detailed, long queueSize){
+ return detailed ? String.valueOf(queueSize): format(queueSize);
+ }
+ //Helper method for rendering the view level selection link to HTML
+ private String renderViewLevelSelectorLink(String scriptName,int
currentViewLevel){
+ StringBuffer retval= new StringBuffer(70);
+ if(viewLevel==2)
+ retval.append("<font size = 1><A HREF =
'"+scriptName+"?setLevel=1'>[Less details]</A></font>");
+ else if(viewLevel==0)
+ retval.append("<font size = 1><A HREF =
'"+scriptName+"?setLevel=1'>[More details]</A></font>");
+ else{
+ retval.append("<font size = 1><A HREF =
'"+scriptName+"?setLevel=2'>[More details]</A></font>");
+ retval.append("<font size = 1><A HREF =
'"+scriptName+"?setLevel=0'>[Less details]</A></font>");
+ }
+ return retval.toString();
+ }
+ //Helper method for rendering the connection table header fields to HTML
+ private String renderTableHeader(String scriptName,int currentSorting,int
clickSortingMode,String label){
+ String sImgClause = "<img src='/servlet/images/aqua/s_ar_" +
+ (currentSorting < 0 ? "up" : "down") +
+ "_olive.gif' height = '9' width = '10'>";
+ return "<th><A HREF='" + scriptName +
+ "?setSorting=" +
+ (currentSorting == clickSortingMode ? ("-"+clickSortingMode) :
new Long(clickSortingMode).toString()) + "'>" +
+ (Math.abs(currentSorting) == clickSortingMode ? sImgClause :
"") + " "+label.replaceAll(" "," ")+"</A></th>";
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
