Author: j16sdiz
Date: 2008-11-06 05:17:46 +0000 (Thu, 06 Nov 2008)
New Revision: 23333
Removed:
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategories.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 BookmarkCategories with List<BookmarkCategory>
Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2008-11-06 05:17:19 UTC (rev 23332)
+++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2008-11-06 05:17:46 UTC (rev 23333)
@@ -9,7 +9,6 @@
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.BookmarkManager;
@@ -85,7 +84,7 @@
list.addChild(li);
}
- BookmarkCategories cats = cat.getSubCategories();
+ List<BookmarkCategory> cats = cat.getSubCategories();
for(int i = 0; i < cats.size(); i++) {
String catPath = path + cats.get(i).getName() + '/';
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-06
05:17:19 UTC (rev 23332)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-11-06
05:17:46 UTC (rev 23333)
@@ -15,7 +15,6 @@
import freenet.client.HighLevelSimpleClient;
import freenet.client.InsertBlock;
import freenet.client.InsertException;
-import freenet.clients.http.bookmark.BookmarkCategories;
import freenet.clients.http.bookmark.BookmarkCategory;
import freenet.clients.http.bookmark.BookmarkItem;
import freenet.clients.http.bookmark.BookmarkManager;
@@ -79,7 +78,7 @@
}
}
- BookmarkCategories cats = cat.getSubCategories();
+ List<BookmarkCategory> cats = cat.getSubCategories();
for (int i = 0; i < cats.size(); i++) {
list.addChild("li", "class", "cat", cats.get(i).getName());
addCategoryToList(cats.get(i), list.addChild("li").addChild("ul"),
noActiveLinks);
Deleted: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategories.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategories.java
2008-11-06 05:17:19 UTC (rev 23332)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategories.java
2008-11-06 05:17:46 UTC (rev 23333)
@@ -1,24 +0,0 @@
-package freenet.clients.http.bookmark;
-
-import java.util.Vector;
-
-public final class BookmarkCategories {
- private final Vector categories = new Vector();
-
- public BookmarkCategory get(int i) {
- return (BookmarkCategory) categories.get(i);
- }
-
- public void add(BookmarkCategory bc) {
- categories.add(bc);
- }
-
- protected void extend(BookmarkCategories bc) {
- for (int i = 0; i < bc.size(); i++)
- add(bc.get(i));
- }
-
- public int size() {
- return categories.size();
- }
-}
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2008-11-06 05:17:19 UTC (rev 23332)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2008-11-06 05:17:46 UTC (rev 23333)
@@ -80,8 +80,8 @@
}
public List<BookmarkItem> getAllItems() {
- List<BookmarkItem> items = getItems();
- BookmarkCategories subCategories = getSubCategories();
+ List<BookmarkItem> items = getItems();
+ List<BookmarkCategory> subCategories = getSubCategories();
for (int i = 0; i < subCategories.size(); i++) {
items.addAll(subCategories.get(i).getAllItems());
@@ -89,8 +89,8 @@
return items;
}
- public BookmarkCategories getSubCategories() {
- BookmarkCategories categories = new BookmarkCategories();
+ public List<BookmarkCategory> getSubCategories() {
+ List<BookmarkCategory> categories = new Vector<BookmarkCategory>();
for (int i = 0; i < size(); i++) {
if (get(i) instanceof BookmarkCategory) {
categories.add((BookmarkCategory) get(i));
@@ -100,12 +100,12 @@
return categories;
}
- public BookmarkCategories getAllSubCategories() {
- BookmarkCategories categories = getSubCategories();
- BookmarkCategories subCategories = getSubCategories();
+ public List<BookmarkCategory> getAllSubCategories() {
+ List<BookmarkCategory> categories = getSubCategories();
+ List<BookmarkCategory> subCategories = getSubCategories();
for (int i = 0; i < subCategories.size(); i++) {
- categories.extend(subCategories.get(i).getAllSubCategories());
+ categories.addAll(subCategories.get(i).getAllSubCategories());
}
return categories;
@@ -120,7 +120,7 @@
private Vector<String> toStrings(String prefix) {
Vector<String> strings = new Vector<String>();
List<BookmarkItem> items = getItems();
- BookmarkCategories subCategories = getSubCategories();
+ List<BookmarkCategory> subCategories = getSubCategories();
prefix += this.name + "/";
for (int i = 0; i < items.size(); i++) {
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2008-11-06 05:17:19 UTC (rev 23332)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
2008-11-06 05:17:46 UTC (rev 23333)
@@ -352,7 +352,7 @@
public static SimpleFieldSet toSimpleFieldSet(BookmarkCategory cat) {
SimpleFieldSet sfs = new SimpleFieldSet(true);
- BookmarkCategories bc = cat.getSubCategories();
+ List<BookmarkCategory> bc = cat.getSubCategories();
for(int i = 0; i < bc.size(); i++) {
BookmarkCategory currentCat = bc.get(i);
