[Thaw-dev] r11325 - in trunk/apps/Thaw/src/thaw: core plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-09 21:35:33 +0000 (Sat, 09 Dec 2006)
New Revision: 11325

Modified:
   trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
   trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
Log:
Don't try to display key when they are not known

Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-12-09 21:06:35 UTC 
(rev 11324)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-12-09 21:35:33 UTC 
(rev 11325)
@@ -7,6 +7,16 @@

        }

+       /**
+        * Quick test to see if the string could be a key
+        */
+       public static boolean isAKey(String key) {
+               return (key.startsWith("CHK@")
+                       || key.startsWith("SSK@")
+                       || key.startsWith("USK@")
+                       || key.startsWith("KSK@"));
+       }
+
        public static String cleanURI(String uri) {
                if (uri == null)
                        return uri;

Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-12-09 
21:06:35 UTC (rev 11324)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-12-09 
21:35:33 UTC (rev 11325)
@@ -314,9 +314,16 @@
                        //if (column == 2)
                        //      return file.getCategory();

-                       if (column == 2)
-                               return file.getPublicKey();
+                       if (column == 2) {
+                               String key = file.getPublicKey();

+                               if (!thaw.core.FreenetURIHelper.isAKey(key))
+                                       key = 
I18n.getMessage("thaw.common.unknown");
+
+                               return key;
+
+                       }
+
                        if (column == 3)
                                return file.getTransfer();