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

Wizard: More test results

Browse Source
This commit is contained in:
zzz
2018-11-15 15:07:17 +00:00
parent dc343b05a2
commit 62c712c462
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHelper.java
View File

@@ -58,7 +58,7 @@ public class WizardHelper extends HelperBase {
if (_listener != null) {
String s = _listener.getSummary();
if (s != null)
s = DataHelper.escapeHTML(s);
rv = DataHelper.escapeHTML(s);
}
return rv;
}
@@ -71,7 +71,7 @@ public class WizardHelper extends HelperBase {
if (_listener != null) {
String s = _listener.getDetail();
if (s != null)
s = DataHelper.escapeHTML(s);
rv = DataHelper.escapeHTML(s);
}
return rv;
}
@@ -90,7 +90,24 @@ public class WizardHelper extends HelperBase {
return getLongResult("down");
}
public synchronized long getLongResult(String key) {
/**
* @return HTML-escaped location or ""
*/
public String getServerLocation() {
StringBuilder buf = new StringBuilder(64);
String s = getStringResult("server_city");
if (s != null)
buf.append(s).append(' ');
s = getStringResult("server_country");
if (s != null)
buf.append(s).append(' ');
s = getStringResult("server_host");
if (s != null)
buf.append(s);
return DataHelper.escapeHTML(buf.toString());
}
private synchronized long getLongResult(String key) {
if (_listener != null) {
Map<String, Object> results = _listener.getResults();
if (results != null) {
@@ -102,6 +119,16 @@ public class WizardHelper extends HelperBase {
return 0;
}
private synchronized String getStringResult(String key) {
if (_listener != null) {
Map<String, Object> results = _listener.getResults();
if (results != null) {
return (String) results.get(key);
}
}
return null;
}
/**
* Start the test. Called from the Handler.
* @return success