[Thaw-dev] r11188 - in trunk/apps/Thaw/src/thaw/plugins: . index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-01 23:17:10 +0000 (Fri, 01 Dec 2006)
New Revision: 11188

Modified:
   trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Refix index insertion

Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-12-01 23:14:20 UTC 
(rev 11187)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-12-01 23:17:10 UTC 
(rev 11188)
@@ -9,7 +9,7 @@
 import thaw.plugins.index.*;

 public class IndexBrowser extends ToolbarModifier implements Plugin, 
ChangeListener {
-       public static final String DEFAULT_INDEX = "USK at 
BXd4EqMSOR589aHNHOY-e2QjI9NHwPlJurKxcvo1hBg,HkrDarIUF79uc9fjGu0S3mbp7Qf8YeMHynKf2GQO3r0,AQABAAE/Thaw/2/Thaw.xml";
+       public static final String DEFAULT_INDEX = "USK at 
BXd4EqMSOR589aHNHOY-e2QjI9NHwPlJurKxcvo1hBg,HkrDarIUF79uc9fjGu0S3mbp7Qf8YeMHynKf2GQO3r0,AQABAAE/Thaw/3/Thaw.xml";

        private Core core;
        private Hsqldb hsqldb;

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-12-01 23:14:20 UTC 
(rev 11187)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-12-01 23:17:10 UTC 
(rev 11188)
@@ -89,6 +89,12 @@
                this.realName = realName.trim();
                this.displayName = displayName.trim();

+               if (realName == null)
+                       realName = displayName;
+
+               if (displayName == null)
+                       displayName = realName;
+
                if (privateKey != null)
                        this.privateKey = privateKey.trim();
                else
@@ -272,7 +278,7 @@
                else
                        tmpdir = tmpdir + java.io.File.separator;

-               this.targetFile = new java.io.File(tmpdir + 
this.toString()+".xml");
+               targetFile = new java.io.File(tmpdir + realName +".xml");

                if (this.transfer != null) {
                        Logger.notice(this, "A transfer is already running");
@@ -969,7 +975,7 @@
                Element header = xmlDoc.createElement("header");

                Element title = xmlDoc.createElement("title");
-               Text titleText = xmlDoc.createTextNode(this.toString());
+               Text titleText = xmlDoc.createTextNode(displayName);
                title.appendChild(titleText);

                Element owner = xmlDoc.createElement("owner");