[freenet-cvs] r9103 - in trunk/freenet/src/freenet: clients/http node

[zot...@freenetproject.org]

Author: zothar
Date: 2006-06-09 17:03:02 +0000 (Fri, 09 Jun 2006)
New Revision: 9103

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/node/ARKFetcher.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Asterisk peers that we're requesting ARKs for on /darknet/

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-06-09 16:34:17 UTC (rev 9102)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-06-09 17:03:02 UTC (rev 9103)
@@ -229,7 +229,11 @@
                        for(int i=0;i<rows.length;i++) {
                                Object[] row = rows[i];
                                int x = ((Integer) row[2]).intValue();
-                               row[2] = "<span class=\""+((PeerNode) 
row[0]).getPeerNodeStatusCSSClassName()+"\">"+((PeerNode) 
row[0]).getPeerNodeStatusString()+"</span>";
+                               String arkAsterisk = "";
+                               if(((PeerNode) row[0]).isFetchingARK()) {
+                                       arkAsterisk = "*";
+                               }
+                               row[2] = "<span class=\""+((PeerNode) 
row[0]).getPeerNodeStatusCSSClassName()+"\">"+((PeerNode) 
row[0]).getPeerNodeStatusString()+arkAsterisk+"</span>";
                        }

                        // Turn array into HTML
@@ -278,7 +282,7 @@
                        //
                        buf.append(buf2);
                        //
-                       buf.append("<input type=\"submit\" name=\"remove\" 
value=\"Remove selected peers\" />\n");
+                       buf.append("<input type=\"submit\" name=\"remove\" 
value=\"Remove selected peers\" />&nbsp;&nbsp;&nbsp;<span 
class=\"darknet_connections\">* Requesting ARK</span>\n");
                        buf.append("</form>\n");
                }
                buf.append("</div>\n");

Modified: trunk/freenet/src/freenet/node/ARKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/node/ARKFetcher.java      2006-06-09 16:34:17 UTC 
(rev 9102)
+++ trunk/freenet/src/freenet/node/ARKFetcher.java      2006-06-09 17:03:02 UTC 
(rev 9103)
@@ -167,5 +167,9 @@
        public void onGeneratedURI(FreenetURI uri, BaseClientPutter state) {
                // Impossible.
        }
+
+       public boolean isFetching() {
+               return isFetching;
+       }

 }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-06-09 16:34:17 UTC 
(rev 9102)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-06-09 17:03:02 UTC 
(rev 9103)
@@ -1849,5 +1849,9 @@
        public String getIdentityString() {
        return Base64.encode(identity);
     }
+
+       public boolean isFetchingARK() {
+               return arkFetcher.isFetching();
+       }
 }