echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Console:

Browse Source 
- Disable zh translation in graphs on windows due to font issues
      - Fix NPE at startup
      - Graph tweaks
This commit is contained in:
zzz
2011-05-23 19:22:33 +00:00
parent 6e4df8830a
commit 592361b1a4
8 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
View File

@ -34,6 +34,7 @@ class SummaryRenderer {
private final Log _log;
private final SummaryListener _listener;
private final I2PAppContext _context;
static final Color RESTART_BAR_COLOR = new Color(255, 144, 0, 224);
public SummaryRenderer(I2PAppContext ctx, SummaryListener lsnr) {
_log = ctx.logManager().getLog(SummaryRenderer.class);
@ -101,9 +102,9 @@ class SummaryRenderer {
String title;
String p;
// we want the formatting and translation of formatDuration2(), except not zh, and not the  
//if ("zh".equals(Messages.getLanguage(_context)))
// p = DataHelper.formatDuration(_listener.getRate().getPeriod());
//else
if (IS_WIN && "zh".equals(Messages.getLanguage(_context)))
p = DataHelper.formatDuration(_listener.getRate().getPeriod());
else
p = DataHelper.formatDuration2(_listener.getRate().getPeriod()).replace(" ", " ");
if (showEvents)
title = name + ' ' + _("events in {0}", p);
@ -130,7 +131,7 @@ class SummaryRenderer {
}
long started = ((RouterContext)_context).router().getWhenStarted();
if (started > start && started < end)
def.vrule(started / 1000, Color.BLACK, _("Restart"), 4.0f);
def.vrule(started / 1000, RESTART_BAR_COLOR, _("Restart"), 4.0f);
def.datasource(plotName, path, plotName, SummaryListener.CF, _listener.getBackendName());
if (descr.length() > 0)
def.area(plotName, Color.BLUE, descr + "\\r");
@ -190,12 +191,14 @@ class SummaryRenderer {
}
}
private static final boolean IS_WIN = System.getProperty("os.name").startsWith("Win");
/** translate a string */
private String _(String s) {
// the RRD font doesn't have zh chars, at least on my system
// Works on 1.5.9
//if ("zh".equals(Messages.getLanguage(_context)))
// return s;
// Works on 1.5.9 except on windows
if (IS_WIN && "zh".equals(Messages.getLanguage(_context)))
return s;
return Messages.getString(s, _context);
}
@ -204,9 +207,9 @@ class SummaryRenderer {
*/
private String _(String s, String o) {
// the RRD font doesn't have zh chars, at least on my system
// Works on 1.5.9
//if ("zh".equals(Messages.getLanguage(_context)))
// return s.replace("{0}", o);
// Works on 1.5.9 except on windows
if (IS_WIN && "zh".equals(Messages.getLanguage(_context)))
return s.replace("{0}", o);
return Messages.getString(s, o, _context);
}
}