Author: nextgens
Date: 2008-06-21 09:42:31 +0000 (Sat, 21 Jun 2008)
New Revision: 20550

Modified:
   trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
fix bug #2429: FMS: bookmark issue: bookmarks with no title cannot be dealt with

Modified: trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java       
2008-06-21 09:36:20 UTC (rev 20549)
+++ trunk/freenet/src/freenet/clients/http/bookmark/Bookmark.java       
2008-06-21 09:42:31 UTC (rev 20550)
@@ -1,5 +1,6 @@
 package freenet.clients.http.bookmark;

+import freenet.l10n.L10n;
 import freenet.support.SimpleFieldSet;

 public abstract class Bookmark {
@@ -11,7 +12,7 @@
        }

        protected void setName(String s) {
-               name = s;
+               name = (s.length() > 0 ? s : L10n.getString("Bookmark.noName"));
        }

        public boolean equals(Object o) {

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-06-21 
09:36:20 UTC (rev 20549)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-06-21 
09:42:31 UTC (rev 20550)
@@ -9,6 +9,7 @@
 Announcer.announceDisabledTooOldShort=The node has tried to connect to the 
network but your copy of Freenet is too old. You should upgrade.
 Announcer.announceAlertShort=The node is trying to connect to the network, it 
will be slow for a while.
 Announcer.coolingOff=For the next ${time} seconds, the node is waiting for the 
nodes that it just announced to to connect, if there are not enough nodes it 
will try a different node.
+Bookmark.noName=no name
 BookmarkEditorToadlet.addBookmark=Add Bookmark
 BookmarkEditorToadlet.addCategory=Add Category
 BookmarkEditorToadlet.addNewBookmark=Add a new bookmark


Reply via email to