diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java index c808876332..9b614ef04d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.io.Writer; import java.math.BigInteger; import java.text.Collator; +import java.text.DateFormat; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collection; @@ -45,6 +46,7 @@ import net.i2p.stat.RateStat; import net.i2p.util.ConvertToHash; import net.i2p.util.Log; import net.i2p.util.ObjectCounter; +import net.i2p.util.SystemVersion; import net.i2p.util.Translate; import net.i2p.util.VersionComparator; @@ -225,13 +227,15 @@ public class SybilRenderer { "Select stored analysis: " + "\n" + "" + @@ -247,10 +251,12 @@ public class SybilRenderer { private void renderFFSummary(Writer out, StringBuilder buf, List ris, double avgMinDist) throws IOException { renderRouterInfo(buf, _context.router().getRouterInfo(), null, true, false); buf.append("

Known Floodfills: ").append(ris.size()).append("

"); + DateFormat dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); + dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context)); buf.append("
\n" + "Average closest floodfill distance: ").append(fmt.format(avgMinDist)).append("
\n" + "Routing Data: \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())) - .append("\" Last Changed: ").append(new Date(_context.routerKeyGenerator().getLastChanged())).append("
\n" + + .append("\" Last Changed: ").append(dfmt.format(new Date(_context.routerKeyGenerator().getLastChanged()))).append("
\n" + "Next Routing Data: \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())) .append("\" Rotates in: ").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("\n" + "
\n"); @@ -393,7 +399,9 @@ public class SybilRenderer { List warns = new ArrayList(points.keySet()); Collections.sort(warns, new PointsComparator(points)); ReasonComparator rcomp = new ReasonComparator(); - buf.append("

Routers with Most Threat Points as of " + new Date(date) + "

"); + DateFormat dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); + dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context)); + buf.append("

Routers with Most Threat Points as of " + dfmt.format(new Date(date)) + "

"); for (Hash h : warns) { RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); if (ri == null) @@ -881,8 +889,9 @@ public class SybilRenderer { out.write("

Distance to " + from.toBase64() + "

"); prev = null; final int limit = Math.min(10, sybils.size()); + DateFormat dfmt = DateFormat.getDateInstance(DateFormat.MEDIUM); for (int i = start; i <= days; i++) { - out.write("

Distance for " + new Date(now) + + out.write("

Distance for " + dfmt.format(new Date(now)) + "

\n"); Hash rkey = rkgen.getRoutingKey(from, now); xor = new XORComparator(rkey);
HashDistanceDistance from previous