[freenet-cvs] r11907 - trunk/freenet/src/freenet/clients/http

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-02-24 20:38:02 +0000 (Sat, 24 Feb 2007)
New Revision: 11907

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
trivial refactoring

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2007-02-24 
19:39:46 UTC (rev 11906)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2007-02-24 
20:38:02 UTC (rev 11907)
@@ -507,7 +507,7 @@
                        PproxyToadlet pproxy = new PproxyToadlet(client, 
node.pluginManager, core);
                        server.register(pproxy, "/plugins/", true, "Plugins", 
"configure and manage plugins");

-                       WelcomeToadlet welcometoadlet = new 
WelcomeToadlet(client, core, node, fproxyConfig);
+                       WelcomeToadlet welcometoadlet = new 
WelcomeToadlet(client, node);
                        server.register(welcometoadlet, "/welcome/", true);

                        PluginToadlet pluginToadlet = new PluginToadlet(client, 
node.pluginManager2, core);

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-02-24 
19:39:46 UTC (rev 11906)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-02-24 
20:38:02 UTC (rev 11907)
@@ -20,7 +20,6 @@
 import freenet.client.InsertBlock;
 import freenet.client.InserterException;
 import freenet.clients.http.filter.GenericReadFilterCallback;
-import freenet.config.SubConfig;
 import freenet.keys.FreenetURI;
 import freenet.node.Node;
 import freenet.node.NodeClientCore;
@@ -42,16 +41,14 @@
        private static final int MAX_URL_LENGTH = 1024 * 1024;
        private static final int MAX_KEY_LENGTH = QueueToadlet.MAX_KEY_LENGTH;
        private static final int MAX_NAME_LENGTH = 1024 * 1024;
-       NodeClientCore core;
-       Node node;
-       SubConfig config;
-       BookmarkManager bookmarks;
+       final NodeClientCore core;
+       final Node node;
+       final BookmarkManager bookmarks;

-       WelcomeToadlet(HighLevelSimpleClient client, NodeClientCore core, Node 
node, SubConfig sc) {
+       WelcomeToadlet(HighLevelSimpleClient client, Node node) {
                super(client);
-               this.core = core;
                this.node = node;
-               this.config = sc;
+               this.core = node.clientCore;
                this.bookmarks = core.bookmarkManager;
                try {
                        manageBookmarksURI = new 
URI("/welcome/?managebookmarks");
@@ -434,7 +431,7 @@

                if(request.isParameterSet("latestlog")) {

-                       FileReader reader = new 
FileReader(config.config.get("logger").getString("dirname") + File.separator + 
"freenet-latest.log");
+                       FileReader reader = new 
FileReader(node.config.get("logger").getString("dirname") + File.separator + 
"freenet-latest.log");

                        StringWriter sw = new StringWriter();
                        char[] buffer = new char[1024];