From 3a7ee4f2115fd06f846274f530d878bbd20599df Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 2 Dec 2019 15:25:10 +0000
Subject: [PATCH] Console: Move restart status up in summary bar Process
 restart status first regardless of display order

---
 .../router/web/helpers/SummaryBarRenderer.java | 18 +++++++-----------
 .../i2p/router/web/helpers/SummaryHelper.java  |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
index ce5bfc4b7..4e49c6813 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
@@ -77,17 +77,13 @@ class SummaryBarRenderer {
         String requestURI = _helper.getRequestURI();
         String page = requestURI.replace("/", "").replace(".jsp", "");
         List<String> sections = _helper.getSummaryBarSections(page);
-        StringBuilder buf = new StringBuilder(8*1024);
+
+        // regardless of section order, we want to process the restart buttons first,
+        // so other sections reflect the current restart state
+        String restartStatus = sections.contains("RestartStatus") ? renderRestartStatusHTML() : null;
+
+        StringBuilder buf = new StringBuilder(1024);
         for (String section : sections) {
-            // Commented out because broken. Replaced by if-elseif blob below.
-            /*try {
-                String section = (String)ALL_SECTIONS.get(sections[i]).invoke(this);
-                if (section != null && section != "") {
-                    out.write("<hr>" + i + "<hr>\n" + section);
-                }
-            } catch (Exception e) {
-                out.write("<hr>" +i + " - Exception<hr>\n" + e);
-            }*/
             buf.setLength(0);
 
             buf.append("<hr>\n");
@@ -112,7 +108,7 @@ class SummaryBarRenderer {
             else if ("UpdateStatus".equals(section))
                 buf.append(renderUpdateStatusHTML());
             else if ("RestartStatus".equals(section))
-                buf.append(renderRestartStatusHTML());
+                buf.append(restartStatus); // prerendered above
             else if ("Peers".equals(section))
                 buf.append(renderPeersHTML());
             else if ("PeersAdvanced".equals(section))
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
index b9a65be8f..3698c8961 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
@@ -59,9 +59,9 @@ public class SummaryHelper extends HelperBase {
         "I2PInternals" + S +
         "HelpAndFAQ" + S +
         "Peers" + S +
+        "RestartStatus" + S +
         "Tunnels" + S +
         "TunnelStatus" + S +
-        "RestartStatus" + S +
         "Destinations" + S +
         "";
 
@@ -76,10 +76,10 @@ public class SummaryHelper extends HelperBase {
         "I2PInternals" + S +
         "Advanced" + S +
         "Peers" + S +
+        "RestartStatus" + S +
         "Tunnels" + S +
         "TunnelStatus" + S +
         "Congestion" + S +
-        "RestartStatus" + S +
         "Destinations" + S +
         "";