Author: dlanglais Date: 2010-03-12 17:08:07 +0100 (Fri, 12 Mar 2010) New Revision: 221 Log: am?\195?\169lioration impl?\195?\169mentation load/unload sur les plugins 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/pom.xml 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 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 12:09:52 UTC (rev 220) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; @@ -26,6 +25,10 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; /** * Default constructor. @@ -192,19 +195,19 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -213,24 +216,11 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } } 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 12:09:52 UTC (rev 220) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 16:08:07 UTC (rev 221) @@ -26,6 +26,10 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; /** * Default constructor. @@ -192,19 +196,19 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -213,24 +217,11 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } } Modified: trunk/msm-fromtoXML/pom.xml =================================================================== --- trunk/msm-fromtoXML/pom.xml 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/pom.xml 2010-03-12 16:08:07 UTC (rev 221) @@ -78,7 +78,8 @@ <name>MSM-FromToXML</name> - <description>Plugin for MapStorageManager to work with actuals HBase</description> + <description>Plugin to import/export database content from/to xml files + using JDom.</description> <inceptionYear>2010</inceptionYear> <developers> 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 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 16:08:07 UTC (rev 221) @@ -4,7 +4,6 @@ */ package org.nuiton.mapstoragemanager.plugins.exporter; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -40,11 +39,15 @@ /** * the jdom document. */ - private static Document document; + private Document document; /** * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemExport + */ + private JMenuItem menuItemExport; /** * Constructor. @@ -164,24 +167,24 @@ } } - /** - * toSreen(). - * show the XML content on System.out - */ - static void toSreen() { - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - output.output(document, System.out); - } catch (java.io.IOException e) { - LOG.error(e, e); - } - } +// /** +// * toSreen(). +// * show the XML content on System.out +// */ +// void toSreen() { +// try { +// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); +// output.output(document, System.out); +// } catch (java.io.IOException e) { +// LOG.error(e, e); +// } +// } /** * Method to save the file. * @param file the file in which we save the database. */ - private static void save(final File file) { + private void save(final File file) { long t1 = System.currentTimeMillis(); try { XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); @@ -231,8 +234,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemExport = new JMenuItem(pluginName); + menuItemExport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -240,7 +243,7 @@ } }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.add(menuItem); + menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); @@ -252,21 +255,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - for (Component menuItem : menuExport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuExport.remove(menuItem); - } - } + menuExport.remove(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); 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 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 16:08:07 UTC (rev 221) @@ -20,8 +20,6 @@ import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; @@ -40,11 +38,15 @@ /** * the jdom document. */ - private static Document document; + private Document document; /** * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemImport. + */ + private JMenuItem menuItemImport; /** * Constructor. @@ -139,25 +141,25 @@ } } - /** - * toSreen(). - * show the XML content on System.out - */ - static void toSreen() { - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - output.output(document, System.out); - } catch (java.io.IOException e) { - LOG.error(e, e); - } - } +// /** +// * toSreen(). +// * show the XML content on System.out +// */ +// void toSreen() { +// try { +// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); +// output.output(document, System.out); +// } catch (java.io.IOException e) { +// LOG.error(e, e); +// } +// } /** * Method to load the jdom document of the file. * @param file the file from which the database is saved. * @throws IOException IOException */ - private static void open(final File file) throws IOException { + private void open(final File file) throws IOException { long t1 = System.currentTimeMillis(); //On crée une instance de SAXBuilder SAXBuilder saxBuilder = new SAXBuilder(); @@ -205,8 +207,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemImport = new JMenuItem(pluginName); + menuItemImport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -214,7 +216,7 @@ } }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.add(menuItem); + menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); @@ -226,22 +228,9 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - for (Component menuItem : menuImport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuImport.remove(menuItem); - } - } - + menuImport.remove(menuItemImport); + if (!menuImport.isEnabled()) { menuImport.setEnabled(true); } 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 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 16:08:07 UTC (rev 221) @@ -4,12 +4,18 @@ */ package org.nuiton.mapstoragemanager.plugins.importer; +import java.awt.Component; import java.io.File; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JMenu; +import javax.swing.JMenuItem; import javax.swing.filechooser.FileNameExtensionFilter; import junit.framework.Assert; import junit.framework.TestCase; @@ -20,6 +26,7 @@ import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; +import org.nuiton.mapstoragemanager.ui.MainUI; /** * @@ -305,4 +312,49 @@ } assertEquals(acceptedExtensionExpected, acceptedExtensionActual); } + + /** + * test Load/UnLoad + */ + public void testLoadUnLoad() { +// JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + Set<Component> components; + JMenuItem menuItem = null; + + Importer fromXML = new FromXML(); + try { + Field fMenuItem = fromXML.getClass().getDeclaredField("menuItem"); + fMenuItem.setAccessible(true); + menuItem = (JMenuItem) fMenuItem.get(fromXML); + } catch (IllegalArgumentException ex) { + LOG.error(ex, ex); + } catch (IllegalAccessException ex) { + LOG.error(ex, ex); + } catch (NoSuchFieldException ex) { + LOG.error(ex, ex); + } catch (SecurityException ex) { + LOG.error(ex, ex); + } + + + +// fromXML.load(); + +// components = new HashSet<Component>(); +// for (Component c : menuImport.getComponents()) { +// components.add(c); +// } +// +// assertTrue(components.contains(menuItem)); +// +// fromXML.unload(); +// +// components = new HashSet<Component>(); +// for (Component c : menuImport.getComponents()) { +// components.add(c); +// } +// +// assertFalse(components.contains(menuItem)); + + } } 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 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) @@ -40,6 +40,10 @@ * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemExport + */ + private JMenuItem menuItemExport; /** * NameSpace. @@ -201,8 +205,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemExport = new JMenuItem(pluginName); + menuItemExport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -210,7 +214,7 @@ } }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.add(menuItem); + menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); @@ -222,21 +226,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - for (Component menuItem : menuExport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuExport.remove(menuItem); - } - } + menuExport.remove(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); 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 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.importer; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -47,6 +46,10 @@ * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemImport. + */ + private JMenuItem menuItemImport; /** * Constructor. @@ -261,8 +264,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemImport = new JMenuItem(pluginName); + menuItemImport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -270,7 +273,7 @@ } }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.add(menuItem); + menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); @@ -282,21 +285,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - for (Component menuItem : menuImport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuImport.remove(menuItem); - } - } + menuImport.remove(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); 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 12:09:52 UTC (rev 220) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.hbase; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; @@ -40,6 +39,10 @@ private static final Log LOG = LogFactory.getLog(HBase.class); /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; + /** * HBaseAdmin. * Permit to manage the HBase. */ @@ -368,19 +371,19 @@ // @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -389,24 +392,11 @@ */ // @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } }