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 7681196748e30bdfd9646f8bfce4ab76865ddd87..e87567796b80f6173a0f0ac4233dc72a79ead463 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -1,5 +1,6 @@ package net.i2p.router.web; +import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,6 +37,7 @@ public abstract class FormHandler { private final List<String> _notices; private boolean _processed; private boolean _valid; + protected Writer _out; public FormHandler() { _errors = new ArrayList<String>(); @@ -110,6 +112,11 @@ public abstract class FormHandler { */ public void storeMethod(String val) { _method = val; } + /** + * @since 0.9.38 + */ + public void storeWriter(Writer out) { _out = out; } + /** * The old nonces from the session * @since 0.9.4 @@ -120,11 +127,11 @@ public abstract class FormHandler { } /** - * Override this to perform the final processing (in turn, adding formNotice + * Implement this to perform the final processing (in turn, adding formNotice * and formError messages, etc) * */ - protected void processForm() {} + protected abstract void processForm(); /** * Add an error message to display 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 e7c0e43124dc03e6783ced0a25f41282b82c593d..2f67328c245713905d3432853a00d49c9e89211e 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 @@ -1,7 +1,6 @@ package net.i2p.router.web.helpers; import java.io.IOException; -import java.io.Writer; import java.text.Collator; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -24,7 +23,6 @@ import net.i2p.util.SystemVersion; * /events.jsp */ public class EventLogHelper extends FormHandler { - protected Writer _out; private long _from, _age; //private long _to = Long.MAX_VALUE; private String _event = ALL; @@ -63,6 +61,8 @@ public class EventLogHelper extends FormHandler { _xevents = new HashMap<String, String>(1 + (_events.length / 2)); } + protected void processForm() {} + /** set the defaults after we have a context */ @Override public void setContextId(String contextId) { @@ -72,8 +72,6 @@ public class EventLogHelper extends FormHandler { } } - public void storeWriter(Writer out) { _out = out; } - public void setFrom(String s) { try { _age = Long.parseLong(s); 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 848e8d113442caff7963e090f3f293e7c7bd3c1d..d486050fd2b099a77a89201a1e03d63343a7c2de 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 @@ -2,7 +2,6 @@ package net.i2p.router.web.helpers; import java.io.IOException; import java.io.Serializable; -import java.io.Writer; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; @@ -25,7 +24,6 @@ import net.i2p.stat.Rate; * /graphs.jsp, including form, and /graph.jsp */ public class GraphHelper extends FormHandler { - protected Writer _out; private int _periodCount; private boolean _showEvents; private int _width; @@ -74,12 +72,6 @@ public class GraphHelper extends FormHandler { return "<meta http-equiv=\"refresh\" content=\"" + (_refreshDelaySeconds - 3) + "\">"; } - /** - * This was a HelperBase but now it's a FormHandler - * @since 0.8.2 - */ - public void storeWriter(Writer out) { _out = out; } - public void setPeriodCount(String str) { setC(str); }