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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-08-28 14:47:03 +0000 (Tue, 28 Aug 2007)
New Revision: 14900

Modified:
   trunk/apps/Thaw/src/thaw/core/PluginManager.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
Log:
Fix an NPE in IndexFolder.java

Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java    2007-08-28 01:26:17 UTC 
(rev 14899)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java    2007-08-28 14:47:03 UTC 
(rev 14900)
@@ -93,7 +93,7 @@

                final Iterator pluginIt = pluginNames.iterator();

-               final int progressJump = (100-40) / (pluginNames.size()*2);
+               final int progressJump = (100-40) / pluginNames.size();
                core.getSplashScreen().setProgression(40);

                while(pluginIt.hasNext()) {
@@ -105,8 +105,6 @@
                        if (loadPlugin(pluginName) == null) {
                                Logger.notice(this, "Plugin alread loaded");
                        } else {
-                               
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
-                                                                              
"Starting plugin '"+pluginName.replaceFirst("thaw.plugins.", "")+"' ...");
                                runPlugin(pluginName);
                        }
                }

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java     2007-08-28 
01:26:17 UTC (rev 14899)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java     2007-08-28 
14:47:03 UTC (rev 14900)
@@ -1462,6 +1462,9 @@
                if (children == null && loadChildren)
                        loadChildren();

+               if (children == null)
+                       return null;
+
                for (Iterator it = children.iterator() ;
                     it.hasNext(); ) {
                        Object child = it.next();