Author: jflesch
Date: 2007-08-22 19:15:08 +0000 (Wed, 22 Aug 2007)
New Revision: 14835
Added:
trunk/apps/Thaw/images/web.png
Modified:
trunk/apps/Thaw/src/thaw/core/PluginManager.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
Log:
Fix plugin manager : When Thaw starts its plugins, if a plugin has already
loaded and run another plugins, don't run it twice
Added: trunk/apps/Thaw/images/web.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/web.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-08-22 13:39:15 UTC
(rev 14834)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-08-22 19:15:08 UTC
(rev 14835)
@@ -86,7 +86,9 @@
}
}
- pluginNames = core.getConfig().getPluginNames();
+ /* we duplicate the vector to avoid collisions */
+ /* (remember : plugins can load other plugins */
+ pluginNames = new Vector(core.getConfig().getPluginNames());
final Iterator pluginIt = pluginNames.iterator();
@@ -99,10 +101,13 @@
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
"Loading
plugin '"+pluginName.replaceFirst("thaw.plugins.", "")+"' ...");
- loadPlugin(pluginName);
-
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
-
"Starting plugin '"+pluginName.replaceFirst("thaw.plugins.", "")+"'
...");
- runPlugin(pluginName);
+ 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);
+ }
}
return true;
@@ -154,7 +159,7 @@
Logger.info(this, "Loading plugin: '"+className+"'");
try {
- if(plugins.get(className) != null) {
+ if ( plugins.get(className) != null) {
Logger.debug(this, "loadPlugin(): Plugin
'"+className+"' already loaded");
return null;
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2007-08-22 13:39:15 UTC
(rev 14834)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2007-08-22 19:15:08 UTC
(rev 14835)
@@ -117,6 +117,9 @@
else {
Logger.info(this, "Disconnect(): Already
disconnected.");
}
+ synchronized(monitor) {
+ monitor.notifyAll();
+ }
} catch(final java.io.IOException e) {
Logger.warning(this, "Unable to close cleanly the
connection : "
+e.toString() +" ; "+e.getMessage());
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-22 13:39:15 UTC (rev
14834)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-22 19:15:08 UTC (rev
14835)
@@ -171,7 +171,9 @@
public static ImageIcon mail;
public static ImageIcon minMail;
+ public static ImageIcon web;
+
/**
* Not really used
*/
@@ -313,6 +315,7 @@
IconBox.minWindowNew =
IconBox.loadIcon("images/min-window-new.png");
IconBox.mail =
IconBox.loadIcon("images/mail.png");
IconBox.minMail =
IconBox.loadIcon("images/min-mail.png");
+ IconBox.web =
IconBox.loadIcon("images/web.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-22
13:39:15 UTC (rev 14834)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-22
19:15:08 UTC (rev 14835)
@@ -636,3 +636,8 @@
thaw.plugin.miniFrost.attachBoards=Attacher des boards
thaw.plugin.miniFrost.attachFiles=Attacher des fichiers
+
+
+## Index web grapher
+thaw.plugin.indexWebGrapher=Dessinateur de toile d'index
+
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-22 13:39:15 UTC
(rev 14834)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-22 19:15:08 UTC
(rev 14835)
@@ -653,3 +653,8 @@
thaw.plugin.miniFrost.attachBoards=Attach board(s)
thaw.plugin.miniFrost.attachFiles=Attach file(s)
+
+
+## index web grapher
+
+thaw.plugin.indexWebGrapher=Dessinateur de toile d'index
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-22 13:39:15 UTC
(rev 14834)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-22 19:15:08 UTC
(rev 14835)
@@ -636,3 +636,8 @@
thaw.plugin.miniFrost.attachBoards=Attacher des boards
thaw.plugin.miniFrost.attachFiles=Attacher des fichiers
+
+
+## Index web grapher
+thaw.plugin.indexWebGrapher=Dessinateur de toile d'index
+
