Author: toad
Date: 2008-01-18 20:07:05 +0000 (Fri, 18 Jan 2008)
New Revision: 17154
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
indent
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-01-18
17:11:00 UTC (rev 17153)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-01-18
20:07:05 UTC (rev 17154)
@@ -599,65 +599,64 @@
// FIXME how to change these on the fly when the interface
language is changed?
- HighLevelSimpleClient client =
core.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, true);
-
- random = new byte[32];
- core.random.nextBytes(random);
- FProxyToadlet fproxy = new FProxyToadlet(client, core);
- core.setFProxy(fproxy);
- server.register(fproxy, "/", false,
"FProxyToadlet.welcomeTitle", "FProxyToadlet.welcome", false, null);
-
- PproxyToadlet pproxy = new PproxyToadlet(client, node,
core);
- server.register(pproxy, "/plugins/", true,
"FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
-
- WelcomeToadlet welcometoadlet = new
WelcomeToadlet(client, core, node);
- server.register(welcometoadlet, "/welcome/", true,
false);
-
- PluginToadlet pluginToadlet = new PluginToadlet(client,
node.pluginManager2, core);
- server.register(pluginToadlet, "/plugin/", true, true);
-
- ConfigToadlet configtoadlet = new ConfigToadlet(client,
config, node, core);
- server.register(configtoadlet, "/config/", true,
"FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
-
- SymlinkerToadlet symlinkToadlet = new
SymlinkerToadlet(client, node);
- server.register(symlinkToadlet, "/sl/", true, false);
-
- DarknetConnectionsToadlet friendsToadlet = new
DarknetConnectionsToadlet(node, core, client);
-// server.register(friendsToadlet, "/darknet/", true,
l10n("friendsTitle"), l10n("friends"), true);
- server.register(friendsToadlet, "/friends/", true,
"FProxyToadlet.friendsTitle", "FProxyToadlet.friends", true, null);
-
- OpennetConnectionsToadlet opennetToadlet = new
OpennetConnectionsToadlet(node, core, client);
-// server.register(opennetToadlet, "/opennet/", true,
l10n("opennetTitle"), l10n("opennet"), true, opennetToadlet);
- server.register(opennetToadlet, "/strangers/", true,
"FProxyToadlet.opennetTitle", "FProxyToadlet.opennet", true, opennetToadlet);
-
- N2NTMToadlet n2ntmToadlet = new N2NTMToadlet(node,
core, client);
- server.register(n2ntmToadlet, "/send_n2ntm/", true,
true);
-
- QueueToadlet queueToadlet = new QueueToadlet(core,
core.getFCPServer(), client);
- server.register(queueToadlet, "/queue/", true,
"FProxyToadlet.queueTitle", "FProxyToadlet.queue", false, null);
-
- StatisticsToadlet statisticsToadlet = new
StatisticsToadlet(node, core, client);
- server.register(statisticsToadlet, "/stats/", true,
"FProxyToadlet.statsTitle", "FProxyToadlet.stats", true, null);
-
- LocalFileInsertToadlet localFileInsertToadlet = new
LocalFileInsertToadlet(core, client);
- server.register(localFileInsertToadlet, "/files/",
true, false);
-
- BookmarkEditorToadlet bookmarkEditorToadlet = new
BookmarkEditorToadlet(client, core);
- server.register(bookmarkEditorToadlet,
"/bookmarkEditor/", true, false);
-
- BrowserTestToadlet browsertTestToadlet = new
BrowserTestToadlet(client, core);
- server.register(browsertTestToadlet, "/test/", true,
false);
-
- ConnectivityToadlet connectivityToadlet = new
ConnectivityToadlet(client, node, core);
- server.register(connectivityToadlet, "/connectivity/",
true, "ConnectivityToadlet.connectivityTitle",
"ConnectivityToadlet.connectivity", true, null);
-
- TranslationToadlet translationToadlet = new
TranslationToadlet(client, core);
- server.register(translationToadlet,
TranslationToadlet.TOADLET_URL, true, true);
-
- FirstTimeWizardToadlet firstTimeWizardToadlet = new
FirstTimeWizardToadlet(client, node, core);
- server.register(firstTimeWizardToadlet,
FirstTimeWizardToadlet.TOADLET_URL, true, false);
-
+ HighLevelSimpleClient client =
core.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, true);
+ random = new byte[32];
+ core.random.nextBytes(random);
+ FProxyToadlet fproxy = new FProxyToadlet(client, core);
+ core.setFProxy(fproxy);
+ server.register(fproxy, "/", false,
"FProxyToadlet.welcomeTitle", "FProxyToadlet.welcome", false, null);
+
+ PproxyToadlet pproxy = new PproxyToadlet(client, node, core);
+ server.register(pproxy, "/plugins/", true,
"FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
+
+ WelcomeToadlet welcometoadlet = new WelcomeToadlet(client,
core, node);
+ server.register(welcometoadlet, "/welcome/", true, false);
+
+ PluginToadlet pluginToadlet = new PluginToadlet(client,
node.pluginManager2, core);
+ server.register(pluginToadlet, "/plugin/", true, true);
+
+ ConfigToadlet configtoadlet = new ConfigToadlet(client, config,
node, core);
+ server.register(configtoadlet, "/config/", true,
"FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
+
+ SymlinkerToadlet symlinkToadlet = new SymlinkerToadlet(client,
node);
+ server.register(symlinkToadlet, "/sl/", true, false);
+
+ DarknetConnectionsToadlet friendsToadlet = new
DarknetConnectionsToadlet(node, core, client);
+// server.register(friendsToadlet, "/darknet/", true,
l10n("friendsTitle"), l10n("friends"), true);
+ server.register(friendsToadlet, "/friends/", true,
"FProxyToadlet.friendsTitle", "FProxyToadlet.friends", true, null);
+
+ OpennetConnectionsToadlet opennetToadlet = new
OpennetConnectionsToadlet(node, core, client);
+// server.register(opennetToadlet, "/opennet/", true,
l10n("opennetTitle"), l10n("opennet"), true, opennetToadlet);
+ server.register(opennetToadlet, "/strangers/", true,
"FProxyToadlet.opennetTitle", "FProxyToadlet.opennet", true, opennetToadlet);
+
+ N2NTMToadlet n2ntmToadlet = new N2NTMToadlet(node, core,
client);
+ server.register(n2ntmToadlet, "/send_n2ntm/", true, true);
+
+ QueueToadlet queueToadlet = new QueueToadlet(core,
core.getFCPServer(), client);
+ server.register(queueToadlet, "/queue/", true,
"FProxyToadlet.queueTitle", "FProxyToadlet.queue", false, null);
+
+ StatisticsToadlet statisticsToadlet = new
StatisticsToadlet(node, core, client);
+ server.register(statisticsToadlet, "/stats/", true,
"FProxyToadlet.statsTitle", "FProxyToadlet.stats", true, null);
+
+ LocalFileInsertToadlet localFileInsertToadlet = new
LocalFileInsertToadlet(core, client);
+ server.register(localFileInsertToadlet, "/files/", true, false);
+
+ BookmarkEditorToadlet bookmarkEditorToadlet = new
BookmarkEditorToadlet(client, core);
+ server.register(bookmarkEditorToadlet, "/bookmarkEditor/",
true, false);
+
+ BrowserTestToadlet browsertTestToadlet = new
BrowserTestToadlet(client, core);
+ server.register(browsertTestToadlet, "/test/", true, false);
+
+ ConnectivityToadlet connectivityToadlet = new
ConnectivityToadlet(client, node, core);
+ server.register(connectivityToadlet, "/connectivity/", true,
"ConnectivityToadlet.connectivityTitle", "ConnectivityToadlet.connectivity",
true, null);
+
+ TranslationToadlet translationToadlet = new
TranslationToadlet(client, core);
+ server.register(translationToadlet,
TranslationToadlet.TOADLET_URL, true, true);
+
+ FirstTimeWizardToadlet firstTimeWizardToadlet = new
FirstTimeWizardToadlet(client, node, core);
+ server.register(firstTimeWizardToadlet,
FirstTimeWizardToadlet.TOADLET_URL, true, false);
+
fproxyConfig.finishedInitialization();
return server; // caller must start server
