Author: nextgens
Date: 2007-11-20 19:23:51 +0000 (Tue, 20 Nov 2007)
New Revision: 15883
Modified:
trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
Log:
BookmarkToadlet: We won't implement "private" bookmarks like that
Modified: trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-11-20 19:21:47 UTC (rev 15882)
+++ trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-11-20 19:23:51 UTC (rev 15883)
@@ -1,16 +1,8 @@
package freenet.clients.http.bookmark;
public abstract class Bookmark {
- protected boolean privateBookmark;
-
protected String name;
- public boolean isPrivate() {
- return privateBookmark;
- }
-
- public abstract void setPrivate(boolean bool);
-
public String getName() {
return name;
}
@@ -24,7 +16,6 @@
if(o instanceof Bookmark) {
Bookmark b = (Bookmark) o;
if(!b.name.equals(name)) return false;
- if(b.privateBookmark != privateBookmark) return false;
return true;
} else return false;
}
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2007-11-20 19:21:47 UTC (rev 15882)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2007-11-20 19:23:51 UTC (rev 15883)
@@ -134,14 +134,5 @@
return sfs;
}
-
- public void setPrivate(boolean bool) {
- privateBookmark = bool;
-
- BookmarkCategories subCategories = getSubCategories();
- for (int i = 0; i < size(); i++)
- subCategories.get(i).setPrivate(bool);
- }
-
// Don't override equals(), two categories are equal if they have the
same name and description.
}
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-11-20 19:21:47 UTC (rev 15882)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-11-20 19:23:51 UTC (rev 15883)
@@ -144,10 +144,6 @@
return ("".equals(name) ? l10n("unnamedBookmark") : name);
}
- public void setPrivate(boolean bool) {
- privateBookmark = bool;
- }
-
public String toString() {
return this.name + "###" + this.desc + "###" +
this.hasAnActivelink + "###" + this.key.toString();
}
