diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java
index 0ee5c0b4f4..fd258828c4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java
@@ -6,7 +6,6 @@ import java.util.TreeMap;
import net.i2p.data.DataHelper;
public class ConfigAdvancedHelper extends HelperBase {
- private final static String CHECKED = " checked=\"checked\" ";
static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant";
public String getSettings() {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index de4e85f8be..69c4dca695 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -64,7 +64,7 @@ public class ConfigClientsHelper extends HelperBase {
if ((mode == 0 && disabled) ||
(mode == 1 && (!disabled) && (!ssl)) ||
(mode == 2 && (!disabled) && ssl))
- return "checked=\"checked\"";
+ return CHECKED;
return "";
}
@@ -72,7 +72,7 @@ public class ConfigClientsHelper extends HelperBase {
public String getAuth() {
boolean enabled = _context.getBooleanProperty(PROP_AUTH);
if (enabled)
- return "checked=\"checked\"";
+ return CHECKED;
return "";
}
@@ -342,7 +342,7 @@ public class ConfigClientsHelper extends HelperBase {
}
buf.append("
").append(_t(theme)).append(" \n");
}
boolean universalTheming = _context.getBooleanProperty(CSSHelper.PROP_UNIVERSAL_THEMING);
buf.append("")
.append(_t("Set theme universally across all apps"))
.append(" \n");
@@ -32,7 +32,7 @@ public class ConfigUIHelper extends HelperBase {
boolean forceMobileConsole = _context.getBooleanProperty(CSSHelper.PROP_FORCE_MOBILE_CONSOLE);
buf.append("")
.append(_t("Force the mobile console to be used"))
.append(" \n");
@@ -138,7 +138,7 @@ public class ConfigUIHelper extends HelperBase {
buf.append("")
.append(" ");
int under = lang.indexOf('_');
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 93644982f8..3b3869025b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
@@ -90,18 +90,14 @@ public class ConfigUpdateHelper extends HelperBase {
}
public String getUpdateUnsigned() {
- if (_context.getBooleanProperty(ConfigUpdateHandler.PROP_UPDATE_UNSIGNED))
- return "";
- else
- return "";
+ return "';
}
/** @since 0.9.20 */
public String getUpdateDevSU3() {
- if (_context.getBooleanProperty(ConfigUpdateHandler.PROP_UPDATE_DEV_SU3))
- return "";
- else
- return "";
+ return "';
}
private static final long PERIODS[] = new long[] { 12*60*60*1000l, 24*60*60*1000l,
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index ab35a104a4..5beb2ba232 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -358,8 +358,8 @@ public class GraphHelper extends FormHandler {
"\n" +
"\n");
_out.write(_t("Periods") + ": \n");
- _out.write(_t("Plot averages") + ": ");
- _out.write(_t("or")+ " " +_t("plot events") + ": \n");
+ _out.write(_t("Plot averages") + ": ");
+ _out.write(_t("or")+ " " +_t("plot events") + ": \n");
_out.write(_t("Image sizes") + ": " + _t("width") + ": " + _t("pixels") + ", " + _t("height") + ": " + _t("pixels") + " \n");
@@ -382,7 +382,7 @@ public class GraphHelper extends FormHandler {
" " +
" ");
} catch (IOException ioe) {
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 4256cba3fc..12e2a173b5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
@@ -12,6 +12,7 @@ public abstract class HelperBase {
protected Writer _out;
static final String PROP_ADVANCED = "routerconsole.advanced";
+ static final String CHECKED = " checked=\"checked\" ";
/**
* Configure this bean to query a particular router context
@@ -43,6 +44,19 @@ public abstract class HelperBase {
*/
public void storeWriter(Writer out) { _out = out; }
+ /**
+ * Is a boolean property set to true?
+ *
+ * @param prop must default to false
+ * @return non-null, either "" or " checked=\"checked\" "
+ * @since 0.9.24 consolidated from various helpers
+ */
+ protected String getChecked(String prop) {
+ if (_context.getBooleanProperty(prop))
+ return CHECKED;
+ return "";
+ }
+
/** translate a string */
public String _t(String s) {
return Messages.getString(s, _context);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 801d5d5ebb..cc6f017a5b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -103,8 +103,7 @@ public class HomeHelper extends HelperBase {
}
public String getConfigHome() {
- boolean oldHome = _context.getBooleanProperty(PROP_OLDHOME);
- return oldHome ? "checked=\"checked\"" : "";
+ return getChecked(PROP_OLDHOME);
}
public String getProxyStatus() {
|