[Thaw-dev] r12104 - trunk/apps/Thaw/src/thaw/plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-03-13 07:10:25 +0000 (Tue, 13 Mar 2007)
New Revision: 12104

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java
Log:
Fix search : Avoid an NPE when no index and no folder are selected

Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java       2007-03-12 
22:39:15 UTC (rev 12103)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java       2007-03-13 
07:10:25 UTC (rev 12104)
@@ -51,9 +51,14 @@
                userText.setSelectionStart(0);
                userText.setSelectionEnd(userText.getText().length());

+               IndexTreeNode node = 
indexBrowser.getIndexTree().getSelectedNode();
+
+               if (node == null)
+                       node = indexBrowser.getIndexTree().getRoot();
+
                final SearchResult sr = new SearchResult(indexBrowser.getDb(),
                                                         
userText.getText().trim(),
-                                                        
indexBrowser.getIndexTree().getSelectedNode());
+                                                        node);
                indexBrowser.getTables().setList(sr);
        }