Author: j16sdiz Date: 2008-11-05 06:32:56 +0000 (Wed, 05 Nov 2008) New Revision: 23318
Removed: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItems.java Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java Log: replace BookmarkItems with List<BookmarkItem>, javadoc, imports Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java 2008-11-04 23:27:04 UTC (rev 23317) +++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java 2008-11-05 06:32:56 UTC (rev 23318) @@ -1,20 +1,21 @@ package freenet.clients.http; +import static freenet.clients.http.QueueToadlet.MAX_KEY_LENGTH; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; +import java.util.List; +import freenet.client.HighLevelSimpleClient; import freenet.clients.http.bookmark.Bookmark; +import freenet.clients.http.bookmark.BookmarkCategories; +import freenet.clients.http.bookmark.BookmarkCategory; import freenet.clients.http.bookmark.BookmarkItem; -import freenet.clients.http.bookmark.BookmarkItems; -import freenet.clients.http.bookmark.BookmarkCategory; -import freenet.clients.http.bookmark.BookmarkCategories; import freenet.clients.http.bookmark.BookmarkManager; - import freenet.keys.FreenetURI; import freenet.l10n.L10n; import freenet.node.NodeClientCore; -import freenet.client.HighLevelSimpleClient; import freenet.support.HTMLNode; import freenet.support.Logger; import freenet.support.URLDecoder; @@ -22,12 +23,18 @@ import freenet.support.URLEncoder; import freenet.support.api.HTTPRequest; +/** + * BookmarkEditor Toadlet + * + * Accessible from http://.../bookmarkEditor/ + */ public class BookmarkEditorToadlet extends Toadlet { - private static final int MAX_ACTION_LENGTH = 20; - private static final int MAX_KEY_LENGTH = QueueToadlet.MAX_KEY_LENGTH; + /** Max. bookmark name length */ private static final int MAX_NAME_LENGTH = 500; + /** Max. bookmark path length (e.g. <code>Freenet related software and documentation/Freenet Message System</code> ) */ private static final int MAX_BOOKMARK_PATH_LENGTH = 10 * MAX_NAME_LENGTH; + private final NodeClientCore core; private final BookmarkManager bookmarkManager; private String cutedPath; @@ -39,8 +46,11 @@ this.cutedPath = null; } + /** + * Get all bookmark as a HTMLNode of <li>...</li>s + */ private void addCategoryToList(BookmarkCategory cat, String path, HTMLNode list) { - BookmarkItems items = cat.getItems(); + List<BookmarkItem> items = cat.getItems(); final String edit = L10n.getString("BookmarkEditorToadlet.edit"); final String delete = L10n.getString("BookmarkEditorToadlet.delete"); @@ -52,10 +62,11 @@ final String addCategory = L10n.getString("BookmarkEditorToadlet.addCategory"); for(int i = 0; i < items.size(); i++) { + BookmarkItem item = items.get(i); + + String itemPath = URLEncoder.encode(path + item.getName(), false); + HTMLNode li = new HTMLNode("li", "class", "item", item.getName()); - String itemPath = URLEncoder.encode(path + items.get(i).getName(), false); - HTMLNode li = new HTMLNode("li", "class", "item", items.get(i).getName()); - HTMLNode actions = new HTMLNode("span", "class", "actions"); actions.addChild("a", "href", "?action=edit&bookmark=" + itemPath).addChild("img", new String[]{"src", "alt", "title"}, new String[]{"/static/icon/edit.png", edit, edit}); Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java =================================================================== --- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-04 23:27:04 UTC (rev 23317) +++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-05 06:32:56 UTC (rev 23318) @@ -7,6 +7,7 @@ import java.io.IOException; import java.net.URI; import java.util.HashSet; +import java.util.List; import org.tanukisoftware.wrapper.WrapperManager; @@ -17,7 +18,6 @@ import freenet.clients.http.bookmark.BookmarkCategories; import freenet.clients.http.bookmark.BookmarkCategory; import freenet.clients.http.bookmark.BookmarkItem; -import freenet.clients.http.bookmark.BookmarkItems; import freenet.clients.http.bookmark.BookmarkManager; import freenet.clients.http.filter.GenericReadFilterCallback; import freenet.frost.message.FrostBoard; @@ -58,7 +58,7 @@ } private void addCategoryToList(BookmarkCategory cat, HTMLNode list, boolean noActiveLinks) { - BookmarkItems items = cat.getItems(); + List<BookmarkItem> items = cat.getItems(); if (items.size() > 0) { // FIXME CSS noborder ... HTMLNode table = list.addChild("li").addChild("table", new String[]{"border", "style"}, new String[]{"0", "border: none"}); Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java =================================================================== --- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java 2008-11-04 23:27:04 UTC (rev 23317) +++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java 2008-11-05 06:32:56 UTC (rev 23318) @@ -1,5 +1,6 @@ package freenet.clients.http.bookmark; +import java.util.List; import java.util.Vector; import freenet.node.FSParseException; @@ -67,8 +68,8 @@ return bookmarks.size(); } - public BookmarkItems getItems() { - BookmarkItems items = new BookmarkItems(); + public List<BookmarkItem> getItems() { + List<BookmarkItem> items = new Vector<BookmarkItem>(); for (int i = 0; i < size(); i++) { if (get(i) instanceof BookmarkItem) { items.add((BookmarkItem) get(i)); @@ -78,12 +79,12 @@ return items; } - public BookmarkItems getAllItems() { - BookmarkItems items = getItems(); + public List<BookmarkItem> getAllItems() { + List<BookmarkItem> items = getItems(); BookmarkCategories subCategories = getSubCategories(); for (int i = 0; i < subCategories.size(); i++) { - items.extend(subCategories.get(i).getAllItems()); + items.addAll(subCategories.get(i).getAllItems()); } return items; } @@ -118,7 +119,7 @@ private Vector<String> toStrings(String prefix) { Vector<String> strings = new Vector<String>(); - BookmarkItems items = getItems(); + List<BookmarkItem> items = getItems(); BookmarkCategories subCategories = getSubCategories(); prefix += this.name + "/"; Deleted: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItems.java =================================================================== --- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItems.java 2008-11-04 23:27:04 UTC (rev 23317) +++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItems.java 2008-11-05 06:32:56 UTC (rev 23318) @@ -1,24 +0,0 @@ -package freenet.clients.http.bookmark; - -import java.util.Vector; - -public class BookmarkItems { - private final Vector items = new Vector(); - - public BookmarkItem get(int i) { - return (BookmarkItem) items.get(i); - } - - public void add(BookmarkItem bi) { - items.add(bi); - } - - protected void extend(BookmarkItems bi) { - for (int i = 0; i < bi.size(); i++) - add(bi.get(i)); - } - - public int size() { - return items.size(); - } -} Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java =================================================================== --- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java 2008-11-04 23:27:04 UTC (rev 23317) +++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java 2008-11-05 06:32:56 UTC (rev 23318) @@ -10,6 +10,8 @@ import java.net.MalformedURLException; import java.util.Date; import java.util.HashMap; +import java.util.List; + import freenet.client.async.USKCallback; import freenet.keys.FreenetURI; import freenet.keys.USK; @@ -91,7 +93,7 @@ private class USKUpdatedCallback implements USKCallback { public void onFoundEdition(long edition, USK key) { - BookmarkItems items = MAIN_CATEGORY.getAllItems(); + List<BookmarkItem> items = MAIN_CATEGORY.getAllItems(); for(int i = 0; i < items.size(); i++) { if(!"USK".equals(items.get(i).getKeyType())) continue; @@ -247,7 +249,7 @@ } public FreenetURI[] getBookmarkURIs() { - BookmarkItems items = MAIN_CATEGORY.getAllItems(); + List<BookmarkItem> items = MAIN_CATEGORY.getAllItems(); FreenetURI[] uris = new FreenetURI[items.size()]; for(int i = 0; i < items.size(); i++) uris[i] = items.get(i).getURI(); @@ -359,7 +361,7 @@ sfs.put(BookmarkCategory.NAME, bc.size()); - BookmarkItems bi = cat.getItems(); + List<BookmarkItem> bi = cat.getItems(); for(int i = 0; i < bi.size(); i++) sfs.put(BookmarkItem.NAME + i, bi.get(i).getSimpleFieldSet()); sfs.put(BookmarkItem.NAME, bi.size());
