- Mapstoragemanager-commits - mailman.cloud.codelutin.com

r260 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/engine resources/i18n
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 15:09:27 +0100 (Thu, 18 Mar 2010) New Revision: 260 Log: Am?\195?\169lioration BootLoaderManager. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -66,6 +66,8 @@ LOG.error(ex, ex); } + this.getBootLoaderPanel().removeAll(); + /** * For each Jar file */ @@ -74,7 +76,7 @@ final String propertyValue = properties.getProperty(propertyName); LOG.info(propertyName + " : " + propertyValue); - final JCheckBox checkBox = new JCheckBox(); + final JCheckBox checkBox = new JCheckBox(propertyName); /** If propertyValue equals true, checkBox selected, * else not selected. */ @@ -101,13 +103,7 @@ } }); - final JLabel label = new JLabel(propertyName); - - final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - panel.add(checkBox); - panel.add(label); - - this.getBootLoaderPanel().add(panel); + this.getBootLoaderPanel().add(checkBox); } } @@ -122,13 +118,11 @@  <JMenuBar> <JMenu id='menuPlugin'> - <JMenuItem id='menuPluginLoad' - onActionPerformed='this.loadAPlugin()' /> <JMenuItem id='refreshJarList' onActionPerformed='this.refreshJarList()' /> </JMenu> </JMenuBar> - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> </JPanel> </Application> \ No newline at end of file Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 14:09:27 UTC (rev 260) @@ -95,6 +95,17 @@ mnemonic:O; } +#menuPluginBootLoaderManager { + text:"mapstoragemanager.action.pluginbootloadermanager"; + toolTipText:"mapstoragemanager.action.pluginbootloadermanager.tip"; +} + +#refreshJarList { + text:"bootloadermanager.refreshJarList"; +} + + + #menuHelp { text:"mapstoragemanager.action.menuHelp"; toolTipText:"mapstoragemanager.action.menuHelp.tip"; 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-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:09:27 UTC (rev 260) @@ -154,9 +154,9 @@ onActionPerformed='engine.loadAPlugin()'/> <JMenuItem id='menuPluginSave' onActionPerformed='engine.savePlugin()'/> - <JSeparator/> <JMenuItem id='menuPluginBootLoaderManager' onActionPerformed='BootLoaderManager.getInstance().setVisible(true)'/> + <JSeparator/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 14:09:27 UTC (rev 260) @@ -14,15 +14,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFileChooser; @@ -43,7 +40,6 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=Load plugins mapstoragemanager.action.pluginsave=Handle plugin save mapstoragemanager.action.pluginsave.tip=Handle plugin save +mapstoragemanager.action.pluginbootloadermanager=Manage plugins jar loaded at startup +mapstoragemanager.action.pluginbootloadermanager.tip=Manage plugins jar loaded at startup +bootLoaderManager.refreshJarList=Refresh plugin list mapstoragemanager.action.preferences=Preferences mapstoragemanager.action.preferences.tip= mapstoragemanager.action.uk=English Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 13:57:07 UTC (rev 259) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 14:09:27 UTC (rev 260) @@ -38,6 +38,9 @@ mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier mapstoragemanager.action.pluginsave=G\u00E9rer sauvegarde mapstoragemanager.action.pluginsave.tip=G\u00E8re la sauvegarde des plugins au relancement de l'application +mapstoragemanager.action.pluginbootloadermanager=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +mapstoragemanager.action.pluginbootloadermanager.tip=G\u00E9rer les plugins lanc\u00E9s au d\u00E9marrage +bootLoaderManager.refreshJarList=Rafraichir la liste des plugins mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences mapstoragemanager.action.preferences.tip=Configurer l'application mapstoragemanager.action.uk=Anglais

1 0

r259 - trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring
by fgilet＠users.nuiton.org March 18, 2010

March 18, 2010

Author: fgilet Date: 2010-03-18 14:57:07 +0100 (Thu, 18 Mar 2010) New Revision: 259 Log: Correction de rafraichissement du plugin de monitoring Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 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 13:50:10 UTC (rev 258) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 13:57:07 UTC (rev 259) @@ -123,7 +123,8 @@ this.setVisible(true); }else{ nbFreePluginPanel.add(content); - MainUI.getInstance().repaint(); + nbFreePluginPanel.repaint(); + nbFreePluginPanel.revalidate(); } }

1 0

r258 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine
by fgilet＠users.nuiton.org March 18, 2010

March 18, 2010

