From aad80eb2a319ee5c46c3a3ff047321f264514aea Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 23 Dec 2018 13:38:54 +0000
Subject: [PATCH] Console: _action cannot be null in processForm() GraphHelper
 minor cleanup

---
 .../java/src/net/i2p/router/web/ConfigServiceHandler.java     | 2 --
 .../java/src/net/i2p/router/web/ConfigUpdateHandler.java      | 2 --
 .../java/src/net/i2p/router/web/FormHandler.java              | 1 +
 .../src/net/i2p/router/web/helpers/ConfigHomeHandler.java     | 1 -
 .../src/net/i2p/router/web/helpers/ConfigKeyringHandler.java  | 1 -
 .../src/net/i2p/router/web/helpers/ConfigSummaryHandler.java  | 1 -
 .../java/src/net/i2p/router/web/helpers/GraphHelper.java      | 4 ++--
 .../java/src/net/i2p/router/web/helpers/WizardHandler.java    | 2 --
 8 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 857d16cb5..55e42b471 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -228,8 +228,6 @@ public class ConfigServiceHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null) return;
-        
         if (_t("Shutdown gracefully").equals(_action)) {
             if (_context.hasWrapper())
                 registerWrapperNotifier(Router.EXIT_GRACEFUL, false);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
index 85b043104..a1e9c0261 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
@@ -157,8 +157,6 @@ public class ConfigUpdateHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null)
-            return;
         if (_action.equals(_t("Check for updates"))) {
             ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
             if (mgr == null) {
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 e87567796..7be5a8e42 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -130,6 +130,7 @@ public abstract class FormHandler {
      * Implement this to perform the final processing (in turn, adding formNotice
      * and formError messages, etc)
      *
+     * Will only be called if _action is non-null and the nonce is valid.
      */
     protected abstract void processForm();
     
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
index 3a71f11ea..eb0c7f74d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
@@ -18,7 +18,6 @@ public class ConfigHomeHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null) return;
         String group = getJettyString("group");
         boolean deleting = _action.equals(_t("Delete selected"));
         boolean adding = _action.equals(_t("Add item"));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
index 6cfa3885a..c731770cd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
@@ -15,7 +15,6 @@ public class ConfigKeyringHandler extends FormHandler {
     
     @Override
     protected void processForm() {
-        if (_action == null) return;
         boolean adding = _action.equals(_t("Add key"));
         if (adding || _action.equals(_t("Delete key"))) {
             if (_peer == null)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
index bfe2fb87a..073a55fea 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
@@ -20,7 +20,6 @@ public class ConfigSummaryHandler extends FormHandler {
     
     @Override
     protected void processForm() {
-        if (_action == null) return;
         String group = getJettyString("group");
         boolean deleting = _action.equals(_t("Delete selected"));
         boolean adding = _action.equals(_t("Add item"));
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 d486050fd..69dd7fe32 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
@@ -395,10 +395,10 @@ public class GraphHelper extends FormHandler {
             for (int i = 0; i < times.length; i++) {
                 _out.write("<option value=\"");
                 _out.write(Integer.toString(times[i]));
-                _out.write("\"");
+                _out.write('"');
                 if (times[i] == _refreshDelaySeconds)
                     _out.write(" selected=\"selected\"");
-                _out.write(">");
+                _out.write('>');
                 if (times[i] > 0)
                     _out.write(DataHelper.formatDuration2(times[i] * 1000));
                 else
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
index 8a0feb7ae..16a9fcc7d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
@@ -28,8 +28,6 @@ public class WizardHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null)
-            return;
         if (getJettyString("cancelbw") != null) {
             cancelNDT();
             for (int i = 0; i < 20 && !_helper.isNDTComplete(); i++) {