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

[zot...@freenetproject.org]

Author: zothar
Date: 2006-06-25 04:17:44 +0000 (Sun, 25 Jun 2006)
New Revision: 9382

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
DISABLED status is now saved across restarts.  Accidentally removing peers is 
now less likely on the advanced /darknet/ page.

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-06-25 03:34:09 UTC (rev 9381)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-06-25 04:17:44 UTC (rev 9382)
@@ -400,6 +400,7 @@
                                buf.append(" <option value=\"\">-- Select 
Action --</option>\n");
                                buf.append(" <option value=\"enable\">Enable 
Selected Peers</option>\n");
                                buf.append(" <option value=\"disable\">Disable 
Selected Peers</option>\n");
+                               buf.append(" <option value=\"\">-- -- 
--</option>\n");
                                buf.append(" <option value=\"remove\">Remove 
Selected Peers</option>\n");
                                buf.append("</select>\n");
                                buf.append("<input type=\"submit\" 
name=\"submit\" value=\"Go\" />\n");

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-06-25 03:34:09 UTC 
(rev 9381)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-06-25 04:17:44 UTC 
(rev 9382)
@@ -437,6 +437,12 @@
                if(!neverConnected) {
                        peerAddedTime = 0;  // don't store anymore
                }
+               String tempIsDisabledString = metadata.get("isDisabled");
+               if(tempIsDisabledString != null && 
tempIsDisabledString.equals("true")) {
+                       isDisabled = true;
+               } else {
+                       isDisabled = false;
+               }
                }
         } else {
             neverConnected = true;
@@ -1484,6 +1490,8 @@
                fs.put("peerAddedTime", Long.toString(peerAddedTime));
        if(neverConnected)
                fs.put("neverConnected", "true");
+       if(isDisabled)
+               fs.put("isDisabled", "true");
        return fs;
        }

@@ -1939,6 +1947,7 @@
        public void enablePeer() {
                isDisabled = false;
                setPeerNodeStatus(System.currentTimeMillis());
+        node.peers.writePeers();
        }

        public void disablePeer() {
@@ -1948,6 +1957,7 @@
                isDisabled = true;
        arkFetcher.stop();
                setPeerNodeStatus(System.currentTimeMillis());
+        node.peers.writePeers();
        }

        public boolean isDisabled() {