Author: fgilet Date: 2010-03-18 14:50:10 +0100 (Thu, 18 Mar 2010) New Revision: 258 Log: Gestion de rechargement des plugins fonctionnelle Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:38:26 UTC (rev 257) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:50:10 UTC (rev 258) @@ -7,10 +7,18 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Properties; import java.util.Set; import javax.swing.AbstractButton; @@ -157,17 +165,38 @@ */ public void savePlugin() { PluginLoader pluginLoaderTemp = getPluginLoader(); - final JPanel buttonDisplay = new JPanel(new GridLayout(3,20)); + final JPanel buttonDisplay = new JPanel(new GridLayout(20,3)); final JPanel content = new JPanel(new BorderLayout()); - JFrame frameTemp = new JFrame(); + final JFrame frameTemp = new JFrame(); + List<String> nomPlugins = new ArrayList<String>(); + final Map<String,String> mapPlugins = new HashMap<String,String>(); //check all plugins in .properties - for(final Plugin plugin : pluginLoaderTemp.getAllPlugin(null)) { + final Properties properties = new Properties(); + final File propertiesFile = new File(MSM_PLUGINS_DIR, ".properties"); + try { + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + Set<Object> props = properties.keySet(); + for (Object property : props) { + String nomPlugin = property.toString(); + nomPlugin = nomPlugin.substring(nomPlugin.lastIndexOf("/")+1); + nomPlugins.add(nomPlugin); + mapPlugins.put(nomPlugin, property.toString()); + } - String pluginName = plugin.getPluginName(); + } catch(FileNotFoundException e){ + LOG.fatal(e, e); + } catch (IOException ioe){ + LOG.fatal(ioe, ioe); + } - JCheckBox pluginButton = new JCheckBox(pluginName); + + + for(final String nomPlugin : nomPlugins) { + + JCheckBox pluginButton = new JCheckBox(nomPlugin); pluginButton.setSize(100, 20); buttonDisplay.add(pluginButton); @@ -179,13 +208,21 @@ @Override public void actionPerformed(ActionEvent e) { - Component[] component = buttonDisplay.getComponents(); - for(final Component comp : component){ - JButton buttonTemp = (JButton) comp; + Component[] components = buttonDisplay.getComponents(); + for(final Component comp : components){ + JCheckBox buttonTemp = (JCheckBox) comp; //if disable, write false into .properties - if(!buttonTemp.isEnabled()){ + if(!buttonTemp.isSelected()){ + properties.put(mapPlugins.get(buttonTemp.getText()), "false"); + try { + properties.store(new FileOutputStream(propertiesFile), null); + + } catch (IOException ex) { + LOG.error(ex, ex); + } } } + frameTemp.dispose(); } });

1 0

r257 - trunk/msm/src/test/java/org/nuiton/mapstoragemanager
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 14:38:26 +0100 (Thu, 18 Mar 2010) New Revision: 257 Log: Forc?\195?\169ment si le dossier core n'est pas supprim?\195?\169 sur le svn... (mais pourquoi ne l'a-t-il pas vir?\195?\169 ?). Removed: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/

1 0

