[freenet-cvs] r17817 - in trunk/freenet/src/freenet: clients/http node

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 13:57:19 +0000 (Tue, 12 Feb 2008)
New Revision: 17817

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/NodeClientCore.java
Log:
Don't pass config in to FProxyToadlet.maybeCreateFProxyEtc

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-02-12 
13:35:49 UTC (rev 17816)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2008-02-12 
13:57:19 UTC (rev 17817)
@@ -595,7 +595,7 @@
                return f;
        }

-       public static void maybeCreateFProxyEtc(NodeClientCore core, Node node, 
Config config, SubConfig fproxyConfig, SimpleToadletServer server) throws 
IOException, InvalidConfigValueException {
+       public static void maybeCreateFProxyEtc(NodeClientCore core, Node node, 
Config config, SimpleToadletServer server) throws IOException, 
InvalidConfigValueException {

                // FIXME how to change these on the fly when the interface 
language is changed?

@@ -657,7 +657,6 @@
                FirstTimeWizardToadlet firstTimeWizardToadlet = new 
FirstTimeWizardToadlet(client, node, core);
                server.register(firstTimeWizardToadlet, 
FirstTimeWizardToadlet.TOADLET_URL, true, false);

-               fproxyConfig.finishedInitialization();
        }

        /**

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-02-12 13:35:49 UTC (rev 
17816)
+++ trunk/freenet/src/freenet/node/Node.java    2008-02-12 13:57:19 UTC (rev 
17817)
@@ -609,6 +609,7 @@

                try {
                        toadlets = new SimpleToadletServer(fproxyConfig, new 
ArrayBucketFactory(), executor);
+                       fproxyConfig.finishedInitialization();
                        toadlets.start();
                } catch (IOException e4) {
                        Logger.error(this, "Could not start web interface: 
"+e4, e4);

Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2008-02-12 13:35:49 UTC 
(rev 17816)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2008-02-12 13:57:19 UTC 
(rev 17817)
@@ -359,7 +359,7 @@
                        toadletContainer = toadlets;
                        toadletContainer.setCore(this);
                        toadletContainer.setBucketFactory(tempBucketFactory);
-                       FProxyToadlet.maybeCreateFProxyEtc(this, node, config, 
fproxyConfig, toadletContainer);
+                       FProxyToadlet.maybeCreateFProxyEtc(this, node, config, 
toadletContainer);
                        toadletContainer.removeStartupToadlet();
                } catch (IOException e) {
                        e.printStackTrace();