* Console:

- Remove limiter status from peers.jsp
      - Fix UPnP status header
This commit is contained in:
zzz
2009-10-28 22:12:10 +00:00
parent aeb6635e71
commit e5212937af
6 changed files with 21 additions and 4 deletions

View File

@ -25,7 +25,8 @@ public class PeerHelper extends HelperBase {
public String getPeerSummary() { public String getPeerSummary() {
try { try {
_context.commSystem().renderStatusHTML(_out, _urlBase, _sortFlags); _context.commSystem().renderStatusHTML(_out, _urlBase, _sortFlags);
_context.bandwidthLimiter().renderStatusHTML(_out); // boring and not worth translating
//_context.bandwidthLimiter().renderStatusHTML(_out);
} catch (IOException ioe) { } catch (IOException ioe) {
ioe.printStackTrace(); ioe.printStackTrace();
} }

View File

@ -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 2009-10-26 zzz
* Console: * Console:
- Add parameterized tag - Add parameterized tag

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 7; public final static long BUILD = 8;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;

View File

@ -618,7 +618,9 @@ public class FIFOBandwidthLimiter {
} }
} }
/** @deprecated not worth translating */
public void renderStatusHTML(Writer out) throws IOException { public void renderStatusHTML(Writer out) throws IOException {
/*******
long now = now(); long now = now();
StringBuilder buf = new StringBuilder(4096); StringBuilder buf = new StringBuilder(4096);
buf.append("<h3><b id=\"bwlim\">Limiter Status:</b></h3>").append(getStatus().toString()).append("\n"); buf.append("<h3><b id=\"bwlim\">Limiter Status:</b></h3>").append(getStatus().toString()).append("\n");
@ -648,6 +650,7 @@ public class FIFOBandwidthLimiter {
buf.append("</ol></li></ul><hr>\n"); buf.append("</ol></li></ul><hr>\n");
out.write(buf.toString()); out.write(buf.toString());
out.flush(); out.flush();
******/
} }
private static long __requestId = 0; private static long __requestId = 0;

View File

@ -454,7 +454,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
/** warning - slow */ /** warning - slow */
public String renderStatusHTML() { public String renderStatusHTML() {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append("<a name=\"upnp\"></a><b>UPnP Status:</b><br>"); sb.append("<h3><a name=\"upnp\"></a>UPnP Status</h3>");
if(isDisabled) { if(isDisabled) {
sb.append("UPnP has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?"); sb.append("UPnP has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?");

View File

@ -156,7 +156,7 @@ public class UPnPManager {
public String renderStatusHTML() { public String renderStatusHTML() {
if (!_isRunning) if (!_isRunning)
return "<a name=\"upnp\"></a><b>UPnP is not enabled</b>\n"; return "<h3><a name=\"upnp\"></a>UPnP is not enabled</h3>\n";
return _upnp.renderStatusHTML(); return _upnp.renderStatusHTML();
} }
} }