r256 - in trunk/msm/src/test/java/org/nuiton/mapstoragemanager: . pluginloader
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 14:33:07 +0100 (Thu, 18 Mar 2010) New Revision: 256 Log: et maintenant ? Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java Added: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java (rev 0) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoaderTest.java 2010-03-18 13:33:07 UTC (rev 256) @@ -0,0 +1,248 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.pluginloader; + +import com.opensymphony.xwork2.interceptor.annotations.After; +import java.io.File; +import java.lang.reflect.Field; +import java.net.MalformedURLException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import javax.swing.filechooser.FileFilter; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; + +/** + * + * @author Dorian Langlais + */ +public class PluginLoaderTest extends TestCase { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(PluginLoaderTest.class); + + /** + * pluginsMapActual. + */ + Map<String, Plugin> pluginsMapActual; + /** + * pluginLoader. + */ + PluginLoader pl; + + /** + * initialisation to prepare test. + */ + @Override + public void setUp() { + /** + * Initialisation. + */ + try { + String basedir = new File("").getAbsolutePath(); + File pluginFolder = new File(basedir, "/src/test/resources"); + pl = new PluginLoader(pluginFolder.getAbsolutePath(), + this.getClass().getClassLoader()); + Field fPlugins = pl.getClass().getDeclaredField("plugins"); + fPlugins.setAccessible(true); + pluginsMapActual = (Map<String, Plugin>) fPlugins.get(pl); + + /** Remise à zéro de la Map */ + pluginsMapActual.clear(); + } catch (IllegalArgumentException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (IllegalAccessException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (NoSuchFieldException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (SecurityException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } catch (MalformedURLException ex) { + LOG.fatal(ex, ex); + Assert.fail(); + } + } + + /** + * + */ + @Override + @After + public void tearDown() { + String basedir = new File("").getAbsolutePath(); + File properties = new File(basedir, "/src/test/resources/.properties"); + properties.deleteOnExit(); + } + + public void testGetAllPluginNames() { + this.setUp(); + + Set<String> pluginsNamesExpected = new HashSet<String>(); + Set<String> pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + pluginsNamesExpected.add("Test"); + pluginsMapActual.put("Test", null); + pluginsNamesActual = pl.getAllPluginNames(); + + assertEquals(pluginsNamesExpected, pluginsNamesActual); + + } + + public void testGetAllPlugin() { + this.setUp(); + + Collection<Plugin> pluginsExpected = new HashSet<Plugin>(); + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertEquals(pluginsExpected, pluginsActual); + + Plugin test = new Importer() { + + @Override + public void importFrom(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public String getPluginName() { + return "test"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + + }; + + pluginsExpected.clear(); + pluginsExpected.add(test); + pluginsMapActual.put(test.getPluginName(), test); + pluginsActual = pl.getAllPlugin(Importer.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(Exporter.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsActual = pl.getAllPlugin(BigTable.class); + assertEquals(pluginsExpected, pluginsActual); + + pluginsExpected.clear(); + pluginsExpected.add(test); + pluginsActual = pl.getAllPlugin(null); + assertEquals(pluginsExpected, pluginsActual); + + } + + public void testGetPlugin() { + this.setUp(); + + Collection<Plugin> pluginsActual = pl.getAllPlugin(null); + + assertNull(pl.getPlugin(null)); + + Plugin testImporter = new Importer() { + + @Override + public void importFrom(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public String getPluginName() { + return "testImporter"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + }; + Plugin testExporter = new Exporter() { + + @Override + public void exportTo(BigTable bigTable, File file) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public FileFilter getFileFilter() { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override + public String getPluginName() { + return "testExporter"; + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void load() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void unload() { + throw new UnsupportedOperationException("Not supported yet."); + } + }; + + pluginsMapActual.put(testImporter.getPluginName(), testImporter); + pluginsMapActual.put(testExporter.getPluginName(), testExporter); + + assertNull(pl.getPlugin("")); + assertEquals(testImporter, pl.getPlugin(testImporter.getPluginName())); + assertEquals(testExporter, pl.getPlugin(testExporter.getPluginName())); + } +}

1 0

r255 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui: . engine
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 14:28:20 +0100 (Thu, 18 Mar 2010) New Revision: 255 Log: Bon, normalement le build passe maintenant. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:28:20 UTC (rev 255) @@ -3,7 +3,7 @@  <script> <![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * Logger. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:20:41 UTC (rev 254) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:28:20 UTC (rev 255) @@ -79,6 +79,22 @@ new File(new File("").getAbsolutePath()).getParentFile(); /** + * Getter for MSM_BASEDIR. + * @return MSM_BASEDIR + */ + public static File getMSM_BASEDIR() { + return MSM_BASEDIR; + } + + /** + * Getter for MSM_PLUGINS_DIR. + * @return MSM_PLUGINS_DIR + */ + public static File getMSM_PLUGINS_DIR() { + return MSM_PLUGINS_DIR; + } + + /** * msm plugin dir. */ private static final File MSM_PLUGINS_DIR =

1 0

r254 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 14:20:41 +0100 (Thu, 18 Mar 2010) New Revision: 254 Log: Ajout d'un BootLoaderManager pour les plugins ?\195?\160 charger au d?\195?\169marrage. J'ai l'impression que tu n'as pas re?\195?\167u mon sms florent... Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/BootLoaderManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -0,0 +1,134 @@ +<Application id='bootLoaderManager' width='640' height='480' onWindowClosing='getInstance().setVisible(false)'> + +  + <script> + <![CDATA[ +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + +/** + * Logger. + */ +private static final Log LOG = LogFactory.getLog(BootLoaderManager.class); + +/** + * classe instance (singleton pattern). + */ +private static BootLoaderManager instance = null; + +/** + * getInstance method (singleton pattern). + * @return instance of the class + */ +public static BootLoaderManager getInstance() { + if (instance == null){ + instance = new BootLoaderManager(); + } + instance.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + instance.refreshJarList(); + return instance; +} + +/** + * loadAPlugin. + * Call the MSM instance to load a Plugin. + */ +public void loadAPlugin() { + ApplicationEngine.getInstance().loadAPlugin(); + refreshJarList(); +} + +/** + * Refresh the jar list. + * Read .properties of the pluginFolderPath. + * For each .jar file : + * - show a checkBox to load or not the plugin at startup, + * - show the .jar url. + */ +public void refreshJarList() { + + /** Load properties file of the folder. */ + final Properties properties = new Properties(); + final File propertiesFile = new File(ApplicationEngine.getInstance().getMSM_PLUGINS_DIR(), ".properties"); + try { + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + } catch (FileNotFoundException e) { + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + properties.store(fos , null); + fos.close(); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } + } catch (IOException ex) { + LOG.error(ex, ex); + } + + /** + * For each Jar file + */ + for (final String propertyName : properties.stringPropertyNames()) { + if(propertyName.endsWith(".jar")) { + final String propertyValue = properties.getProperty(propertyName); + LOG.info(propertyName + " : " + propertyValue); + + final JCheckBox checkBox = new JCheckBox(); + + /** If propertyValue equals true, checkBox selected, + * else not selected. */ + final boolean selected = "true".equals(propertyValue); + checkBox.setSelected(selected); + checkBox.addActionListener(new ActionListener() { + boolean selectedState = selected; + @Override + public void actionPerformed(ActionEvent e) { + /** Invert selected State */ + selectedState = !selectedState; + /** Modify properties */ + properties.put(propertyName, Boolean.toString(selectedState)); + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + /** Store modified properties */ + properties.store(fos , null); + fos.close(); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } + } + }); + + final JLabel label = new JLabel(propertyName); + + final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + panel.add(checkBox); + panel.add(label); + + this.getBootLoaderPanel().add(panel); + } + } + + this.getBootLoaderPanel().updateUI(); +} + ]]> + </script> + +  + <style source='MainUI.css'/> + +  + <JMenuBar> + <JMenu id='menuPlugin'> + <JMenuItem id='menuPluginLoad' + onActionPerformed='this.loadAPlugin()' /> + <JMenuItem id='refreshJarList' + onActionPerformed='this.refreshJarList()' /> + </JMenu> + </JMenuBar> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <VBox layout='{new GridLayout(0,1)}' id='bootLoaderPanel' /> + </JPanel> +</Application> \ No newline at end of file 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-18 13:11:33 UTC (rev 253) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -155,6 +155,8 @@ <JMenuItem id='menuPluginSave' onActionPerformed='engine.savePlugin()'/> <JSeparator/> + <JMenuItem id='menuPluginBootLoaderManager' + onActionPerformed='BootLoaderManager.getInstance().setVisible(true)'/> </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 13:11:33 UTC (rev 253) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 13:20:41 UTC (rev 254) @@ -12,6 +12,7 @@ * classe instance (singleton pattern). */ private static PluginManager instance = null; + /** * MenuItemPlugin. */

1 0

r253 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine msm/src/main/resources/i18n msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXM
by fgilet＠users.nuiton.org March 18, 2010

March 18, 2010

Author: fgilet Date: 2010-03-18 14:11:33 +0100 (Thu, 18 Mar 2010) New Revision: 253 Log: Refactoring Chargement de splugins au d?\195?\169marrage : ajout d'une fen?\195?\170tre pour g?\195?\169rer ?\195?\167a ! Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ Removed: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/Messages.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ 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/Cell.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureImpl.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.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-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-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/ParsingState.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/package-info.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MessageThread.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/package-info.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 13:11:33 UTC (rev 253) @@ -15,13 +15,10 @@ import static org.nuiton.i18n.I18n._; /** - * Created: 21 janv. 2010 + * application configuration. * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin - * @version $Revision: 4 $ - * <p/> - * Mise a jour: $Date: 2010-01-21 15:24:35 +0100 (jeu., 21 janv. 2010) $ par : - * $Author: tchemit $ + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public final class Main { @@ -36,7 +33,7 @@ private static Locale locale = Locale.FRANCE; /** - * Main private. + * private Main. * @param args arguments. */ private Main(final String... args) { @@ -55,7 +52,7 @@ MsmConfig config = new MsmConfig(); config.parse(args); - // chargement de la configuration des uis + // load of configuration uis SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null); final MainUI ui = MainUI.getInstance(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-18 13:11:33 UTC (rev 253) @@ -8,10 +8,9 @@ import java.util.Properties; /** - * La configuration de l'application. - * <p/> + * application configuration. * - * @author sletellier + * @author Copyright CodeLutin * @since 0.1-SNAPSHOT */ public class MsmConfig extends org.nuiton.util.ApplicationConfig { @@ -32,8 +31,6 @@ */ public MsmConfig() { - //setConfigFileName(APPLICATION_PROPERTIES); - // chargement de la configuration interne InputStream stream = getClass().getResourceAsStream( APPLICATION_PROPERTIES); @@ -52,7 +49,6 @@ } } catch (IOException ex) { LOG.fatal(ex, ex); -// throw new RuntimeException(ex); } } Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/Messages.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/Messages.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,44 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * Get strings from an external file. - * @author Crieloue Gilles - * - */ -public final class Messages { - - /** - * bundle name. - */ - private static final String BUNDLE_NAME = "core.messages"; //$NON-NLS-1$ - - /** - * resource bundle. - */ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - /** - * Constructor. - */ - private Messages() { - } - - /** - * Returns a result according to a key. - * @param key the key - * @return the matching result - */ - public static String getString(final String key) { - String ret = ""; - try { - ret = RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - ret = '!' + key + '!'; - } - return ret; - } -} Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/PluginLoader.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,4 +1,4 @@ -package org.nuiton.mapstoragemanager.core; +package org.nuiton.mapstoragemanager.pluginloader; import java.io.File; import java.io.FileInputStream; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/pluginloader/package-info.java 2010-03-18 13:11:33 UTC (rev 253) @@ -2,4 +2,4 @@ * The core architecture. * It deals with plugins discovery, loading, and such. */ -package org.nuiton.mapstoragemanager.core; +package org.nuiton.mapstoragemanager.pluginloader; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,7 +6,9 @@ /** * The interface for all the BigTable implementations. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface BigTable extends Plugin { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Exporter.java 2010-03-18 13:11:33 UTC (rev 253) @@ -5,7 +5,9 @@ /** * The interface for the exporter implementations. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Exporter extends Plugin { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Importer.java 2010-03-18 13:11:33 UTC (rev 253) @@ -5,7 +5,9 @@ /** * The interface for the importer implementations. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Importer extends Plugin { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-18 13:11:33 UTC (rev 253) @@ -12,11 +12,13 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * Class OurHashMap2. - * @author E045231P + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class OurHashMap2 implements BigTable { @@ -30,40 +32,60 @@ */ private Map<String, ArrayList<String>> mapColumn = new HashMap<String, ArrayList<String>>(); + /** * map data. */ private Map<String, String> mapData = new HashMap<String, String>(); + /** * MenuItemBigTable. */ private static JMenuItem menuItemConnect; + /** + * {@inheritDoc} + */ @Override public final boolean connect(final Properties properties) { return true; } + /** + * {@inheritDoc} + */ @Override public final void selectTable(final String table) { throw new UnsupportedOperationException("Not supported yet."); } + /** + * {@inheritDoc} + */ @Override public final void createTable(final String table) { mapTable.put(table, new ArrayList<String>()); } + /** + * {@inheritDoc} + */ @Override public final void deleteTable(final String table) { mapTable.remove(table); } + /** + * {@inheritDoc} + */ @Override public final Set<String> getTablesNames() { return mapTable.keySet(); } + /** + * {@inheritDoc} + */ @Override public final void createColumn(final String table, final String column) { // if the table exist and only if the column doesn't exist. @@ -73,6 +95,9 @@ } } + /** + * {@inheritDoc} + */ @Override public final void deleteColumn(final String table, final String column) { // if the table exist and only if the column exist. @@ -82,12 +107,18 @@ } } + /** + * {@inheritDoc} + */ @Override public final Set<String> getColumnsNames(final String table) { Set<String> columnNames = new HashSet(mapTable.get(table)); return columnNames; } + /** + * {@inheritDoc} + */ @Override public final void put(final String table, final String column, final String key, final String content) { @@ -114,18 +145,27 @@ return ret; } + /** + * {@inheritDoc} + */ @Override public final String get(final String table, final String column, final String key, final int version) { return get(table, column, key); } + /** + * {@inheritDoc} + */ @Override public final Map<String, String> getRow(final String table, final String key) { throw new UnsupportedOperationException("Not supported yet."); } + /** + * {@inheritDoc} + */ @Override public final Set<String> getKeys(final String table) { Set<String> tableKeys = new HashSet(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Plugin.java 2010-03-18 13:11:33 UTC (rev 253) @@ -2,7 +2,9 @@ /** * Interface plugin. - * @author E045231P + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Plugin { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-18 13:11:33 UTC (rev 253) @@ -89,9 +89,9 @@ mnemonic:A; } -#menuPluginShow { - text:"mapstoragemanager.action.pluginshow"; - toolTipText:"mapstoragemanager.action.pluginshow.tip"; +#menuPluginSave { + text:"mapstoragemanager.action.pluginsave"; + toolTipText:"mapstoragemanager.action.pluginsave.tip"; mnemonic:O; } 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-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 13:11:33 UTC (rev 253) @@ -4,18 +4,22 @@  <script> <![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -import org.nuiton.mapstoragemanager.core.PluginLoader; -import javax.swing.tree.*; -import static org.nuiton.i18n.I18n.n_; -import static org.nuiton.i18n.I18n._; -import javax.swing.JLabel; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.MessageThread; +import org.nuiton.mapstoragemanager.pluginloader.PluginLoader; import org.nuiton.mapstoragemanager.MsmConfig; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Plugin; -import org.nuiton.mapstoragemanager.ui.gui.MessageThread; +import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import javax.swing.JLabel; +import javax.swing.tree.*; + + + + ApplicationEngine engine = ApplicationEngine.getInstance(); /** @@ -148,9 +152,9 @@ <JMenu id='menuPlugin'> <JMenuItem id='menuPluginLoad' onActionPerformed='engine.loadAPlugin()'/> + <JMenuItem id='menuPluginSave' + onActionPerformed='engine.savePlugin()'/> <JSeparator/> -  </JMenu> <JMenu id='menuHelp'> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ApplicationEngine.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,14 +1,28 @@ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; +import java.awt.BorderLayout; +import java.awt.Component; import java.awt.Desktop; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.Enumeration; import java.util.Locale; import java.util.Properties; +import java.util.Set; +import javax.swing.AbstractButton; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JFileChooser; +import javax.swing.JFrame; import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.JTree; +import javax.swing.WindowConstants; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; @@ -17,16 +31,19 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.MsmConfig; -import org.nuiton.mapstoragemanager.core.PluginLoader; +import org.nuiton.mapstoragemanager.pluginloader.PluginLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; /** * Engine Class with methods for application user interface. - * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public final class ApplicationEngine { @@ -34,27 +51,33 @@ * Logger. */ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); + /** * BigTable. */ private BigTable bigTable; + /** * classe instance (singleton pattern). */ private static ApplicationEngine instance = null; + /** * PluginLoader. */ private static PluginLoader pluginLoader; + /** * LastPath. */ private static String lastPath; + /** * msmBasedir. */ private static final File MSM_BASEDIR = new File(new File("").getAbsolutePath()).getParentFile(); + /** * msm plugin dir. */ @@ -88,7 +111,7 @@ } /** - * do nothing. + * Load a plugin. */ public void loadAPlugin() { JFileChooser jfc = new javax.swing.JFileChooser(MSM_BASEDIR); @@ -114,8 +137,55 @@ } /** - * Method to close the application. + * Save plugin for next application reload. */ + public void savePlugin() { + PluginLoader pluginLoaderTemp = getPluginLoader(); + final JPanel buttonDisplay = new JPanel(new GridLayout(3,20)); + final JPanel content = new JPanel(new BorderLayout()); + + JFrame frameTemp = new JFrame(); + + //check all plugins in .properties + for(final Plugin plugin : pluginLoaderTemp.getAllPlugin(null)) { + + String pluginName = plugin.getPluginName(); + + JCheckBox pluginButton = new JCheckBox(pluginName); + pluginButton.setSize(100, 20); + + buttonDisplay.add(pluginButton); + } + + //save into .properties the button enabled + JButton saveButton = new JButton(_("ok")); + saveButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + Component[] component = buttonDisplay.getComponents(); + for(final Component comp : component){ + JButton buttonTemp = (JButton) comp; + //if disable, write false into .properties + if(!buttonTemp.isEnabled()){ + } + } + } + }); + + content.add(buttonDisplay, BorderLayout.CENTER); + content.add(saveButton, BorderLayout.SOUTH); + frameTemp.setContentPane(content); + frameTemp.pack(); + frameTemp.setVisible(true); + frameTemp.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + + } + + + /** + * Method to close application. + */ public void close() { System.exit(0); } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/ColumnModel.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,4 +1,4 @@ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; import java.util.ArrayList; import java.util.HashMap; @@ -13,7 +13,9 @@ /** * Model of a table content. - * @author E045231P. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ColumnModel extends AbstractTableModel { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMModel.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMModel.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,11 +1,13 @@ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; /** * Model of the navigation tree. - * @author Crieloue Gilles - Fages Amaury - Gilet Florent - Langlais Dorian + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class MSMModel extends DefaultTreeModel { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,4 +1,4 @@ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; import java.awt.BorderLayout; import javax.swing.JLabel; @@ -10,8 +10,10 @@ import org.nuiton.mapstoragemanager.ui.MainUI; /** + * Listener on tree navigation in order to display table content. * - * @author E045231P + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class MSMNavigationListener implements TreeSelectionListener { Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MessageThread.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MessageThread.java 2010-03-18 13:11:33 UTC (rev 253) @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; import javax.swing.JLabel; import org.apache.commons.logging.Log; @@ -10,8 +10,10 @@ import org.nuiton.mapstoragemanager.ui.MainUI; /** + * Display dynamic messages. * - * @author E045231P + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class MessageThread extends Thread { @@ -32,6 +34,9 @@ super(); } + /** + * {@inheritDoc} + */ @Override public void run() { MainUI ui = MainUI.getInstance(); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/TableModel.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,4 +1,4 @@ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; import java.util.Set; import javax.swing.table.AbstractTableModel; @@ -8,7 +8,9 @@ /** * Model of a table content. - * @author E045231P + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class TableModel extends AbstractTableModel { @@ -41,7 +43,7 @@ //content Set<String> tableKeys = bigTable.getKeys(table); -// Iterator<String> columnName = columnsNames.iterator(); + // Iterator<String> columnName = columnsNames.iterator(); /** * indexes Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/package-info.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/package-info.java 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/package-info.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,5 +1,5 @@ /** - * Package org.nuiton.mapstoragemanager.ui.gui + * Package org.nuiton.mapstoragemanager.ui.engine * contains all java files for actions on ui. */ -package org.nuiton.mapstoragemanager.ui.gui; +package org.nuiton.mapstoragemanager.ui.engine; Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-18 13:11:33 UTC (rev 253) @@ -36,8 +36,8 @@ mapstoragemanager.action.plugin.tip= mapstoragemanager.action.pluginload=Load mapstoragemanager.action.pluginload.tip=Load plugins -mapstoragemanager.action.pluginshow=Show -mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.pluginsave=Handle plugin save +mapstoragemanager.action.pluginsave.tip=Handle plugin save mapstoragemanager.action.preferences=Preferences mapstoragemanager.action.preferences.tip= mapstoragemanager.action.uk=English Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-18 13:11:33 UTC (rev 253) @@ -36,8 +36,8 @@ mapstoragemanager.action.plugin.tip= mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier -mapstoragemanager.action.pluginshow=Lister -mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.pluginsave=G\u00E9rer sauvegarde +mapstoragemanager.action.pluginsave.tip=G\u00E8re la sauvegarde des plugins au relancement de l'application mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences mapstoragemanager.action.preferences.tip=Configurer l'application mapstoragemanager.action.uk=Anglais 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-18 13:11:33 UTC (rev 253) @@ -11,12 +11,13 @@ import javax.swing.JMenuItem; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * Implementation of bigTable with hashMap. - * @author Dorian Langlais * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class BigHashMap implements BigTable { @@ -25,6 +26,7 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** * MenuItemBigTable. */ @@ -35,13 +37,10 @@ */ public BigHashMap() { this.tables = new HashMap<String, Table>(); - // Not used - //currentTable = null; } /** * {@inheritDoc} - * Create a new HashMap database. */ @Override public final boolean connect(final Properties properties) { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-03-18 13:11:33 UTC (rev 253) @@ -2,7 +2,9 @@ /** * Interface to present the method an a Cell. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT * * @param <T> Class of the object stored in the cells. */ Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -8,8 +8,12 @@ * Class Cell. * A cell contain different version of a content. * So a cell store objects and its version. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT + * * @param <T> The type of the stored objects. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + */ public class CellImpl<T> implements Cell<T> { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-03-18 13:11:33 UTC (rev 253) @@ -4,7 +4,9 @@ /** * Interface to present the method to implement for en Column. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT * * @param <T> Class of the object stored in the columns. */ Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -8,7 +8,9 @@ /** * Classe Column. * @param <T> Type de contenu des cellules. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ColumnImpl<T> implements Column<T> { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-03-18 13:11:33 UTC (rev 253) @@ -4,7 +4,9 @@ /** * Interface to present the methods on a Row. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT * */ public interface Row { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,7 +6,9 @@ /** * Class RowImpl. * A row of a table. - * @author Dorian Langlais. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class RowImpl implements Row { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-03-18 13:11:33 UTC (rev 253) @@ -5,7 +5,9 @@ /** * Interface to present the method on a structure. * A structure is a description of a table. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT * */ public interface Structure { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -7,8 +7,9 @@ /** * Class Structure. * Represente the mapping between a row and the column of a table. - * @author Dorian Langlais - * + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class StructureImpl implements Structure { @@ -29,6 +30,7 @@ /** * {@inheritDoc} */ + @Override public final void createColumn(final String columnName, final Class<?> columnClass) { this.structure.put(columnName, columnClass); @@ -37,6 +39,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteColumn(final String columnName) { this.structure.remove(columnName); } @@ -44,6 +47,7 @@ /** * {@inheritDoc} */ + @Override public final Class<?> getColumnClass( final String columnName) { return this.structure.get(columnName); @@ -52,6 +56,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getColumnsNames() { return this.structure.keySet(); } @@ -59,6 +64,7 @@ /** * {@inheritDoc} */ + @Override public final int hashCode() { int hash = 0; if (!structure.isEmpty()) { @@ -73,6 +79,7 @@ /** * {@inheritDoc} */ + @Override public final boolean equals(final Object o) { boolean equals = false; if (o instanceof StructureImpl) { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,7 +6,9 @@ * Interface to present the method on a table. * A table is like a table in SGBD, but in BigTable, the data are stored in * columns not in rows. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Table { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -11,7 +11,9 @@ /** * Class Table. * Implements the interface Table. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class TableImpl implements Table { @@ -41,6 +43,7 @@ /** * {@inheritDoc} */ + @Override public final <columnClass> void createColumn(final String columnName, final Class<?> columnClass) { ColumnImpl<columnClass> column = new ColumnImpl<columnClass>(); @@ -51,6 +54,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteColumn(final String columnName) { this.tableColumns.remove(columnName); this.tableStructure.deleteColumn(columnName); @@ -59,6 +63,7 @@ /** * {@inheritDoc} */ + @Override public final Row getRow(final String key) { Map<String, Object> rowContent = new HashMap<String, Object>(); for (String columnName : tableStructure.getColumnsNames()) { @@ -82,6 +87,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteRow(final String key) { for (Column column : tableColumns.values()) { column.delete(key); @@ -91,6 +97,7 @@ /** * {@inheritDoc} */ + @Override public final void put(final String columnName, final String key, final Object o) { this.tableColumns.get(columnName).put(key, o); @@ -99,6 +106,7 @@ /** * {@inheritDoc} */ + @Override public final Object get(final String columnName, final String key) { return this.tableColumns.get(columnName).get(key); } @@ -106,6 +114,7 @@ /** * {@inheritDoc} */ + @Override public final Object get(final String columnName, final String key, final long version) { return this.tableColumns.get(columnName).get(key, version); @@ -114,6 +123,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getColumnsNames() { return this.tableColumns.keySet(); } @@ -121,6 +131,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getKeys() { Set<String> keys = new HashSet<String>(); for (Column col : this.tableColumns.values()) { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-18 13:11:33 UTC (rev 253) @@ -11,11 +11,13 @@ import javax.swing.JMenuItem; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * Implementation of bigTable with hashMap. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT * */ public class BigHashMapV2 implements BigTable { @@ -25,6 +27,7 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** * MenuItemBigTable. */ @@ -35,8 +38,6 @@ */ public BigHashMapV2() { this.tables = new HashMap<String, Table>(); - // Not used - //currentTable = null; } /** Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Cell.java 2010-03-18 13:11:33 UTC (rev 253) @@ -2,7 +2,9 @@ /** * Interface to present the method an a Cell. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Cell { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/CellImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -8,7 +8,9 @@ * Class Cell. * A cell contain different version of a content. * So a cell store String and its version. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class CellImpl implements Cell { @@ -37,6 +39,7 @@ /** * {@inheritDoc} */ + @Override public final void put(final String t) { cell.put((long) cell.size(), t); //cell.put(System.currentTimeMillis(), t); @@ -45,6 +48,7 @@ /** * {@inheritDoc} */ + @Override public final String get(final Long timestamp) { return cell.get(timestamp); } @@ -52,6 +56,7 @@ /** * {@inheritDoc} */ + @Override public final String get() { if (this.cell.isEmpty()) { throw new NoSuchElementException(); @@ -68,6 +73,7 @@ /** * {@inheritDoc} */ + @Override public final String toString() { String ret = ""; if (!this.cell.isEmpty()) { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Column.java 2010-03-18 13:11:33 UTC (rev 253) @@ -4,7 +4,9 @@ /** * Interface to present the method to implement for en Column. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Column { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/ColumnImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -7,7 +7,9 @@ /** * Classe Column. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ColumnImpl implements Column { @@ -27,6 +29,7 @@ /** * {@inheritDoc} */ + @Override public final String get(final String key, final Long timestamp) { return this.column.get(key).get(timestamp); } @@ -34,6 +37,7 @@ /** * {@inheritDoc} */ + @Override public final String get(final String key) { if (this.column.get(key) == null) { throw new NoSuchElementException(); @@ -44,6 +48,7 @@ /** * {@inheritDoc} */ + @Override public final void put(final String key, final String content) { if (this.column.keySet().contains(key)) { this.column.get(key).put(content); @@ -55,6 +60,7 @@ /** * {@inheritDoc} */ + @Override public final void delete(final String key) { this.column.remove(key); } @@ -62,6 +68,7 @@ /** * {@inheritDoc} */ + @Override public final String toString() { String ret = ""; @@ -75,6 +82,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getKeys() { return this.column.keySet(); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Row.java 2010-03-18 13:11:33 UTC (rev 253) @@ -4,8 +4,9 @@ /** * Interface to present the methods on a Row. - * @author Dorian Langlais * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Row { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/RowImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -36,6 +36,7 @@ /** * {@inheritDoc} */ + @Override public final Structure getRowStructure() { return rowStructure; } @@ -43,6 +44,7 @@ /** * {@inheritDoc} */ + @Override public final Map<String, String> getRowContent() { return rowContent; } @@ -50,6 +52,7 @@ /** * {@inheritDoc} */ + @Override public final String toString() { String ret; ret = rowContent.values().toString(); @@ -59,6 +62,7 @@ /** * {@inheritDoc} */ + @Override public final String getContent(final String columnName) { return rowContent.get(columnName); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Structure.java 2010-03-18 13:11:33 UTC (rev 253) @@ -5,8 +5,9 @@ /** * Interface to present the method on a structure. * A structure is a description of a table. - * @author Dorian Langlais * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Structure { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/StructureImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -28,6 +28,7 @@ /** * {@inheritDoc} */ + @Override public final void createColumn(final String columnName) { this.structure.add(columnName); } @@ -35,6 +36,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteColumn(final String columnName) { this.structure.remove(columnName); } @@ -42,6 +44,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getColumnsNames() { return this.structure; } @@ -49,6 +52,7 @@ // /** // * {@inheritDoc} // */ +// @Override // public final int hashCode() { // if (structure.isEmpty()) { // return 0; @@ -64,6 +68,7 @@ // /** // * {@inheritDoc} // */ +// @Override // public final boolean equals(Object o) { // if (o instanceof StructureImpl) { // StructureImpl another = (StructureImpl) o; @@ -78,6 +83,7 @@ /** * {@inheritDoc} */ + @Override public final String toString() { String ret = ""; for (String key : this.structure) { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,7 +6,9 @@ * Interface to present the method on a table. * A table is like a table in SGBD, but in BigTable, the data are stored in * columns not in rows. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public interface Table { Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-18 13:11:33 UTC (rev 253) @@ -41,6 +41,7 @@ /** * {@inheritDoc} */ + @Override public final <columnClass> void createColumn(final String columnName) { Column column = new ColumnImpl(); this.tableColumns.put(columnName, column); @@ -50,6 +51,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteColumn(final String columnName) { this.tableColumns.remove(columnName); this.tableStructure.deleteColumn(columnName); @@ -58,6 +60,7 @@ /** * {@inheritDoc} */ + @Override public final Row getRow(final String key) { Map<String, String> rowContent = new HashMap<String, String>(); for (String columnName : tableStructure.getColumnsNames()) { @@ -81,6 +84,7 @@ /** * {@inheritDoc} */ + @Override public final void deleteRow(final String key) { for (Column column : tableColumns.values()) { column.delete(key); @@ -90,6 +94,7 @@ /** * {@inheritDoc} */ + @Override public final void put(final String columnName, final String key, final String content) { this.tableColumns.get(columnName).put(key, content); @@ -98,6 +103,7 @@ /** * {@inheritDoc} */ + @Override public final String get(final String columnName, final String key) { return this.tableColumns.get(columnName).get(key); } @@ -105,6 +111,7 @@ /** * {@inheritDoc} */ + @Override public final String get(final String columnName, final String key, final long version) { return this.tableColumns.get(columnName).get(key, version); @@ -113,6 +120,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getColumnsNames() { return this.tableColumns.keySet(); } @@ -120,6 +128,7 @@ /** * {@inheritDoc} */ + @Override public final Set<String> getKeys() { Set<String> keys = new HashSet<String>(); for (Column col : this.tableColumns.values()) { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-18 13:11:33 UTC (rev 253) @@ -24,11 +24,13 @@ import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** - * A Class to export in xml files the content of Hbase database. - * @author Dorian Langlais + * A Class to export in xml files the content of a database. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ToXML implements Exporter { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-18 13:11:33 UTC (rev 253) @@ -22,11 +22,13 @@ import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** + * A Class to import in xml files the content of a database. * - * @author Dorian Langlais + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class FromXML implements Importer { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-18 13:11:33 UTC (rev 253) @@ -18,7 +18,7 @@ import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; @@ -26,8 +26,10 @@ /** - * A Class to export in xml files the content of Hbase database. - * @author Dorian Langlais + * A XML Parser - using pullparsing - to export database from xml files. + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ToXMLXPP3 implements Exporter { 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-18 13:11:33 UTC (rev 253) @@ -17,14 +17,16 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; /** * A XML Parser - using pullparsing - to import database from xml files. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class FromXMLXPP3 implements Importer { @@ -62,6 +64,7 @@ /** * {@inheritDoc} */ + @Override public void importFrom(BigTable bigTable, File file) { try { @@ -241,6 +244,7 @@ /** * {@inheritDoc} */ + @Override public FileFilter getFileFilter() { return fileFilter; } @@ -248,6 +252,7 @@ /** * {@inheritDoc} */ + @Override public String getPluginName() { return this.getClass().getSimpleName(); } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/ParsingState.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/ParsingState.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/ParsingState.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,8 +6,10 @@ package org.nuiton.mapstoragemanager.plugins.importer; /** + * Description of parsing state. * - * @author Dorian Langlais + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public enum ParsingState { START, 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-18 11:27:51 UTC (rev 252) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-18 13:11:33 UTC (rev 253) @@ -25,11 +25,13 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; /** * A plugin for MSM using HBase API. - * @author Dorian Langlais, Crieloue Gilles + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class HBase /*implements BigTable*/ { Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-18 13:11:33 UTC (rev 253) @@ -1,36 +0,0 @@ - -package org.nuiton.mapstoragemanager.plugins.hbase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.MasterNotRunningException; - - - -public class Main { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(HBase.class); - - private Main() { - String tableName = "myTable"; - String columnName = "myColumn"; - String contentValue = "val"; - String keyValue="key"; - try { - HBase hb = new HBase(); - hb.createTable(tableName); - hb.createColumn(tableName, columnName); - hb.put(tableName, columnName, keyValue, contentValue); - //LOG.trace(hb.get(tableName, columnName, keyValue)); - } catch (MasterNotRunningException ex) { - LOG.fatal(ex, ex); - } - } - - public static void main(String[] args){ - new Main(); - } -} \ No newline at end of file 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 11:27:51 UTC (rev 252) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 13:11:33 UTC (rev 253) @@ -14,8 +14,10 @@ import org.nuiton.mapstoragemanager.ui.MainUI; /** + * Class to show remaining space * - * @author E045231P + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public class ShowDiskSpace extends JFrame implements Plugin { @@ -23,14 +25,17 @@ * Number for division byte -> Mb -> Gb. */ private static final int DIV = 1024; + // /** // * Width of the frame. // */ // private static final int FRAME_WIDTH = 300; + // /** // * Height of the frame. // */ // private static final int FRAME_HEIGHT = 300; + /** * MenuItemBigTable. */ @@ -52,7 +57,8 @@ JPanel content = new JPanel(); File f = new File(new File("").getAbsolutePath()).getParentFile(); if (f.exists()) { - + + //show free disk space final long freeSpaceByte = f.getFreeSpace(); final long totalSpaceByte = f.getTotalSpace(); final long usableSpaceByte = f.getUsableSpace(); @@ -84,6 +90,7 @@ content.setLayout(new GridLayout(rows, cols)); } + //show free memory Runtime runtime = Runtime.getRuntime(); final long freeMemoryByte = runtime.freeMemory(); @@ -145,10 +152,8 @@ 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); Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-18 13:11:33 UTC (rev 253) @@ -6,15 +6,19 @@ package org.nuiton.mapstoragemanager.plugins.pluginmanager; import java.util.Locale; + import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; + /** + * Main. * - * @author Dorian Langlais + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public final class Main { @@ -28,6 +32,9 @@ */ private static Locale locale = Locale.FRANCE; + /** + * Private constructor. + */ private Main() { I18n.setInitializer(new DefaultI18nInitializer("msm-pluginmanager-i18n")); @@ -52,7 +59,6 @@ }); } - /** * Main to test the PluginManager alone. * @param args args. Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-18 13:11:33 UTC (rev 253) @@ -3,8 +3,8 @@  <script> <![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -import org.nuiton.mapstoragemanager.core.PluginLoader; +import org.nuiton.mapstoragemanager.ui.engine.ApplicationEngine; +import org.nuiton.mapstoragemanager.pluginloader.PluginLoader; import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-18 11:27:51 UTC (rev 252) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-18 13:11:33 UTC (rev 253) @@ -11,7 +11,9 @@ /** * This class is used to get the view of a plugin. - * @author Dorian Langlais + * + * @author Copyright CodeLutin + * @since 0.1-SNAPSHOT */ public final class PluginView {

1 0

r252 - trunk/plugins
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

Author: dlanglais Date: 2010-03-18 12:27:51 +0100 (Thu, 18 Mar 2010) New Revision: 252 Log: Suppression du fichier .properties (Il ne doit pas ?\195?\170tre mis sur le svn -> configuration locale). Removed: trunk/plugins/.properties Deleted: trunk/plugins/.properties =================================================================== --- trunk/plugins/.properties 2010-03-18 09:23:25 UTC (rev 251) +++ trunk/plugins/.properties 2010-03-18 11:27:51 UTC (rev 252) @@ -1,9 +0,0 @@ -#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

1 0

r251 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/core msm-monitoring-plugins/src/main/java/org/nuiton/monitoring plugins
by dlanglais＠users.nuiton.org March 18, 2010

March 18, 2010

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

1 0