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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-01-02 19:08:05 +0000 (Tue, 02 Jan 2007)
New Revision: 11543

Modified:
   trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
   trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
   trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java
   trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
Log:
Fix various NPE

Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-01-02 18:54:35 UTC 
(rev 11542)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-01-02 19:08:05 UTC 
(rev 11543)
@@ -220,6 +220,9 @@


        public static String getComparablePart(String key) {
+               if (key == null)
+                       return null;
+
                if (key.startsWith("KSK@"))
                        return key;


Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2007-01-02 18:54:35 UTC 
(rev 11542)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2007-01-02 19:08:05 UTC 
(rev 11543)
@@ -119,7 +119,8 @@

                hsqldb.unregisterChild(this);

-               configPanel.removeTab();
+               if (configPanel != null)
+                       configPanel.removeTab();

                return true;
        }

Modified: trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java       2007-01-02 
18:54:35 UTC (rev 11542)
+++ trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java       2007-01-02 
19:08:05 UTC (rev 11543)
@@ -66,7 +66,7 @@
        public void displayButtonsInTheToolbar() {
                if (mainWindow != null) {
                        if (areDisplayed && mainWindow.getLastToolbarModifier() 
== this) {
-                               Logger.warning(this, "Already displayed !");
+                               Logger.notice(this, "Already displayed !");
                                return;
                        }


Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2007-01-02 
18:54:35 UTC (rev 11542)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2007-01-02 
19:08:05 UTC (rev 11543)
@@ -350,6 +350,9 @@
                }

                public Object getValueAt(final int row, final int column) {
+                       if (files == null)
+                               return null;
+
                        if (row >= files.size())
                                return null;


Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java       2007-01-02 
18:54:35 UTC (rev 11542)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java       2007-01-02 
19:08:05 UTC (rev 11543)
@@ -610,6 +610,11 @@


        public void registerIndex(Index index) {
+               if (index.getPublicKey() == null) {
+                       Logger.warning(this, "Hu ?! no key for index 
'"+index.toString()+"' ?");
+                       return;
+               }
+
                
registeredIndexes.put(FreenetURIHelper.getComparablePart(index.getPublicKey()),
                                      index);
        }