Author: j16sdiz
Date: 2008-11-06 05:17:19 +0000 (Thu, 06 Nov 2008)
New Revision: 23332
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
trunk/freenet/src/freenet/clients/http/Toadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
javadoc, generic, Boolean.equals()
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-11-06 05:16:52 UTC (rev 23331)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-11-06 05:17:19 UTC (rev 23332)
@@ -346,7 +346,7 @@
@Override
public void set(Boolean val) throws
InvalidConfigValueException, NodeNeedRestartException {
- if(val == get()) return;
+ if(get().equals(val)) return;
fproxyHasCompletedWizard = val;
}
});
Modified: trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
2008-11-06 05:16:52 UTC (rev 23331)
+++ trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
2008-11-06 05:17:19 UTC (rev 23332)
@@ -4,7 +4,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map;
import freenet.client.HighLevelSimpleClient;
import freenet.config.InvalidConfigValueException;
@@ -15,9 +15,13 @@
import freenet.support.api.HTTPRequest;
import freenet.support.api.StringArrCallback;
-public class SymlinkerToadlet extends Toadlet {
-
- private final HashMap linkMap = new HashMap();
+/**
+ * Symlinker Toadlet
+ *
+ * Provide alias to other toadlet URLs by throwing {@link RedirectException}.
+ */
+public class SymlinkerToadlet extends Toadlet {
+ private final HashMap<String, String> linkMap = new HashMap<String,
String>();
private final Node node;
SubConfig tslconfig;
@@ -46,8 +50,8 @@
String fns[] = tslconfig.getStringArr("symlinks");
if (fns != null) {
- for (int i = 0 ; i < fns.length ; i++) {
- String tuple[] = fns[i].split("#");
+ for (String fn : fns) {
+ String tuple[] = fn.split("#");
if (tuple.length == 2)
addLink(tuple[0], tuple[1], false);
}
@@ -90,11 +94,9 @@
private String[] getConfigLoadString() {
String retarr[] = new String[linkMap.size()];
synchronized (linkMap) {
- Iterator it = linkMap.keySet().iterator();
int i = 0;
- while(it.hasNext()) {
- String key = (String)it.next();
- retarr[i++] = key + '#' + linkMap.get(key);
+ for (Map.Entry<String,String> entry :
linkMap.entrySet()) {
+ retarr[i++] = entry.getKey() + '#' +
entry.getValue();
}
}
return retarr;
@@ -112,12 +114,11 @@
String foundkey = null;
String foundtarget = null;
synchronized (linkMap) {
- Iterator it = linkMap.keySet().iterator();
- while (it.hasNext()) {
- String key = (String)it.next();
+ for (Map.Entry<String,String> entry :
linkMap.entrySet()) {
+ String key = entry.getKey();
if (path.startsWith(key)) {
foundkey = key;
- foundtarget = (String)linkMap.get(key);
+ foundtarget = entry.getValue();
}
}
}
Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Toadlet.java 2008-11-06 05:16:52 UTC
(rev 23331)
+++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2008-11-06 05:17:19 UTC
(rev 23332)
@@ -38,6 +38,8 @@
* the fetch on another (or this) thread. With no need to change any
* APIs, and no danger of exploding memory use (unlike the traditional
* NIO servlets approach).
+ *
+ * FIXME Investigate servlet 3.0, which support continuations.
*/
public abstract class Toadlet {
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-06
05:16:52 UTC (rev 23331)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-06
05:17:19 UTC (rev 23332)
@@ -389,8 +389,8 @@
String alertsToDump = request.getPartAsString("events",
Integer.MAX_VALUE);
String[] alertAnchors = alertsToDump.split(",");
- HashSet toDump = new HashSet();
- for(int i=0;i<alertAnchors.length;i++)
toDump.add(alertAnchors[i]);
+ HashSet<String> toDump = new HashSet<String>();
+ for(String alertAnchor : alertAnchors) toDump.add(alertAnchor);
core.alerts.dumpEvents(toDump);
redirectToRoot(ctx);
} else {
@@ -536,7 +536,7 @@
testnetContent.addChild("#", l10n("testnetWarning"));
}
- String useragent = (String) ctx.getHeaders().get("user-agent");
+ String useragent = ctx.getHeaders().get("user-agent");
if (useragent != null) {
useragent = useragent.toLowerCase();
