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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-26 10:54:41 +0000 (Thu, 26 Apr 2007)
New Revision: 12970

Modified:
   trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
Trivial refactoring, imports, dead code removal

Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java   
2007-04-25 23:15:19 UTC (rev 12969)
+++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java   
2007-04-26 10:54:41 UTC (rev 12970)
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
-import freenet.node.Node;

 import freenet.clients.http.bookmark.Bookmark;
 import freenet.clients.http.bookmark.BookmarkItem;
@@ -12,11 +11,9 @@
 import freenet.clients.http.bookmark.BookmarkCategories;
 import freenet.clients.http.bookmark.BookmarkManager;

-import freenet.node.useralerts.UserAlertManager;
 import freenet.keys.FreenetURI;
 import freenet.node.NodeClientCore;
 import freenet.client.HighLevelSimpleClient;
-import freenet.support.HTMLEncoder;
 import freenet.support.HTMLNode;
 import freenet.support.api.HTTPRequest;

@@ -27,17 +24,15 @@
        private static final int MAX_NAME_LENGTH = 500;
        private static final int MAX_BOOKMARK_PATH_LENGTH = 10 * 
MAX_NAME_LENGTH;

-       private final Node node;
        private final NodeClientCore core;
        private final BookmarkManager bookmarkManager;
        private String cutedPath;


-       BookmarkEditorToadlet(HighLevelSimpleClient client, Node node)
+       BookmarkEditorToadlet(HighLevelSimpleClient client, NodeClientCore core)
        {
                super(client);
-               this.node = node;
-               this.core = node.clientCore;
+               this.core = core;
                this.bookmarkManager = core.bookmarkManager;
                this.cutedPath = "";
        }

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2007-04-25 
23:15:19 UTC (rev 12969)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2007-04-26 
10:54:41 UTC (rev 12970)
@@ -610,7 +610,7 @@
                        LocalFileInsertToadlet localFileInsertToadlet = new 
LocalFileInsertToadlet(core, client);
                        server.register(localFileInsertToadlet, "/files/", 
true, false);

-                       BookmarkEditorToadlet bookmarkEditorToadlet = new 
BookmarkEditorToadlet(client, node);
+                       BookmarkEditorToadlet bookmarkEditorToadlet = new 
BookmarkEditorToadlet(client, core);
                        server.register(bookmarkEditorToadlet, 
"/bookmarkEditor/", true, false);

                        BrowserTestToadlet browsertTestToadlet = new 
BrowserTestToadlet(client, core);

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-04-25 
23:15:19 UTC (rev 12969)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-04-26 
10:54:41 UTC (rev 12970)
@@ -4,10 +4,8 @@
 package freenet.clients.http;

 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Enumeration;

 import java.io.File;
 import java.io.FileReader;
@@ -20,7 +18,6 @@
 import freenet.client.InsertBlock;
 import freenet.client.InserterException;
 import freenet.clients.http.filter.GenericReadFilterCallback;
-import freenet.clients.http.bookmark.BookmarkItem;
 import freenet.clients.http.bookmark.BookmarkItems;
 import freenet.clients.http.bookmark.BookmarkCategory;
 import freenet.clients.http.bookmark.BookmarkCategories;
@@ -44,11 +41,7 @@


 public class WelcomeToadlet extends Toadlet {
-       private final static int MODE_ADD = 1;
-       private final static int MODE_EDIT = 2;
        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;
        final NodeClientCore core;
        final Node node;
        final BookmarkManager bookmarkManager;
@@ -85,7 +78,7 @@

                BookmarkCategories cats = cat.getSubCategories();
                for (int i = 0; i < cats.size(); i++) {                 
-                       HTMLNode subCat = list.addChild("li", "class", "cat", 
cats.get(i).getName());
+                       list.addChild("li", "class", "cat", 
cats.get(i).getName());
                        addCategoryToList(cats.get(i), 
list.addChild("li").addChild("ul"));
                }
        }