Author: j16sdiz
Date: 2008-10-07 06:10:18 +0000 (Tue, 07 Oct 2008)
New Revision: 22957
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
Log:
comment & rearrange
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-10-07 06:09:57 UTC (rev 22956)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-10-07 06:10:18 UTC (rev 22957)
@@ -53,7 +53,8 @@
* Provide a HTTP server for FProxy
*/
public final class SimpleToadletServer implements ToadletContainer, Runnable {
-
+ /** List of urlPrefix / Toadlet */
+ private final LinkedList<ToadletElement> toadlets;
private static class ToadletElement {
public ToadletElement(Toadlet t2, String urlPrefix) {
t = t2;
@@ -63,31 +64,41 @@
String prefix;
}
+ // Socket / Binding
private final int port;
private String bindTo;
private String allowedHosts;
+ private NetworkInterface networkInterface;
+ private boolean ssl = false;
+ public static final int DEFAULT_FPROXY_PORT = 8888;
+
+ // ACL
private final AllowedHosts allowedFullAccess;
- private BucketFactory bf;
- private NetworkInterface networkInterface;
- private final LinkedList<ToadletElement> toadlets;
+
+ // Theme
private THEME cssTheme;
private File cssOverride;
- private Thread myThread;
private boolean advancedModeEnabled;
- private boolean ssl = false;
- private volatile boolean fProxyJavascriptEnabled;
- private volatile boolean fproxyHasCompletedWizard;
private final PageMaker pageMaker;
+
+ // Control
+ private Thread myThread;
+ private final Executor executor;
+ private BucketFactory bf;
private NodeClientCore core;
- private final Executor executor;
+
+ // HTTP Option
private boolean doRobots;
- public BookmarkManager bookmarkManager;
private boolean enablePersistentConnections;
private boolean enableInlinePrefetch;
- static boolean isPanicButtonToBeShown;
- public static final int DEFAULT_FPROXY_PORT = 8888;
+ // Something does not really belongs to here
+ static boolean isPanicButtonToBeShown; // move
to QueueToadlet ?
+ public BookmarkManager bookmarkManager; // move
to WelcomeToadlet / BookmarkEditorToadlet ?
+ private volatile boolean fProxyJavascriptEnabled; // ugh?
+ private volatile boolean fproxyHasCompletedWizard; // hmmm..
+ // Config Callbacks
private class FProxySSLCallback extends BooleanCallback {
@Override
public Boolean get() {
@@ -162,7 +173,6 @@
}
}
}
-
private class FProxyAllowedHostsCallback extends StringCallback {
@Override
public String get() {
@@ -176,7 +186,6 @@
}
}
}
-
private class FProxyCSSNameCallback extends StringCallback implements
EnumerableOptionCallback {
@Override
public String get() {
@@ -197,7 +206,6 @@
return THEME.possibleValues;
}
}
-
private class FProxyCSSOverrideCallback extends StringCallback {
@Override
public String get() {
@@ -220,7 +228,6 @@
pageMaker.setOverride(cssOverride);
}
}
-
private class FProxyEnabledCallback extends BooleanCallback {
@Override
public Boolean get() {
@@ -247,26 +254,7 @@
myThread.start();
}
}
-
- private boolean haveCalledFProxy = false;
-
- public void createFproxy() {
- synchronized(this) {
- if(haveCalledFProxy) return;
- haveCalledFProxy = true;
- }
- bookmarkManager = new BookmarkManager(core);
- try {
- FProxyToadlet.maybeCreateFProxyEtc(core, core.node,
core.node.config, this, bookmarkManager);
- } catch (IOException e) {
- Logger.error(this, "Could not start fproxy: "+e, e);
- System.err.println("Could not start fproxy:");
- e.printStackTrace();
- }
- }
-
private static class FProxyAdvancedModeEnabledCallback extends
BooleanCallback {
-
private final SimpleToadletServer ts;
FProxyAdvancedModeEnabledCallback(SimpleToadletServer ts){
@@ -285,7 +273,6 @@
ts.enableAdvancedMode(val);
}
}
-
private static class FProxyJavascriptEnabledCallback extends
BooleanCallback {
private final SimpleToadletServer ts;
@@ -307,6 +294,25 @@
}
}
+ private boolean haveCalledFProxy = false;
+
+ public void createFproxy() {
+ synchronized(this) {
+ if(haveCalledFProxy) return;
+ haveCalledFProxy = true;
+ }
+ bookmarkManager = new BookmarkManager(core);
+ try {
+ FProxyToadlet.maybeCreateFProxyEtc(core, core.node,
core.node.config, this, bookmarkManager);
+ } catch (IOException e) {
+ Logger.error(this, "Could not start fproxy: "+e, e);
+ System.err.println("Could not start fproxy:");
+ e.printStackTrace();
+ }
+ }
+
+
+
public synchronized void setCore(NodeClientCore core) {
this.core = core;
}
