Author: dlanglais Date: 2010-03-12 18:26:01 +0100 (Fri, 12 Mar 2010) New Revision: 222 Log: correction concernant l'impl?\195?\169mentation des fonctions load/unload. Added: trunk/msm-bighashmap/src/main/resources/META-INF/ trunk/msm-bighashmap/src/main/resources/META-INF/services/ trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 17:26:01 UTC (rev 222) @@ -28,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * Default constructor. @@ -195,19 +195,24 @@ @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -216,11 +221,11 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Added: trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable =================================================================== --- trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (rev 0) +++ trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable 2010-03-12 17:26:01 UTC (rev 222) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap \ No newline at end of file Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 17:26:01 UTC (rev 222) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; @@ -29,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * Default constructor. @@ -196,19 +195,24 @@ @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -217,11 +221,11 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 17:26:01 UTC (rev 222) @@ -234,6 +234,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } + menuItemExport = new JMenuItem(pluginName); menuItemExport.addActionListener(new ActionListener() { @@ -242,7 +248,6 @@ ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { @@ -258,8 +263,8 @@ JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.remove(menuItemExport); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuExport.getComponentCount() == 0) { + menuExport.setEnabled(false); } } } Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 17:26:01 UTC (rev 222) @@ -207,6 +207,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } + menuItemImport = new JMenuItem(pluginName); menuItemImport.addActionListener(new ActionListener() { @@ -215,7 +221,6 @@ ApplicationEngine.getInstance().importBase(pluginName); } }); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { @@ -230,9 +235,9 @@ public void unload() { JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.remove(menuItemImport); - - if (!menuImport.isEnabled()) { - menuImport.setEnabled(true); + + if (menuImport.getComponentCount() == 0) { + menuImport.setEnabled(false); } } } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 17:26:01 UTC (rev 222) @@ -323,7 +323,8 @@ Importer fromXML = new FromXML(); try { - Field fMenuItem = fromXML.getClass().getDeclaredField("menuItem"); + Field fMenuItem + = fromXML.getClass().getDeclaredField("menuItemImport"); fMenuItem.setAccessible(true); menuItem = (JMenuItem) fMenuItem.get(fromXML); } catch (IllegalArgumentException ex) { Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) @@ -205,6 +205,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } + menuItemExport = new JMenuItem(pluginName); menuItemExport.addActionListener(new ActionListener() { @@ -213,7 +219,6 @@ ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { @@ -229,8 +234,8 @@ JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.remove(menuItemExport); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuExport.getComponentCount() == 0) { + menuExport.setEnabled(false); } } } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) @@ -68,7 +68,9 @@ final long t1 = System.currentTimeMillis(); - XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); + XmlPullParserFactory factory + = XmlPullParserFactory.newInstance( + System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); //factory.setNamespaceAware(true); factory.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); XmlPullParser xpp = factory.newPullParser(); @@ -264,6 +266,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } + menuItemImport = new JMenuItem(pluginName); menuItemImport.addActionListener(new ActionListener() { @@ -272,7 +280,6 @@ ApplicationEngine.getInstance().importBase(pluginName); } }); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { @@ -288,8 +295,8 @@ JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.remove(menuItemImport); - if (!menuImport.isEnabled()) { - menuImport.setEnabled(true); + if (menuImport.getComponentCount() == 0) { + menuImport.setEnabled(false); } } } Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 17:26:01 UTC (rev 222) @@ -41,7 +41,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * HBaseAdmin. * Permit to manage the HBase. @@ -371,19 +371,24 @@ // @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -392,11 +397,11 @@ */ // @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } 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-12 16:08:07 UTC (rev 221) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-12 17:26:01 UTC (rev 222) @@ -27,6 +27,8 @@ */ private static final int FRAME_HEIGHT = 300; + private JFrame diskSpaceFrame; + /** * Constructor. */ @@ -39,9 +41,11 @@ @Override public void display() { - this.setTitle("Plugin ShowDiskSpace"); - this.setSize(FRAME_WIDTH, FRAME_HEIGHT); - this.setLocationRelativeTo(null); + diskSpaceFrame = new JFrame(); + + diskSpaceFrame.setTitle("Plugin ShowDiskSpace"); + diskSpaceFrame.setSize(FRAME_WIDTH, FRAME_HEIGHT); + diskSpaceFrame.setLocationRelativeTo(null); // this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // exit MSM... JPanel content = new JPanel(); @@ -103,9 +107,9 @@ "maxMemory : " + maxMemoryMb + " Mb (" + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); - this.setContentPane(content); - this.pack(); - this.setVisible(true); + diskSpaceFrame.setContentPane(content); + diskSpaceFrame.pack(); + diskSpaceFrame.setVisible(true); } /** @@ -150,6 +154,8 @@ */ @Override public void unload() { + this.setVisible(false); + this.diskSpaceFrame = null; // final String pluginName = getPluginName(); //// JMenuItem menuItem = new JMenuItem(pluginName); //// menuItem.addActionListener(new ActionListener() {