Author: nextgens
Date: 2007-11-20 19:21:47 +0000 (Tue, 20 Nov 2007)
New Revision: 15882
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: Categories don't need descriptions... we don't persist them
anyway.
Modified: trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-11-20 19:15:58 UTC (rev 15881)
+++ trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
2007-11-20 19:21:47 UTC (rev 15882)
@@ -5,8 +5,6 @@
protected String name;
- protected String desc;
-
public boolean isPrivate() {
return privateBookmark;
}
@@ -20,23 +18,12 @@
protected void setName(String s) {
name = s;
}
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String s) {
- desc = s;
- }
public boolean equals(Object o) {
if(o == this) return true;
if(o instanceof Bookmark) {
Bookmark b = (Bookmark) o;
- if(b.name == null || b.desc == null) return false;
if(!b.name.equals(name)) return false;
- // Compensate for nulls
-
if(!String.valueOf(b.desc).equals(String.valueOf(desc))) 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:15:58 UTC (rev 15881)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2007-11-20 19:21:47 UTC (rev 15882)
@@ -13,11 +13,6 @@
setName(name);
}
- public BookmarkCategory(String name, String desc) {
- setName(name);
- setDesc(desc);
- }
-
protected synchronized Bookmark addBookmark(Bookmark b) {
if(b == null) return null;
int x = bookmarks.indexOf(b);
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-11-20 19:15:58 UTC (rev 15881)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkItem.java
2007-11-20 19:21:47 UTC (rev 15882)
@@ -14,7 +14,6 @@
import freenet.support.HTMLEncoder;
import freenet.support.HTMLNode;
-import freenet.support.SimpleFieldSet;
import java.net.MalformedURLException;
public class BookmarkItem extends Bookmark {
@@ -24,6 +23,7 @@
private boolean hasAnActivelink = false;
private final BookmarkUpdatedUserAlert alert;
private final UserAlertManager alerts;
+ protected String desc;
public BookmarkItem(FreenetURI k, String n, boolean hasAnActivelink,
UserAlertManager uam)
throws MalformedURLException {
