From 729282c0c4b579e2ba02633843fc81e7bba84e72 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 18 May 2013 20:10:10 +0000
Subject: [PATCH] * UDPAddress: Remove dependency in console; make package
 private

---
 .../src/net/i2p/router/web/ConfigNetHelper.java  | 16 ++++------------
 .../net/i2p/router/transport/udp/UDPAddress.java |  3 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index cbf8c859c..11971fb14 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -7,7 +7,6 @@ import net.i2p.data.RouterAddress;
 import net.i2p.router.CommSystemFacade;
 import net.i2p.router.Router;
 import net.i2p.router.transport.TransportManager;
-import net.i2p.router.transport.udp.UDPAddress;
 import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.util.Addresses;
 
@@ -32,22 +31,15 @@ public class ConfigNetHelper extends HelperBase {
         return _context.getProperty(PROP_I2NP_NTCP_PORT, ""); 
     }
     
-    public String getUdpAddress() {
-        RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
-        if (addr == null)
-            return _("unknown");
-        UDPAddress ua = new UDPAddress(addr);
-        return ua.toString();
-    }
-    
+    /** @return host or "unknown" */
     public String getUdpIP() {
         RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
         if (addr == null)
             return _("unknown");
-        UDPAddress ua = new UDPAddress(addr);
-        if (ua.getHost() == null)
+        String rv = addr.getHost();
+        if (rv == null)
             return _("unknown");
-        return ua.getHost();
+        return rv;
     }
 
     /**
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
index 83ce91dc6..ff77ad0e6 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
@@ -11,9 +11,8 @@ import net.i2p.util.LHMCache;
 
 /**
  * basic helper to parse out peer info from a udp address
- * FIXME public for ConfigNetHelper
  */
-public class UDPAddress {
+class UDPAddress {
     private final String _host;
     private InetAddress _hostAddress;
     private final int _port;