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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-30 02:16:48 +0000 (Thu, 30 Nov 2006)
New Revision: 11129

Modified:
   trunk/freenet/src/freenet/node/PeerNodeStatus.java
Log:
getPeer() not getDetectedPeer(), also minor optimisation

Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java  2006-11-30 02:16:13 UTC 
(rev 11128)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java  2006-11-30 02:16:48 UTC 
(rev 11129)
@@ -7,6 +7,7 @@
 import java.util.Map;

 import freenet.clients.http.DarknetConnectionsToadlet;
+import freenet.io.comm.Peer;

 /**
  * Contains various status information for a {@link PeerNode}. Used e.g. in
@@ -86,8 +87,14 @@

        public PeerNodeStatus(PeerNode peerNode) {
                this.name = peerNode.getName();
-               this.peerAddress = (peerNode.getDetectedPeer() != null) ? 
peerNode.getDetectedPeer().getFreenetAddress().toString() : null;
-               this.peerPort = (peerNode.getDetectedPeer() != null) ? 
peerNode.getDetectedPeer().getPort() : -1;
+               Peer p = peerNode.getPeer();
+               if(p == null) {
+                       peerAddress = null;
+                       peerPort = -1;
+               } else {
+                       peerAddress = p.getFreenetAddress().toString();
+                       peerPort = p.getPort();
+               }
                this.statusValue = peerNode.getPeerNodeStatus();
                this.statusName = peerNode.getPeerNodeStatusString();
                this.statusCSSName = peerNode.getPeerNodeStatusCSSClassName();