Author: jflesch
Date: 2007-01-04 20:42:12 +0000 (Thu, 04 Jan 2007)
New Revision: 11566
Modified:
trunk/apps/Thaw/src/thaw/core/PluginManager.java
trunk/apps/Thaw/src/thaw/core/SplashScreen.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Fix splashscreen
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-01-04 20:19:49 UTC
(rev 11565)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-01-04 20:42:12 UTC
(rev 11566)
@@ -66,13 +66,7 @@
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
"Loading
plugin '"+pluginName+"' ...");
- Plugin plugin = loadPlugin(pluginName);
- javax.swing.ImageIcon icon = null;
-
- if ((icon = plugin.getIcon()) != null)
- core.getSplashScreen().addIcon(icon);
- else
- core.getSplashScreen().addIcon(IconBox.add);
+ loadPlugin(pluginName);
}
return true;
@@ -84,7 +78,7 @@
public boolean runPlugins() {
Iterator pluginIt;
- if (plugins == null) {
+ if (plugins == null || plugins.size() == 0) {
Logger.error(this, "No plugin to run ?!");
return false;
}
@@ -104,8 +98,15 @@
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
"Starting plugin '"+plugin.getClass().getName()+"' ...");
+
+ javax.swing.ImageIcon icon = null;
+
+ if ((icon = plugin.getIcon()) != null)
+
core.getSplashScreen().addIcon(icon);
+ else
+
core.getSplashScreen().addIcon(IconBox.add);
+
plugin.run(core);
-
}
else
Logger.notice(this, "Plugin == null ?");
Modified: trunk/apps/Thaw/src/thaw/core/SplashScreen.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-04 20:19:49 UTC
(rev 11565)
+++ trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-04 20:42:12 UTC
(rev 11566)
@@ -17,7 +17,7 @@
public final static int SIZE_X = 500;
public final static int SIZE_Y = 150;
- public final static int NMB_ICONS = 8;
+ public final static int NMB_ICONS = 9;
public JDialog splashScreen;
public JProgressBar progressBar;
@@ -120,6 +120,7 @@
nmbIcon++;
splashScreen.getContentPane().validate();
+ lb.repaint();
}
public int getProgression() {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-04 20:19:49 UTC (rev 11565)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-04 20:42:12 UTC (rev 11566)
@@ -317,7 +317,7 @@
public void setTarget(final IndexTreeNode node) {
super.setTarget(node);
- getActionSource().setEnabled((node != null) || (node
instanceof Index));
+ getActionSource().setEnabled((node != null) && (node
instanceof Index));
}
public void apply() {
