Author: dlanglais Date: 2010-03-18 10:23:25 +0100 (Thu, 18 Mar 2010) New Revision: 251 Log: Suppression TestServiceLoader (inutile et obsol?\195?\168te). Correction ShowDiskSpace (se r?\195?\169inscrivait dans le menu plugin ?\195?\160 chaque fois qu'un plugin ?\195?\169tait charg?\195?\169). Removed: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/plugins/.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-18 08:47:47 UTC (rev 250) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-18 09:23:25 UTC (rev 251) @@ -15,8 +15,6 @@ import java.util.Properties; import java.util.ServiceLoader; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-18 08:47:47 UTC (rev 250) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-03-18 09:23:25 UTC (rev 251) @@ -1,43 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.net.MalformedURLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * @author fdesbois - * @deprecated Use {@link org.nuiton.mapstoragemanager.core.BigTableLoaderTest} - * instead - */ -@Deprecated -public final class TestServiceLoader { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(TestServiceLoader.class); - - /** - * Constructor. - */ - private TestServiceLoader() { - try { - PluginLoader p = - new PluginLoader("plugins", this.getClass().getClassLoader()); - LOG.info(p.getPluginsToString()); - } catch (MalformedURLException e) { - //Auto-generated catch block - //e.printStackTrace(); - LOG.error(e.toString(), e); - } - } - - /** - * Main. - * @param args arguments - */ - public static void main(final String[] args) { - - new TestServiceLoader(); - } -} Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 08:47:47 UTC (rev 250) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 09:23:25 UTC (rev 251) @@ -143,6 +143,14 @@ @Override public void load() { final String pluginName = getPluginName(); + final JMenu menuPlugin = MainUI.getInstance().getMenuPlugin(); + + System.out.println("test2"); + if (menuItemPlugin != null) { + menuPlugin.remove(menuItemPlugin); + System.out.println("test1"); + } + menuItemPlugin = new JMenu(pluginName); final JMenuItem menuItemDisplay = new JMenuItem("Display"); @@ -150,7 +158,6 @@ final JMenuItem menuItemDelete = new JMenuItem("Delete"); menuItemPlugin.add(menuItemDelete); - final JMenu menuPlugin = MainUI.getInstance().getMenuPlugin(); menuPlugin.add(menuItemPlugin); menuItemDisplay.addActionListener(new ActionListener() { Modified: trunk/plugins/.properties =================================================================== --- trunk/plugins/.properties 2010-03-18 08:47:47 UTC (rev 250) +++ trunk/plugins/.properties 2010-03-18 09:23:25 UTC (rev 251) @@ -1,5 +1,9 @@ -#Thu Mar 18 09:45:43 CET 2010 -/comptes/E045231P/Master2/PFE/Workspace/mapstoragemanager/trunk/msm-bighashmapV2/target/msm-bighashmapV2-0.1-SNAPSHOT.jar=true -/comptes/E045231P/Master2/PFE/Workspace/mapstoragemanager/trunk/msm-monitoring-plugins/target/msm-monitoring-plugins-0.1-SNAPSHOT.jar=true +#Thu Mar 18 10:19:08 CET 2010 +/comptes/E054030D/mapstoragemanager/msm-pluginmanager/target/msm-pluginmanager-0.1-SNAPSHOT.jar=true +/comptes/E054030D/mapstoragemanager/msm-monitoring-plugins/target/msm-monitoring-plugins-0.1-SNAPSHOT.jar=true +PluginManager=true BigHashMapV2=true +BigHashMap=true +/comptes/E054030D/mapstoragemanager/msm-bighashmapV2/target/msm-bighashmapV2-0.1-SNAPSHOT.jar=true ShowDiskSpace=true +/comptes/E054030D/mapstoragemanager/msm-bighashmap/target/msm-bighashmap-0.1-SNAPSHOT.jar=true