From 413eb7d0eb7de35c6166657d35892a8f807de152 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 23 Oct 2019 11:16:02 +0000 Subject: [PATCH] Console: Consolidate 'selected' strings --- .../java/src/net/i2p/router/web/ConfigUpdateHelper.java | 8 ++++---- .../java/src/net/i2p/router/web/HelperBase.java | 1 + .../net/i2p/router/web/helpers/ConfigLoggingHelper.java | 2 +- .../src/net/i2p/router/web/helpers/ConfigNetHelper.java | 2 +- .../net/i2p/router/web/helpers/ConfigTunnelsHelper.java | 2 +- .../src/net/i2p/router/web/helpers/EventLogHelper.java | 5 +++-- .../java/src/net/i2p/router/web/helpers/GraphHelper.java | 2 +- .../java/src/net/i2p/router/web/helpers/SearchHelper.java | 2 +- .../src/net/i2p/router/web/helpers/SybilRenderer.java | 6 +++--- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index e101659ff..8b1eea884 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -120,7 +120,7 @@ public class ConfigUpdateHelper extends HelperBase { for (int i = 0; i < PERIODS.length; i++) { buf.append("\n"); @@ -142,14 +142,14 @@ public class ConfigUpdateHelper extends HelperBase { buf.append(""); buf.append(""); if (_context.hasWrapper()) { @@ -157,7 +157,7 @@ public class ConfigUpdateHelper extends HelperBase { if (_dontInstall) buf.append(" disabled=\"disabled\""); else if ("install".equals(policy)) - buf.append(" selected=\"selected\""); + buf.append(SELECTED); buf.append('>').append(_t("Download, verify, and restart")).append(""); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java index 60a2b2893..b0e4634f4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java @@ -15,6 +15,7 @@ public abstract class HelperBase { public static final String PROP_ADVANCED = "routerconsole.advanced"; /** @since public since 0.9.33, was package private */ public static final String CHECKED = " checked=\"checked\" "; + /** @since 0.9.43 */ public static final String SELECTED = " selected=\"selected\" "; /** diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java index e8415fe77..de816af32 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java @@ -82,7 +82,7 @@ public class ConfigLoggingHelper extends HelperBase { String l = levels[i]; buf.append("\n"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java index 6cd435303..f2e6b9492 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHelper.java @@ -358,7 +358,7 @@ public class ConfigNetHelper extends HelperBase { } buf.append("\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java index 8ccf2aa4e..b7670bbc5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java @@ -226,7 +226,7 @@ public class ConfigTunnelsHelper extends HelperBase { for (int i = min; i <= max; i++) { buf.append("\n"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java index 0632f6cfd..ae2844f34 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java @@ -14,6 +14,7 @@ import net.i2p.data.DataHelper; import net.i2p.router.util.EventLog; import net.i2p.router.web.CSSHelper; import net.i2p.router.web.FormHandler; +import net.i2p.router.web.HelperBase; import net.i2p.util.SystemVersion; /** @@ -128,7 +129,7 @@ public class EventLogHelper extends FormHandler { _out.write(val); _out.write("\""); if (val.equals(_event)) - _out.write(" selected=\"selected\""); + _out.write(HelperBase.SELECTED); _out.write(">"); _out.write(key); _out.write("\n"); @@ -139,7 +140,7 @@ public class EventLogHelper extends FormHandler { _out.write(Long.toString(age)); _out.write("\""); if (age == _age) - _out.write(" selected=\"selected\""); + _out.write(HelperBase.SELECTED); _out.write(">"); if (age == 0) _out.write(_t("All events")); 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 0ba4afeb6..403713b20 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 @@ -398,7 +398,7 @@ public class GraphHelper extends FormHandler { _out.write(Integer.toString(times[i])); _out.write('"'); if (times[i] == _refreshDelaySeconds) - _out.write(" selected=\"selected\""); + _out.write(HelperBase.SELECTED); _out.write('>'); if (times[i] > 0) _out.write(DataHelper.formatDuration2(times[i] * 1000)); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SearchHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SearchHelper.java index 63a80d096..8ce2b245b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SearchHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SearchHelper.java @@ -78,7 +78,7 @@ public class SearchHelper extends HelperBase { for (String name : _engines.keySet()) { buf.append("\n"); } buf.append("\n"); 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 ae9ffafaa..fe3dcd303 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 @@ -260,7 +260,7 @@ public class SybilRenderer { for (Long date : dates) { buf.append("\n"); @@ -309,7 +309,7 @@ public class SybilRenderer { buf.append('"'); long time = HOURS[i] * 60*60*1000L; if (time == freq) - buf.append(" selected=\"selected\""); + buf.append(HelperBase.SELECTED); buf.append('>'); if (HOURS[i] > 0) buf.append(DataHelper.formatDuration2(time)); @@ -340,7 +340,7 @@ public class SybilRenderer { buf.append('"'); long time = DAYS[i] * 24*60*60*1000L; if (time == age) - buf.append(" selected=\"selected\""); + buf.append(HelperBase.SELECTED); buf.append('>'); if (DAYS[i] > 0) buf.append(DataHelper.formatDuration2(time));