From 6c2d4ded1c915c84fd7938508c1532906ba77fca Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 5 Mar 2012 15:00:52 +0000
Subject: [PATCH] add time interval to graph legends

---
 .../java/src/net/i2p/router/web/StatSummarizer.java    |  5 +++++
 .../java/src/net/i2p/router/web/SummaryRenderer.java   |  5 +++++
 history.txt                                            | 10 ++++++++++
 router/java/src/net/i2p/router/RouterVersion.java      |  2 +-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
index 4d740e4b5b..bbb03d2e8b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
@@ -6,7 +6,9 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -326,6 +328,9 @@ public class StatSummarizer implements Runnable {
                 def.gprint(sendName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r");
                 def.gprint(recvName, SummaryListener.CF, _("In average") + ": %.2f %S" + _("Bps"));
                 def.gprint(recvName, "MAX", ' ' + _("max") + ": %.2f %S" + _("Bps") + "\\r");
+                // '07-Jul 21:09 UTC' with month name in the system locale
+                SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM HH:mm");
+                def.comment(sdf.format(new Date(start)) + " -- " + sdf.format(new Date(end)) + " UTC\\r");
             }
             if (!showCredit)
                 def.setShowSignature(false);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
index 35845f7c7c..a0349aa711 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
@@ -5,6 +5,8 @@ import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageOutputStream;
@@ -149,6 +151,9 @@ class SummaryRenderer {
                 def.gprint(plotName, SummaryListener.CF, _("avg") + ": %.2f %s");
                 def.gprint(plotName, "MAX", ' ' + _("max") + ": %.2f %S");
                 def.gprint(plotName, "LAST", ' ' + _("now") + ": %.2f %S\\r");
+                // '07-Jul 21:09 UTC' with month name in the system locale
+                SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM HH:mm");
+                def.comment(sdf.format(new Date(start)) + " -- " + sdf.format(new Date(end)) + " UTC\\r");
             }
             if (!showCredit)
                 def.setShowSignature(false);
diff --git a/history.txt b/history.txt
index a20ba95e7f..1708a62ced 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,13 @@
+2012-03-05 zzz
+  * Build: Make windows and non-windows installers for release
+  * configclients: Tweaks
+  * Graphs: Add time interval to legend
+  * NetDB: Increase min ff to 250
+  * Plugins: Fix setting webapp classpath on Jetty 6
+  * UDP: Log tweaks
+  * viewstat.jsp: Set Connection: Close to work around Jetty bug
+    http://jira.codehaus.org/browse/JETTY-1346
+
 2012-03-04 zzz
   * Jetty: Upgrade to Jetty 6.1.26, Tomcat 6.0.35, and JSTL 1.2.
     - Supports Servlet 2.5 / JSP 2.1 standards
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5c..4e28a2c8d2 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 = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";