[freenet-cvs] r9390 - trunk/freenet/src/freenet/node

[zot...@freenetproject.org]

Author: zothar
Date: 2006-06-27 00:15:18 +0000 (Tue, 27 Jun 2006)
New Revision: 9390

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Refactor a few boolean metadata.gets

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-06-26 20:49:35 UTC 
(rev 9389)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-06-27 00:15:18 UTC 
(rev 9390)
@@ -428,30 +428,15 @@
                } else {
                        peerAddedTime = 1;
                }
-               String tempNeverConnectedString = 
metadata.get("neverConnected");
-               if(tempNeverConnectedString != null && 
tempNeverConnectedString.equals("true")) {
-                       neverConnected = true;
-               } else {
-                       neverConnected = false;
-               }
+               neverConnected = 
Fields.stringToBool(metadata.get("neverConnected"), false);
                if((now - peerAddedTime) > (((long) 30)*24*60*60*1000)) {  // 
30 days
                        peerAddedTime = 0;  // don't store anymore
                }
                if(!neverConnected) {
                        peerAddedTime = 0;  // don't store anymore
                }
-               String tempIsDisabledString = metadata.get("isDisabled");
-               if(tempIsDisabledString != null && 
tempIsDisabledString.equals("true")) {
-                       isDisabled = true;
-               } else {
-                       isDisabled = false;
-               }
-               String tempIsListenOnlyString = metadata.get("isListenOnly");
-               if(tempIsListenOnlyString != null && 
tempIsListenOnlyString.equals("true")) {
-                       isListenOnly = true;
-               } else {
-                       isListenOnly = false;
-               }
+               isDisabled = Fields.stringToBool(metadata.get("isDisabled"), 
false);
+               isListenOnly = 
Fields.stringToBool(metadata.get("isListenOnly"), false);
                }
         } else {
             neverConnected = true;