echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FormHandler: move things around

Browse Source
This commit is contained in:
zzz
2018-12-23 11:08:50 +00:00
parent 2d026d5ae7
commit e122393914
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
View File

@ -1,5 +1,6 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -36,6 +37,7 @@ public abstract class FormHandler {
private final List<String> _notices; private final List<String> _notices;
private boolean _processed; private boolean _processed;
private boolean _valid; private boolean _valid;
protected Writer _out;
public FormHandler() { public FormHandler() {
_errors = new ArrayList<String>(); _errors = new ArrayList<String>();
@ -110,6 +112,11 @@ public abstract class FormHandler {
*/ */
public void storeMethod(String val) { _method = val; } public void storeMethod(String val) { _method = val; }
/**
* @since 0.9.38
*/
public void storeWriter(Writer out) { _out = out; }
/** /**
* The old nonces from the session * The old nonces from the session
* @since 0.9.4 * @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) * and formError messages, etc)
* *
*/ */
protected void processForm() {} protected abstract void processForm();
/** /**
* Add an error message to display * Add an error message to display

6
apps/routerconsole/java/src/net/i2p/router/web/helpers/EventLogHelper.java
View File

@ -1,7 +1,6 @@
package net.i2p.router.web.helpers; package net.i2p.router.web.helpers;
import java.io.IOException; import java.io.IOException;
import java.io.Writer;
import java.text.Collator; import java.text.Collator;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -24,7 +23,6 @@ import net.i2p.util.SystemVersion;
* /events.jsp * /events.jsp
*/ */
public class EventLogHelper extends FormHandler { public class EventLogHelper extends FormHandler {
protected Writer _out;
private long _from, _age; private long _from, _age;
//private long _to = Long.MAX_VALUE; //private long _to = Long.MAX_VALUE;
private String _event = ALL; private String _event = ALL;
@ -63,6 +61,8 @@ public class EventLogHelper extends FormHandler {
_xevents = new HashMap<String, String>(1 + (_events.length / 2)); _xevents = new HashMap<String, String>(1 + (_events.length / 2));
} }
protected void processForm() {}
/** set the defaults after we have a context */ /** set the defaults after we have a context */
@Override @Override
public void setContextId(String contextId) { 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) { public void setFrom(String s) {
try { try {
_age = Long.parseLong(s); _age = Long.parseLong(s);

8
apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
View File

@ -2,7 +2,6 @@ package net.i2p.router.web.helpers;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.Writer;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -25,7 +24,6 @@ import net.i2p.stat.Rate;
* /graphs.jsp, including form, and /graph.jsp * /graphs.jsp, including form, and /graph.jsp
*/ */
public class GraphHelper extends FormHandler { public class GraphHelper extends FormHandler {
protected Writer _out;
private int _periodCount; private int _periodCount;
private boolean _showEvents; private boolean _showEvents;
private int _width; private int _width;
@ -74,12 +72,6 @@ public class GraphHelper extends FormHandler {
return "<meta http-equiv=\"refresh\" content=\"" + (_refreshDelaySeconds - 3) + "\">"; 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) { public void setPeriodCount(String str) {
setC(str); setC(str);
} }