[freenet-cvs] r21849 - in trunk/freenet/src/freenet/node: . useralerts

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-14 16:40:55 +0000 (Thu, 14 Aug 2008)
New Revision: 21849

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
Log:
Hide the MeaningfullNodeNameUserAlert if there is no darknet peer

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2008-08-14 16:26:09 UTC 
(rev 21848)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2008-08-14 16:40:55 UTC 
(rev 21849)
@@ -1224,6 +1224,17 @@
                }
                return false;
        }
+       
+       public boolean anyDarknetPeers() {
+               PeerNode[] conns;
+               synchronized(this) {
+                       conns = connectedPeers;
+               }
+               for(PeerNode p : conns)
+                       if(p.isDarknet())
+                               return true;
+               return false;
+       }

        /**
         * Ask each PeerNode to read in it's extra peer data

Modified: 
trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java  
2008-08-14 16:26:09 UTC (rev 21848)
+++ trunk/freenet/src/freenet/node/useralerts/MeaningfulNodeNameUserAlert.java  
2008-08-14 16:40:55 UTC (rev 21849)
@@ -17,6 +17,7 @@
                this.node = n;
        }

+       @Override
        public String getTitle() {
                return l10n("noNodeNickTitle");
        }
@@ -25,14 +26,17 @@
                return L10n.getString("MeaningfulNodeNameUserAlert."+key);
        }

+       @Override
        public String getText() {
                return l10n("noNodeNick");
        }

+       @Override
        public String getShortText() {
                return l10n("noNodeNickShort");
        }

+       @Override
        public HTMLNode getHTMLText() {
                SubConfig sc = node.config.get("node");
                Option o = sc.getOption("name");
@@ -55,4 +59,8 @@
                return alertNode;
        }

+       @Override
+       public boolean isValid() {
+               return node.peers.anyDarknetPeers();
+       }
 }