From fa0b52fc3a441e13f3e442369ade4dbcc9e67694 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 17 Jun 2013 19:43:32 +0000
Subject: [PATCH] * Console: Don't display 'unsupported' message on some
config pages when restart/shutdown buttons clicked
---
.../java/src/net/i2p/router/web/ConfigClientsHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigHomeHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigKeyringHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigPeerHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigReseedHandler.java | 2 +-
.../java/src/net/i2p/router/web/ConfigRestartBean.java | 1 +
.../java/src/net/i2p/router/web/ConfigSummaryHandler.java | 2 +-
apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
index a958508507..29cb400984 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
@@ -168,7 +168,7 @@ public class ConfigClientsHandler extends FormHandler {
startWebApp(app);
}
} else {
- addFormError(_("Unsupported") + ' ' + _action + '.');
+ //addFormError(_("Unsupported") + ' ' + _action + '.');
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java
index c8b3d0e745..7828df6cd6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java
@@ -99,7 +99,7 @@ public class ConfigHomeHandler extends FormHandler {
}
HomeHelper.saveApps(_context, prop, apps, !("3".equals(group)));
} else {
- addFormError(_("Unsupported"));
+ //addFormError(_("Unsupported"));
}
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java
index 38f7d4b41a..97b8cb3a64 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java
@@ -46,7 +46,7 @@ public class ConfigKeyringHandler extends FormHandler {
}
}
} else {
- addFormError(_("Unsupported"));
+ //addFormError(_("Unsupported"));
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java
index 350bae0492..e9af122f11 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java
@@ -60,7 +60,7 @@ public class ConfigPeerHandler extends FormHandler {
} else if (_action.startsWith("Check")) {
addFormError(_("Unsupported"));
} else {
- addFormError("Unknown action \"" + _action + '"');
+ //addFormError(_("Unsupported") + ' ' + _action + '.');
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
index 09f7a89343..917d0fc02d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
@@ -31,7 +31,7 @@ public class ConfigReseedHandler extends FormHandler {
saveChanges();
return;
}
- addFormError(_("Unsupported") + ' ' + _action + '.');
+ //addFormError(_("Unsupported") + ' ' + _action + '.');
}
/** @since 0.8.9 */
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
index 836d07ea36..b70edf8bc0 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
@@ -25,6 +25,7 @@ public class ConfigRestartBean {
return _systemNonce;
}
+ /** this also initiates the restart/shutdown based on action */
public static String renderStatus(String urlBase, String action, String nonce) {
RouterContext ctx = ContextHelper.getContext(null);
String systemNonce = getNonce();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigSummaryHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigSummaryHandler.java
index 9965f63c30..5ecb020252 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigSummaryHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigSummaryHandler.java
@@ -137,7 +137,7 @@ public class ConfigSummaryHandler extends FormHandler {
addFormNotice(_("Saved order of sections.") + " " +
_("Summary bar will refresh shortly."));
} else {
- addFormError(_("Unsupported"));
+ //addFormError(_("Unsupported"));
}
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
index ebd1adc07e..1ecf73d941 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -17,7 +17,7 @@ import net.i2p.util.Log;
* property is retrieved - either getAll(), getNotices() or getErrors().
*
*/
-public class FormHandler {
+public abstract class FormHandler {
protected RouterContext _context;
protected Log _log;
protected Map _settings;
--
GitLab