From 4a211f1bf4499ee46a79e74eee1405eb10581d47 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 19 Jun 2018 17:42:46 +0000
Subject: [PATCH] Console: Don't display individual tx/rx graphs if displaying
 combined graph (ticket #2106)

---
 .../java/src/net/i2p/router/web/helpers/GraphHelper.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
index 30fd9678e..e0222b20d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
 import java.io.Writer;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -164,6 +165,13 @@ public class GraphHelper extends FormHandler {
             boolean hideLegend = _context.getProperty(PROP_LEGEND, DEFAULT_LEGEND);
 
             if (hasTx && hasRx && !_showEvents) {
+                // remove individual tx/rx graphs if displaying combined
+                for (Iterator<SummaryListener> iter = ordered.iterator(); iter.hasNext(); ) {
+                    SummaryListener lsnr = iter.next();
+                    String title = lsnr.getRate().getRateStat().getName();
+                    if (title.equals("bw.sendRate") || title.equals("bw.recvRate"))
+                        iter.remove();
+                }
                 _out.write("<a href=\"graph?stat=bw.combined"
                            + "&amp;c=" + (3 * _periodCount )
                            + "&amp;w=" + (3 * _width)