Author: dlanglais Date: 2010-03-12 23:47:04 +0100 (Fri, 12 Mar 2010) New Revision: 227 Log: Nettoyage du code : - suppression de code comment?\195?\169 dans MainUI.jaxx (ex toolBar, JInternalFrame import et export) ; - MainUI.jaxx : renommage des "nouveaux" menu (...Bis), implique renommage des accesseurs et donc renommages dans les classes appelant ces fonctions... - suppression de code comment?\195?\169 dans ApplicationEngine (fonctions utilis?\195?\169es par MainUI.jaxx par exemple)... 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/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 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-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-12 22:47:04 UTC (rev 227) @@ -56,7 +56,9 @@ classLoader); for (File file : new File(pluginsFolderPath).listFiles()) { - loadPlugin(file); + if (file.getAbsolutePath().endsWith(".jar")) { + loadPlugin(file); + } } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-12 22:47:04 UTC (rev 227) @@ -35,6 +35,10 @@ * map data. */ private Map<String, String> mapData = new HashMap<String, String>(); + /** + * MenuItemBigTable. + */ + private static JMenuItem menuItemConnect; @Override public final boolean connect(final Properties properties) { @@ -170,16 +174,21 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + menuConnect.add(menuItemConnect); if (!menuConnect.isEnabled()) { menuConnect.setEnabled(true); @@ -191,24 +200,12 @@ */ @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 menuConnect = MainUI.getInstance().getMenuConnect(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); } - - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-12 22:47:04 UTC (rev 227) @@ -30,12 +30,6 @@ public static MainUI getInstance() { if (instance == null){ instance = new MainUI(); - for (Plugin btPlugin : instance.getEngine().getBigTableLoader().getAllPlugin(BigTable.class)) { - String btName = btPlugin.getPluginName(); - jaxx.runtime.swing.Item bigTableItem = - new jaxx.runtime.swing.Item(btName, null, btName, true); - instance.getNameBase().addItem(bigTableItem); - } } return instance; } @@ -95,14 +89,6 @@ m.start(); } -public void doActionPerformed__on__menuImport2(java.awt.event.ActionEvent event) { - engine.showImportFrame(); -} - -public void doActionPerformed__on__menuExport2(java.awt.event.ActionEvent event) { - engine.showExportFrame(); -} - /** * Test. */ @@ -120,19 +106,12 @@ <JMenuBar> <JMenu id='menuFile'> - <!--JMenuItem id='menuConnect' - onActionPerformed='engine.showToolBar()'/--> - <JMenu id='menuConnectBis' enabled='false'/> + <JMenu id='menuConnect' enabled='false'/> <JMenuItem id='menuDisconnect' enabled='false' - onActionPerformed='engine.disposeToolBar()'/> + onActionPerformed='engine.disconnection()'/> <JSeparator/> - <!--JMenuItem id='menuImport' - onActionPerformed='engine.showImportFrame()'/> - <JMenuItem id='menuExport' - onActionPerformed='engine.showExportFrame()'/> - <JSeparator/--> - <JMenu id='menuImportBis' enabled='false'/> - <JMenu id='menuExportBis' enabled='false'/> + <JMenu id='menuImport' enabled='false'/> + <JMenu id='menuExport' enabled='false'/> <JSeparator/> <JMenuItem id='menuExit' onActionPerformed='engine.close()'/> @@ -171,38 +150,6 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' id='mainPanel'> - <JToolBar id='toolBar' constraints='BorderLayout.NORTH' opaque='true' > - <JLabel text="name base :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > - <item value='OurHashMap' selected='true'/> - </JAXXComboBox> - <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/> - <JTextField id='login'/> - <JLabel text="password :" actionIcon='password_16' styleClass='boldUnderline'/> - <JPasswordField id='password'/> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/> - </JToolBar> - - <JInternalFrame id='importFrame' title="Import Database" width='300' height='60' resizable='false' visible='false' opaque='true' > - <JPanel id='importPanel'> - <JLabel text="Importer :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='importer' onActionPerformed='engine.doSomething()' > - <item value=' ' selected='true'/> - </JAXXComboBox> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.importBase()'/> - </JPanel> - </JInternalFrame> - - <JInternalFrame id='exportFrame' title="Export Database" width='300' height='60' resizable='false' visible='false' opaque='true' > - <JPanel id='exportPanel'> - <JLabel text="Exporter :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='exporter' onActionPerformed='engine.doSomething()' > - <item value=' ' selected='true'/> - </JAXXComboBox> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.exportBase()'/> - </JPanel> - </JInternalFrame> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 22:47:04 UTC (rev 227) @@ -13,7 +13,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.Item; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; @@ -40,14 +39,6 @@ */ private BigTable bigTable; /** - * Importer. - */ -// private Importer importer; - /** - * Exporter. - */ -// private Exporter exporter; - /** * classe instance (singleton pattern). */ private static ApplicationEngine instance = null; @@ -118,66 +109,6 @@ pluginLoader.loadPlugin(pluginPath); LOG.info("getAllPluginNames : " + pluginLoader.getAllPluginNames()); - -// MainUI ui = MainUI.getInstance(); -// for (Plugin btPlugin : pluginLoader.getAllPlugin(BigTable.class)) { -// final String btName = btPlugin.getPluginName(); -// jaxx.runtime.swing.Item bigTableItem = -// new jaxx.runtime.swing.Item(btName, null, btName, true); -// ui.getNameBase().addItem(bigTableItem); -// ui.getNameBase().setSelectedItem(bigTableItem); -// -// JMenuItem menuItem = new JMenuItem(btName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// connection(btName); -// } -// }); -// ui.getMenuConnectBis().add(menuItem); -// ui.getMenuConnectBis().setEnabled(true); -// } -// for (Plugin imPlugin : pluginLoader.getAllPlugin(Importer.class)) { -// final String imName = imPlugin.getPluginName(); -//// jaxx.runtime.swing.Item importerItem = -//// new jaxx.runtime.swing.Item(imName, null, imName, true); -//// ui.getImporter().addItem(importerItem); -//// ui.getImporter().setSelectedItem(importerItem); -// -// JMenuItem menuItem = new JMenuItem(imName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// importBase(imName); -// } -// }); -// ui.getMenuImportBis().add(menuItem); -// ui.getMenuImportBis().setEnabled(true); -// } -// for (Plugin exPlugin : pluginLoader.getAllPlugin(Exporter.class)) { -// final String exName = exPlugin.getPluginName(); -//// jaxx.runtime.swing.Item exporterItem = -//// new jaxx.runtime.swing.Item(exName, null, exName, true); -//// ui.getExporter().addItem(exporterItem); -//// ui.getExporter().setSelectedItem(exporterItem); -// -// JMenuItem menuItem = new JMenuItem(exName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// exportBase(exName); -// } -// }); -// ui.getMenuExportBis().add(menuItem); -// ui.getMenuExportBis().setEnabled(true); -// } -// for (Plugin exPlugin : pluginLoader.getAllPlugin(Monitoring.class)) { -// Monitoring monitor = (Monitoring) exPlugin; -// monitor.display(); -// } } } @@ -199,40 +130,11 @@ } /** - * Show toolBar in order to connect. + * Disconnect BigTable. */ - public void showToolBar() { + public void disconnection() { MainUI ui = MainUI.getInstance(); - ui.getToolBar().setVisible(true); - } - - /** - * Show importBar in order to connect. - */ - public void showImportFrame() { - LOG.info("showImportFrame"); - MainUI ui = MainUI.getInstance(); - boolean visible = ui.getImportFrame().isVisible(); - ui.getImportFrame().setVisible(!visible); - } - - /** - * Show exportBar in order to connect. - */ - public void showExportFrame() { - LOG.info("showExportBar"); - MainUI ui = MainUI.getInstance(); - boolean visible = ui.getExportFrame().isVisible(); - ui.getExportFrame().setVisible(!visible); - } - - /** - * Hide toolBar in order to disconnect. - */ - public void disposeToolBar() { - MainUI ui = MainUI.getInstance(); setBigTable(null); - ui.getToolBar().setVisible(false); clean(ui); } @@ -248,76 +150,6 @@ /** * Try to connect the user to a database. */ - public void connection() { - - MainUI ui = MainUI.getInstance(); -// -// //update menu -// ui.getMenuDisconnect().setEnabled(true); - - Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); - String nameBase = selectedItems.getValue().toString(); - - this.connection(nameBase); -// String login = ui.getLogin().getText(); -// char[] password = ui.getPassword().getPassword(); -// -// LOG.info("nameBase: " + nameBase -// + " login: " + login -// + " mdp: " + password); -// if ("OurHashMap".equals(nameBase)) { -// bigTable = new OurHashMap2(); -// } else { -// bigTable = (BigTable) pluginLoader.getPlugin(nameBase); -// } -// -// { -// bigTable.createTable("table1"); -// bigTable.createTable("table2"); -// bigTable.createColumn("table1", "column1"); -// bigTable.createColumn("table1", "column2"); -// bigTable.createColumn("table2", "column3"); -// bigTable.createColumn("table2", "column4"); -// bigTable.createColumn("table2", "column5"); -// -// bigTable.put("table1", "column1", "1", "content1"); -// bigTable.put("table1", "column1", "2", "content2"); -// bigTable.put("table1", "column2", "3", "content3"); -// bigTable.put("table1", "column2", "4", "content4"); -// -// bigTable.put("table2", "column3", "5", "content5"); -// bigTable.put("table2", "column3", "6", "content6"); -// bigTable.put("table2", "column4", "7", "content7"); -// bigTable.put("table2", "column4", "8", "content8"); -// bigTable.put("table2", "column5", "9", "content9"); -// bigTable.put("table2", "column5", "10", "content10"); -// } -// -// //connection verification -// boolean goodUse = true; -// goodUse = bigTable.connect(new Properties()); -// -// if (goodUse) { -// -// //update tree -// uptableNavigationTree(ui.getNavigation(), nameBase); -// -// String connexionOk = _("connectionValid"); -// ui.displayMessage(connexionOk, 0); -// ui.getNavigation().repaint(); -// ui.getNavigation().revalidate(); -// } else { -// //display error -// String connexionNok = _("connectionError"); -// ui.displayMessage(connexionNok, 2); -// JOptionPane.showMessageDialog(null, _("connectionError")); -// } - - } - - /** - * Try to connect the user to a database. - */ public void connection(String nameBase) { int response = 0; @@ -345,28 +177,6 @@ bigTable = (BigTable) pluginLoader.getPlugin(nameBase); -// { -// bigTable.createTable("table1"); -// bigTable.createTable("table2"); -// bigTable.createColumn("table1", "column1"); -// bigTable.createColumn("table1", "column2"); -// bigTable.createColumn("table2", "column3"); -// bigTable.createColumn("table2", "column4"); -// bigTable.createColumn("table2", "column5"); -// -// bigTable.put("table1", "column1", "1", "content1"); -// bigTable.put("table1", "column1", "2", "content2"); -// bigTable.put("table1", "column2", "3", "content3"); -// bigTable.put("table1", "column2", "4", "content4"); -// -// bigTable.put("table2", "column3", "5", "content5"); -// bigTable.put("table2", "column3", "6", "content6"); -// bigTable.put("table2", "column4", "7", "content7"); -// bigTable.put("table2", "column4", "8", "content8"); -// bigTable.put("table2", "column5", "9", "content9"); -// bigTable.put("table2", "column5", "10", "content10"); -// } - //connection verification boolean goodUse = true; goodUse = bigTable.connect(new Properties()); @@ -515,72 +325,6 @@ /** * Import database from a file. - */ - public void importBase() { - - /** Get importer plugin. */ - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getImporter().getSelectedJaxxItem(); - String importerName = selectedItem.getValue().toString(); - - this.importBase(importerName); -// Importer importer = (Importer) pluginLoader.getPlugin(importerName); -// -// /** Create FileChooser and set FileFilter. */ -// JFileChooser jfc = new JFileChooser(lastPath); -// jfc.setFileFilter(importer.getFileFilter()); -// -// /** ShowOpenDialog and get the return value. */ -// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); -// -// if( JFileChooser.APPROVE_OPTION == jfcReturn ) { -// -// lastPath = jfc.getSelectedFile().getAbsolutePath(); -// -// File importFile = jfc.getSelectedFile(); -// LOG.info("chosen file for import : " + importFile.getPath()); -// -// /** Import. */ -// importer.importFrom(bigTable, importFile); -// clean(ui); -// uptableNavigationTree(ui.getNavigation(), importFile.getName()); -// } - } - - /** - * Export the database into a file. - */ - public void exportBase() { - - /** Get exporter plugin. */ - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getExporter().getSelectedJaxxItem(); - String exporterName = selectedItem.getValue().toString(); - - this.exportBase(exporterName); -// Exporter exporter = (Exporter) pluginLoader.getPlugin(exporterName); -// -// /** Create FileChooser and set FileFilter. */ -// JFileChooser jfc = new JFileChooser(lastPath); -// jfc.setFileFilter(exporter.getFileFilter()); -// -// /** ShowOpenDialog and get the return value. */ -// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); -// -// if (JFileChooser.APPROVE_OPTION == jfcReturn) { -// -// lastPath = jfc.getSelectedFile().getAbsolutePath(); -// -// File importFile = jfc.getSelectedFile(); -// LOG.info("chosen file for export : " + importFile.getPath()); -// -// /** Export */ -// exporter.exportTo(bigTable, importFile); -// } - } - - /** - * Import database from a file. * @param importName the name of the importer plugin. */ public void importBase(final String importerName) { 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 20:14:06 UTC (rev 226) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 22:47:04 UTC (rev 227) @@ -195,7 +195,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -221,7 +221,7 @@ */ @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 22:47:04 UTC (rev 227) @@ -195,7 +195,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -221,7 +221,7 @@ */ @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 22:47:04 UTC (rev 227) @@ -234,7 +234,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); @@ -260,7 +260,7 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 22:47:04 UTC (rev 227) @@ -4,7 +4,6 @@ */ package org.nuiton.mapstoragemanager.plugins.importer; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -207,7 +206,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); @@ -226,6 +225,7 @@ if (!menuImport.isEnabled()) { menuImport.setEnabled(true); } + System.out.println(menuImport.hashCode()); } /** @@ -233,7 +233,7 @@ */ @Override public void unload() { - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 22:47:04 UTC (rev 227) @@ -4,18 +4,12 @@ */ 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; @@ -26,7 +20,6 @@ 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; /** * @@ -316,46 +309,48 @@ /** * 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("menuItemImport"); - 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); - } - - - +// public void testLoadUnLoad() { +// JMenu menuImport; +// Set<Component> components; +// JMenuItem menuItem = null; +// +// Importer fromXML = new FromXML(); +// try { +// Field fMenuItem +// = fromXML.getClass().getDeclaredField("menuItemImport"); +// 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(); - +// +// menuImport = MainUI.getInstance().getMenuImportBis(); +// System.out.println(menuImport.e); // components = new HashSet<Component>(); -// for (Component c : menuImport.getComponents()) { -// components.add(c); +// for (int i = 0 ; i < menuImport.getItemCount() ; i++) { +// System.out.println(menuImport.getItem(i)); +// components.add(menuImport.getItem(i)); // } // -// assertTrue(components.contains(menuItem)); +// assertEquals(true, components.contains(menuItem)); // // fromXML.unload(); // +// menuImport = MainUI.getInstance().getMenuImportBis(); // components = new HashSet<Component>(); -// for (Component c : menuImport.getComponents()) { -// components.add(c); +// for (int i = 0 ; i < menuImport.getItemCount() ; i++) { +// components.add(menuImport.getItem(i)); // } // -// assertFalse(components.contains(menuItem)); - - } +// assertEquals(false, 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 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 22:47:04 UTC (rev 227) @@ -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; @@ -205,7 +204,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); @@ -231,7 +230,7 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 22:47:04 UTC (rev 227) @@ -266,7 +266,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); @@ -292,7 +292,7 @@ */ @Override public void unload() { - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); } 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 20:14:06 UTC (rev 226) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 22:47:04 UTC (rev 227) @@ -371,7 +371,7 @@ // @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -397,7 +397,7 @@ */ // @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); }