diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java index 0648f4c42..e5e4aa0fe 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java @@ -25,7 +25,8 @@ public class PeerHelper extends HelperBase { public String getPeerSummary() { try { _context.commSystem().renderStatusHTML(_out, _urlBase, _sortFlags); - _context.bandwidthLimiter().renderStatusHTML(_out); + // boring and not worth translating + //_context.bandwidthLimiter().renderStatusHTML(_out); } catch (IOException ioe) { ioe.printStackTrace(); } diff --git a/history.txt b/history.txt index 70ceccb31..690a90c69 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,16 @@ +2009-10-28 zzz + * Console: + - Rewrite TrustedUpdate version comparator, use for netdb version table + so 0.7.10 will be sorted correctly + - Reduce netdb.jsp memory usage + - More tagging fixups + - configclients.jsp fixup for "Web console" + - Remove limiter status from peers.jsp + - Fix UPnP status header + * NetDb: + - Generate new RI immediately at startup + - Try again to not publish RI until we have been up a few minutes + 2009-10-26 zzz * Console: - Add parameterized tag diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index aea509c4d..0116da736 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 504fe3260..1d2472ecd 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -618,7 +618,9 @@ public class FIFOBandwidthLimiter { } } + /** @deprecated not worth translating */ public void renderStatusHTML(Writer out) throws IOException { +/******* long now = now(); StringBuilder buf = new StringBuilder(4096); buf.append("

Limiter Status:

").append(getStatus().toString()).append("\n"); @@ -648,6 +650,7 @@ public class FIFOBandwidthLimiter { buf.append("
\n"); out.write(buf.toString()); out.flush(); +******/ } private static long __requestId = 0; diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java index 079a2f6dc..6ed11cdc2 100644 --- a/router/java/src/net/i2p/router/transport/UPnP.java +++ b/router/java/src/net/i2p/router/transport/UPnP.java @@ -454,7 +454,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis /** warning - slow */ public String renderStatusHTML() { final StringBuilder sb = new StringBuilder(); - sb.append("UPnP Status:
"); + sb.append("

UPnP Status

"); if(isDisabled) { sb.append("UPnP has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?"); diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java index e38ee62fa..7996a4556 100644 --- a/router/java/src/net/i2p/router/transport/UPnPManager.java +++ b/router/java/src/net/i2p/router/transport/UPnPManager.java @@ -156,7 +156,7 @@ public class UPnPManager { public String renderStatusHTML() { if (!_isRunning) - return "UPnP is not enabled\n"; + return "

UPnP is not enabled

\n"; return _upnp.renderStatusHTML(); } }