[Thaw-dev] r10695 - in trunk/apps/Thaw/src/thaw: fcp plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-10-22 20:53:29 +0000 (Sun, 22 Oct 2006)
New Revision: 10695

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
   trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
Log:
Fix right click menu in link table

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-10-22 20:16:17 UTC 
(rev 10694)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-10-22 20:53:29 UTC 
(rev 10695)
@@ -507,6 +507,8 @@

        public synchronized boolean saveFileTo(String dir, boolean checkStatus) 
{
                fromTheNodeProgress = 0;
+               
+               Logger.info(this, "Saving file to '"+dir+"'");

                if(dir == null) {
                        Logger.warning(this, "saveFileTo() : Can't save to 
null.");
@@ -592,12 +594,12 @@


                if(reallyWrite) {
-                       Logger.info(this, "Writing file to disk ...");
+                       Logger.info(this, "Writing file to disk ... 
('"+file+"')");

                        try {
                                fileWriter = new FileOutputStream(newFile);
                        } catch(java.io.IOException e) {
-                               Logger.error(this, "Unable to write file on 
disk ... perms ? : "+e.toString());
+                               Logger.error(this, "Unable to write file on 
disk ... disk space / perms ? : "+e.toString());
                                status = "Write error";
                                return false;
                        }

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-10-22 20:16:17 UTC 
(rev 10694)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-10-22 20:53:29 UTC 
(rev 10695)
@@ -87,14 +87,21 @@

                this.id = id;
                this.parent = parent;
-               this.realName = realName;
-               this.displayName = displayName;
+               this.realName = realName.trim();
+               this.displayName = displayName.trim();
                this.modifiable = (privateKey == null ? false : true);

-               this.privateKey = privateKey;
-               this.publicKey = publicKey;
+               if (privateKey != null)
+                       this.privateKey = privateKey.trim();
+               else
+                       this.privateKey = null;

+               if (publicKey != null)
+                       this.publicKey = publicKey.trim();
+               else
+                       this.publicKey = null;

+
                if (modifiable == true && publicKey != null && 
publicKey.startsWith("USK@")) {
                        String[] split = 
FreenetURIHelper.convertUSKtoSSK(publicKey).split("/");
                        publicKey = split[0];

Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java       2006-10-22 
20:16:17 UTC (rev 10694)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java       2006-10-22 
20:53:29 UTC (rev 10695)
@@ -91,6 +91,8 @@

                if (modifiables) {
                        rightClickMenu.add(removeLinks);
+               }
+               else {
                        rightClickMenu.add(addThisIndex);
                }