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

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

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

March 18, 2010

Author: fgilet Date: 2010-03-18 09:47:47 +0100 (Thu, 18 Mar 2010) New Revision: 250 Log: ajout de la fonction unload dans le plugin de monitoring Added: trunk/plugins/.properties 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-17 14:00:03 UTC (rev 249) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 08:47:47 UTC (rev 250) @@ -31,6 +31,10 @@ // * Height of the frame. // */ // private static final int FRAME_HEIGHT = 300; + /** + * MenuItemBigTable. + */ + private static JMenuItem menuItemPlugin; /** * Constructor. @@ -139,27 +143,27 @@ @Override public void load() { final String pluginName = getPluginName(); - final JMenu menuItem = new JMenu(pluginName); + menuItemPlugin = new JMenu(pluginName); - JMenuItem menuDisplay = new JMenuItem("Display"); - menuItem.add(menuDisplay); - JMenuItem menuDelete = new JMenuItem("Delete"); - menuItem.add(menuDelete); + final JMenuItem menuItemDisplay = new JMenuItem("Display"); + menuItemPlugin.add(menuItemDisplay); + final JMenuItem menuItemDelete = new JMenuItem("Delete"); + menuItemPlugin.add(menuItemDelete); final JMenu menuPlugin = MainUI.getInstance().getMenuPlugin(); - menuPlugin.add(menuItem); + menuPlugin.add(menuItemPlugin); - menuDisplay.addActionListener(new ActionListener() { + menuItemDisplay.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { display(); } }); - menuDelete.addActionListener(new ActionListener() { + menuItemDelete.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - menuPlugin.remove(menuItem); + unload(); } }); } @@ -169,5 +173,10 @@ */ @Override public void unload() { + JMenu menuPlugin = MainUI.getInstance().getMenuPlugin(); + if(menuItemPlugin != null) { + menuPlugin.remove(menuItemPlugin); + menuItemPlugin = null; + } } } Added: trunk/plugins/.properties =================================================================== --- trunk/plugins/.properties (rev 0) +++ trunk/plugins/.properties 2010-03-18 08:47:47 UTC (rev 250) @@ -0,0 +1,5 @@ +#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 +BigHashMapV2=true +ShowDiskSpace=true

1 0

r249 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/test/java/org/nuiton/mapstoragemanager/core msm-monitoring-plugins/src/main/java/org/nuiton/monitoring msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 17, 2010

March 17, 2010

Author: dlanglais Date: 2010-03-17 15:00:03 +0100 (Wed, 17 Mar 2010) New Revision: 249 Log: Suppression de la classe BigTableLoaderTest.java (inutile). Nettoyage code. Am?\195?\169lioration code PluginLoader. Removed: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-17 14:00:03 UTC (rev 249) @@ -42,15 +42,17 @@ try { p.load(stream); for (Object k : p.keySet()) { - String key = k + ""; - Object value = p.get(k); - if (LOG.isDebugEnabled()) { - LOG.debug("install properties " + k + " : " + value); - } - setDefaultOption(key, "" + value); + String key = (String) k; + String value = (String) p.get(k); + + setDefaultOption(key, value); + + // if (LOG.isDebugEnabled()) + LOG.debug("install properties " + k + " : " + value); } } catch (IOException ex) { - throw new RuntimeException(ex); + LOG.fatal(ex, ex); +// throw new RuntimeException(ex); } } 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-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-17 14:00:03 UTC (rev 249) @@ -2,6 +2,7 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.net.MalformedURLException; @@ -14,6 +15,8 @@ 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; @@ -62,11 +65,21 @@ /** Load properties file of the folder. */ properties = new Properties(); + propertiesFile = new File(pluginsFolderPath, ".properties"); try { - propertiesFile = new File(pluginsFolderPath, ".properties"); - properties.load(new FileInputStream(propertiesFile)); + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + } catch (FileNotFoundException e) { + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + properties.store(fos , null); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } /** For each file if the propertie is not false */ @@ -147,7 +160,7 @@ try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } } @@ -218,38 +231,45 @@ */ public static final void setActive(Plugin plugin, boolean active) { - properties.put(plugin.getPluginName(), Boolean.toString(active)); + final String pluginName = plugin.getPluginName(); + + properties.put(pluginName, active); try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } - if (active == true) { + if (active) { plugin.load(); } else { plugin.unload(); } } + /** + * Control if the plugin have to be loaded. + * @param plugin the plugin to control. + */ public static void controlLoadPlugin(Plugin plugin) { - if (!"false".equals(properties.getProperty(plugin.getPluginName()))) { - plugins.put(plugin.getPluginName(), plugin); + + final String pluginName = plugin.getPluginName(); + final String pluginProperty = properties.getProperty(pluginName); + plugins.put(pluginName, plugin); + + if ("true".equals(pluginProperty)) { + /** If plugin must be loaded */ plugin.load(); - properties.put(plugin.getPluginName(), "true"); + } else if(!"false".equals(pluginProperty)) { + /** If plugin is not in .properties, + * it is load and writted in .properties */ + plugin.load(); + properties.put(pluginName, "true"); try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { - // LOG.error(ex, ex); + LOG.error(ex, ex); } - } else { - plugins.put(plugin.getPluginName(), plugin); - properties.put(plugin.getPluginName(), "false"); - try { - properties.store(new FileOutputStream(propertiesFile), null); - } catch (IOException ex) { - // LOG.error(ex, ex); - } } } } Deleted: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-03-17 14:00:03 UTC (rev 249) @@ -1,67 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.net.MalformedURLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Created: 28 janv. 2010 - * - * @author fdesbois - * @version $Revision: 36 $ - * - * Mise a jour: $Date: 2010-01-28 22:02:49 +0100 (jeu., 28 janv. 2010) $ - * par : $Author$ - */ -public class BigTableLoaderTest { - - private static final Log log = LogFactory.getLog(BigTableLoaderTest.class); - - public BigTableLoaderTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - /** - * Test of getBigTable method, of class BigTableLoader. - * @throws MalformedURLException - */ - @Test - public void testGetBigTable() throws MalformedURLException { - log.info("getBigTable"); - //BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); - - // FIXME-FD20100128 NPE : - // java.lang.NullPointerException at org.nuiton.mapstoragemanager.core.BigTableLoader.<init>(BigTableLoader.java:34) - - //Assert.assertNotNull(p.getBigTable()); - } - - /** - * Test of getBigTableSetLoader method, of class BigTableLoader. - */ - //@Test - public void testGetBigTableSetLoader() { - log.info("getBigTableSetLoader"); - } -} Modified: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-17 14:00:03 UTC (rev 249) @@ -5,6 +5,7 @@ package org.nuiton.mapstoragemanager.core; +import com.opensymphony.xwork2.interceptor.annotations.After; import java.io.File; import java.lang.reflect.Field; import java.net.MalformedURLException; @@ -51,7 +52,9 @@ * Initialisation. */ try { - pl = new PluginLoader(new File("").getAbsolutePath(), + 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); @@ -77,6 +80,17 @@ } } + /** + * + */ + @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(); 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-17 08:40:41 UTC (rev 248) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-17 14:00:03 UTC (rev 249) @@ -23,14 +23,14 @@ * 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; +// /** +// * Width of the frame. +// */ +// private static final int FRAME_WIDTH = 300; +// /** +// * Height of the frame. +// */ +// private static final int FRAME_HEIGHT = 300; /** * Constructor. 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-17 08:40:41 UTC (rev 248) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-17 14:00:03 UTC (rev 249) @@ -13,7 +13,7 @@ * This class is used to get the view of a plugin. * @author Dorian Langlais */ -public class PluginView { +public final class PluginView { /** * Private Constructor.

1 0

r248 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 17, 2010

March 17, 2010

Author: dlanglais Date: 2010-03-17 09:40:41 +0100 (Wed, 17 Mar 2010) New Revision: 248 Log: Quelques modifs visant ?\195?\160 rendre persistants les choix des plugins charg?\195?\169s ou non au d?\195?\169marrage... C'est assez brouillon... Pour r?\195?\169sumer : - le dossier plugins ?\195?\160 la racine de MapStorageManager contient un fichier .properties : - Ce fichier contient la localisation de tous les plugins (.jar) ?\195?\160 charger ou non au d?\195?\169marrage (true ou false). Actuellement, lorsque l'on va chercher un plugin manuellement dans l'application, celui-ci sera charg?\195?\169 automatiquement au prochain d?\195?\169marrage, sauf si l'on modifie manuellement le fichier .properties pour supprimer le jar ou en le mettant ?\195?\160 false. - ce fichier liste l'ensemble des plugins (Classe), ?\195?\160 charger ou non au d?\195?\169marrage. Via le pluginManager, lorsque l'on active/d?\195?\169sactive un plugin, celui-ci est charg?\195?\169/d?\195?\169charg?\195?\169 directement, mais aussi gardera cette configuration pour le prochain d?\195?\169marrage. Contrairement aux boutons charger/d?\195?\169charger qui ne le font que pour la session en cours... C'est tr?\195?\168s facilement am?\195?\169liorable. Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-17 06:39:07 UTC (rev 247) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-17 08:40:41 UTC (rev 248) @@ -59,6 +59,7 @@ SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null); final MainUI ui = MainUI.getInstance(); + ui.getEngine().loadPlugins(); SwingUtilities.invokeLater(new Runnable() { 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-17 06:39:07 UTC (rev 247) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-17 08:40:41 UTC (rev 248) @@ -1,6 +1,9 @@ package org.nuiton.mapstoragemanager.core; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -8,16 +11,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Properties; import java.util.ServiceLoader; import java.util.Set; + 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.Monitoring; import org.nuiton.mapstoragemanager.plugins.Plugin; /** @@ -30,18 +34,19 @@ * Logger. */ private static final Log LOG = LogFactory.getLog(PluginLoader.class); - /** - * The BigTable Set Loader. + * Properties, to store properties about plugins. */ -// private ServiceLoader<BigTable> bigTableSetLoader; -// private ServiceLoader<Importer> importerSetLoader; -// private ServiceLoader<Exporter> exporterSetLoader; + private static Properties properties; + /** + * Properties File path, to load and save properties about plugins. + */ + private static File propertiesFile; /** * Map Identifiant - BigTable implementation. */ - private Map<String, Plugin> plugins = new HashMap<String, Plugin>(); + private static Map<String, Plugin> plugins = new HashMap<String, Plugin>(); /** * Class constructor. @@ -55,8 +60,33 @@ super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, classLoader); - for (File file : new File(pluginsFolderPath).listFiles()) { - if (file.getAbsolutePath().endsWith(".jar")) { + /** Load properties file of the folder. */ + properties = new Properties(); + try { + propertiesFile = new File(pluginsFolderPath, ".properties"); + properties.load(new FileInputStream(propertiesFile)); + } catch (IOException ex) { +// LOG.error(ex, ex); + } + + /** For each file if the propertie is not false */ +// for (File file : new File(pluginsFolderPath).listFiles()) { +// String fileProp = (String) properties.get(file.getPath()); +// if(fileProp == null) { +// fileProp = ""; +// } +// if (!fileProp.equals("false") +// && file.getAbsolutePath().endsWith(".jar")) { +// loadPlugin(file); +// } +// } + + /** For each properties keys with value is true, load the file */ + Set<Object> props = properties.keySet(); + for (Object property : props) { + if(property.toString().endsWith(".jar") + && properties.get(property).equals("true")) { + File file = new File(property.toString()); loadPlugin(file); } } @@ -86,8 +116,6 @@ ServiceLoader.load(Importer.class, this); ServiceLoader<Exporter> exporterSetLoader = ServiceLoader.load(Exporter.class, this); -// ServiceLoader<Monitoring> monitoringSetLoader = -// ServiceLoader.load(Monitoring.class, this); ServiceLoader<Plugin> pluginSetLoader = ServiceLoader.load(Plugin.class, this); @@ -95,25 +123,32 @@ * Add plugin in the plugin's map. */ for (BigTable bigTable : bigTableSetLoader) { - bigTable.load(); - plugins.put(bigTable.getPluginName(), bigTable); + controlLoadPlugin(bigTable); +// bigTable.load(); +// plugins.put(bigTable.getPluginName(), bigTable); } for (Importer importer : importerSetLoader) { - importer.load(); - plugins.put(importer.getPluginName(), importer); + controlLoadPlugin(importer); +// importer.load(); +// plugins.put(importer.getPluginName(), importer); } for (Exporter exporter : exporterSetLoader) { - exporter.load(); - plugins.put(exporter.getPluginName(), exporter); + controlLoadPlugin(exporter); +// exporter.load(); +// plugins.put(exporter.getPluginName(), exporter); } -// for (Monitoring monitor : monitoringSetLoader) { -// monitor.load(); -// plugins.put(monitor.getPluginName(), monitor); -// } for (Plugin plugin : pluginSetLoader) { - plugin.load(); - plugins.put(plugin.getPluginName(), plugin); + controlLoadPlugin(plugin); +// plugin.load(); +// plugins.put(plugin.getPluginName(), plugin); } + + properties.put(file.getPath(), "true"); + try { + properties.store(new FileOutputStream(propertiesFile), null); + } catch (IOException ex) { +// LOG.error(ex, ex); + } } /** @@ -134,15 +169,6 @@ return s; } -// /** -// * Returns the BigTable Set Loader. -// * @return the BigTable Set Loader -// * @deprecated Use {@link #getAllBigTable()} -// */ -// public final ServiceLoader<BigTable> getBigTableSetLoader() { -// return bigTableSetLoader; -// } - /** * Returns a plugin implementation according to an identifiant. * @param id the identifiant - typically the plugins name -. @@ -185,4 +211,45 @@ public final Set<String> getAllPluginNames() { return plugins.keySet(); } + + /** + * Set active or not a plugin at startup. + * + */ + public static final void setActive(Plugin plugin, boolean active) { + + properties.put(plugin.getPluginName(), Boolean.toString(active)); + try { + properties.store(new FileOutputStream(propertiesFile), null); + } catch (IOException ex) { +// LOG.error(ex, ex); + } + + if (active == true) { + plugin.load(); + } else { + plugin.unload(); + } + } + + public static void controlLoadPlugin(Plugin plugin) { + if (!"false".equals(properties.getProperty(plugin.getPluginName()))) { + plugins.put(plugin.getPluginName(), plugin); + plugin.load(); + properties.put(plugin.getPluginName(), "true"); + try { + properties.store(new FileOutputStream(propertiesFile), null); + } catch (IOException ex) { + // LOG.error(ex, ex); + } + } else { + plugins.put(plugin.getPluginName(), plugin); + properties.put(plugin.getPluginName(), "false"); + try { + properties.store(new FileOutputStream(propertiesFile), null); + } catch (IOException ex) { + // LOG.error(ex, ex); + } + } + } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-17 06:39:07 UTC (rev 247) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-17 08:40:41 UTC (rev 248) @@ -55,26 +55,27 @@ */ private static final File MSM_BASEDIR = new File(new File("").getAbsolutePath()).getParentFile(); + /** + * msm plugin dir. + */ + private static final File MSM_PLUGINS_DIR = + new File(MSM_BASEDIR, "plugins/"); /** * Constructor. */ private ApplicationEngine() { -// String basedir = new File("").getAbsolutePath(); -// msmBasedir = new File(basedir).getParentFile(); lastPath = MSM_BASEDIR.toString(); + } + /** + * Load plugins for plugins directory. + */ + public void loadPlugins() { try { - String toPlugin = "plugins/"; - String pluginsFolderPath = - new File(MSM_BASEDIR, toPlugin).getPath(); - - LOG.info("msmBasedir : " + MSM_BASEDIR + '\n' - + "pluginsFolderPath : " + pluginsFolderPath); - - pluginLoader = new PluginLoader(pluginsFolderPath, - this.getClass().getClassLoader()); + pluginLoader = new PluginLoader(MSM_PLUGINS_DIR.getPath(), + this.getClass().getClassLoader()); } catch (MalformedURLException ex) { LOG.error(ex, ex); } 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-17 06:39:07 UTC (rev 247) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-17 08:40:41 UTC (rev 248) @@ -1,4 +1,4 @@ -<Application id='pluginManagerFrame' width='640' height='480' implements='Plugin' > +<Application id='pluginManagerFrame' width='640' height='480' implements='Plugin' onWindowClosing=''>  <script> @@ -25,6 +25,7 @@ if (instance == null){ instance = new PluginManager(); } + instance.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); return instance; } @@ -88,7 +89,8 @@ buttonActivate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //TODO; + + PluginLoader.setActive(plugin, true); buttonActivate.setEnabled(false); buttonDesactivate.setEnabled(true); } @@ -97,7 +99,8 @@ buttonDesactivate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //TODO; + + PluginLoader.setActive(plugin, false); buttonActivate.setEnabled(true); buttonDesactivate.setEnabled(false); } @@ -174,6 +177,7 @@ @Override public void actionPerformed(ActionEvent e) { PluginManager.getInstance().setVisible(true); + PluginManager.getInstance().refreshPluginList(); } }); menuPluginMSM.add(menuItemPlugin);

1 0

r247 - in trunk: msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-monitoring-plugins/src/main/java/org/nuiton/monitoring msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 17, 2010

March 17, 2010

Author: dlanglais Date: 2010-03-17 07:39:07 +0100 (Wed, 17 Mar 2010) New Revision: 247 Log: Corrections mineures. Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 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-16 13:39:09 UTC (rev 246) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-17 06:39:07 UTC (rev 247) @@ -93,8 +93,6 @@ serializer.endDocument(); - serializer.flush(); - final long t2 = System.currentTimeMillis(); LOG.info("temps d'enregistrement : " + (t2 - t1) + " ms."); } catch (IOException ex) { 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-16 13:39:09 UTC (rev 246) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-17 06:39:07 UTC (rev 247) @@ -12,7 +12,6 @@ import javax.swing.JPanel; import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; /** * 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-16 13:39:09 UTC (rev 246) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-17 06:39:07 UTC (rev 247) @@ -16,11 +16,18 @@ public class PluginView { /** + * Private Constructor. + */ + private PluginView() { + + } + + /** * Map to store the JPanel 'plugin view' that describe a plugin. * The key is the plugin name, the value is the JPanel containing its * description. */ - private static final Map<String, JPanel> pluginViews + private static final Map<String, JPanel> PLUGIN_VIEW = new HashMap<String, JPanel>(); /** @@ -29,7 +36,7 @@ * @param pluginView the plugin view of the plugin. */ public static void put(String pluginName, JPanel pluginView) { - pluginViews.put(pluginName, pluginView); + PLUGIN_VIEW.put(pluginName, pluginView); } /** @@ -38,6 +45,6 @@ * @return return the plugin view of the plugin. */ public static JPanel get(String pluginName) { - return pluginViews.get(pluginName); + return PLUGIN_VIEW.get(pluginName); } }

1 0

r246 - in trunk: msm/src/main/resources src/site/doc/rapport
by fgilet＠users.nuiton.org March 16, 2010

March 16, 2010

Author: fgilet Date: 2010-03-16 14:39:09 +0100 (Tue, 16 Mar 2010) New Revision: 246 Log: Ajout d'un paragraphe dans le rapport Creation d'un HowTo pour faire un plugin Added: trunk/msm/src/main/resources/HowToPlugin Modified: trunk/src/site/doc/rapport/rapport.rst Modified: trunk/src/site/doc/rapport/rapport.rst =================================================================== --- trunk/src/site/doc/rapport/rapport.rst 2010-03-15 19:46:44 UTC (rev 245) +++ trunk/src/site/doc/rapport/rapport.rst 2010-03-16 13:39:09 UTC (rev 246) @@ -163,7 +163,8 @@ Jaxx est un framework permettant de générer une interface graphique en SWING (Java). SWING est parfois fastidieux à gérer et le code n'est -pas toujours très propre. Le but de Jaxx est donc de contraindre un +pas toujours très propre, nous pensons notamment à la gestion des conteneurs, +aux styles graphique,... Le but de Jaxx est donc de contraindre un développeur à obtenir du code propre et performant en SWING. Le principe est très simple. On définit les éléments de la vue @@ -318,6 +319,11 @@ du PluginLoader. C'est également un singleton récupéré grâce à la méthode statique getInstance(). +Grâce à la technologie JAXX, on peut établir une feuille de style propre à +notre application mais qui pourra être reutiliser si besoin. Cela offre une +flexibilité dans la création de l'interface graphique puisqu'on a un découpage +entre les éléments graphique, le style attribué et les actions sur ces éléments. + 3.4 Initialisation et lancement de MSM --------------------------------------

1 0

r245 - in trunk/msm-pluginmanager/src: main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager test/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 15, 2010

March 15, 2010

Author: dlanglais Date: 2010-03-15 20:46:44 +0100 (Mon, 15 Mar 2010) New Revision: 245 Log: L?\195?\169g?\195?\168res modifications... Par contre, j'ai un soucis avec le layout manager de la "PluginView" : - Lorsque l'on agrandit la fen?\195?\170tre le JPanel contenant la description du plugin d'agrandit correctement idem lorsque diminue la hauteur de la fen?\195?\170tre. - Par contre, le soucis appara?\195?\174t lorsque l'on diminue la taille de la fen?\195?\170tre en largeur... Added: trunk/msm-pluginmanager/src/test/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginViewTest.java 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/PluginView.java 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-15 18:35:39 UTC (rev 244) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-15 19:46:44 UTC (rev 245) @@ -66,12 +66,17 @@ titre.add(new JLabel(pluginName), BorderLayout.CENTER); pluginView.add(titre, BorderLayout.PAGE_START); - JPanel description = new JPanel(); - description.add(new JLabel(" ")); - description.add(new JTextArea(pluginDescritpion)); - pluginView.add(description, BorderLayout.CENTER); + JTextArea description = new JTextArea(pluginDescritpion); + description.setLineWrap(true); + description.setWrapStyleWord(true); + description.setEditable(false); + JScrollPane descriptionScrollPane = new JScrollPane(description); + descriptionScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); + descriptionScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + pluginView.add(descriptionScrollPane, BorderLayout.CENTER); + JPanel southButton = new JPanel(); southButton.setLayout(new GridLayout(1,4)); @@ -127,7 +132,7 @@ } getPluginView().removeAll(); - getPluginView().add(PluginView.get(pluginName)); + getPluginView().add(PluginView.get(pluginName), BorderLayout.CENTER); getPluginView().updateUI(); } }); @@ -216,7 +221,7 @@ <VBox layout='{new GridLayout(0,1)}' id='pluginList' /> </JScrollPane> <JScrollPane> - <JPanel layout='{new BoxLayout(pluginView, BoxLayout.PAGE_AXIS)}' id='pluginView' /> + <JPanel layout='{new BorderLayout()}' id='pluginView' /> </JScrollPane> </JSplitPane> </JPanel> 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-15 18:35:39 UTC (rev 244) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-15 19:46:44 UTC (rev 245) @@ -10,22 +10,33 @@ import javax.swing.JPanel; /** - * + * This class is used to get the view of a plugin. * @author Dorian Langlais */ public class PluginView { + /** + * Map to store the JPanel 'plugin view' that describe a plugin. + * The key is the plugin name, the value is the JPanel containing its + * description. + */ private static final Map<String, JPanel> pluginViews = new HashMap<String, JPanel>(); -// public PluginView() { -// pluginViews = new HashMap<String, JPanel>(); -// } - + /** + * Put the pluginView of a plugin. + * @param pluginName the name of the plugin. + * @param pluginView the plugin view of the plugin. + */ public static void put(String pluginName, JPanel pluginView) { pluginViews.put(pluginName, pluginView); } + /** + * Method to get the plugin view of a plugin. + * @param pluginName the plugin name. + * @return return the plugin view of the plugin. + */ public static JPanel get(String pluginName) { return pluginViews.get(pluginName); } Added: trunk/msm-pluginmanager/src/test/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginViewTest.java =================================================================== --- trunk/msm-pluginmanager/src/test/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginViewTest.java (rev 0) +++ trunk/msm-pluginmanager/src/test/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginViewTest.java 2010-03-15 19:46:44 UTC (rev 245) @@ -0,0 +1,27 @@ +package org.nuiton.mapstoragemanager.plugins.pluginmanager; + +import javax.swing.JPanel; +import junit.framework.TestCase; + +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/** + * + * @author Dorian Langlais + */ +public class PluginViewTest extends TestCase { + + /** + * Test to put and get a JPanel in the PluginView map. + */ + public void testPutAndGet() { + String pluginName = "test"; + JPanel pluginView = new JPanel(); + PluginView.put(pluginName, pluginView); + + assertEquals(pluginView, PluginView.get(pluginName)); + } +}

1 0

r244 - in trunk: msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 15, 2010

March 15, 2010

Author: dlanglais Date: 2010-03-15 19:35:39 +0100 (Mon, 15 Mar 2010) New Revision: 244 Log: Petite modification consistant ?\195?\160 stocker la vue/description d'un plugin afin de ne pas la r?\195?\169construire ?\195?\160 chaque fois que l'on souhaite la voir... Added: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java Modified: 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-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 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-15 02:37:16 UTC (rev 243) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-15 18:35:39 UTC (rev 244) @@ -68,8 +68,6 @@ // Construction of the document. forEachTable(bigTable, database); - // print the jdom document. -// toSreen(); save(file); } @@ -141,45 +139,28 @@ String content; for (String key : keys) { -// try { - content = bigTable.get(tableName, columnName, key); - if (content != null && !"".equals(content)) { + content = bigTable.get(tableName, columnName, key); + if (content != null && !"".equals(content)) { - // new cell Element. - Element cell = new Element("cell"); - // new attribute which contain the cell key. - Attribute cellKeyAttr = new Attribute("key", key); - cell.setAttribute(cellKeyAttr); + // new cell Element. + Element cell = new Element("cell"); + // new attribute which contain the cell key. + Attribute cellKeyAttr = new Attribute("key", key); + cell.setAttribute(cellKeyAttr); - // we add the cell to the column. - column.addContent(cell); + // we add the cell to the column. + column.addContent(cell); - // new value Element. - Element value = new Element("value"); - value.setText(content); + // new value Element. + Element value = new Element("value"); + value.setText(content); - // we add the value to the cell. - cell.addContent(value); - } -// } catch (NoSuchElementException e) { -// LOG.trace(e, e); -// } + // we add the value to the cell. + cell.addContent(value); + } } } -// /** -// * toSreen(). -// * show the XML content on System.out -// */ -// void toSreen() { -// try { -// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); -// output.output(document, System.out); -// } catch (java.io.IOException e) { -// LOG.error(e, e); -// } -// } - /** * Method to save the file. * @param file the file in which we save the database. 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-15 02:37:16 UTC (rev 243) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-15 18:35:39 UTC (rev 244) @@ -67,8 +67,6 @@ // Construction of the bigtable database. forEachTable(bigTable, racine); - // print the jdomDocument. -// toSreen(); } catch (IOException ex) { LOG.error(ex, ex); } @@ -140,19 +138,6 @@ } } -// /** -// * toSreen(). -// * show the XML content on System.out -// */ -// void toSreen() { -// try { -// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); -// output.output(document, System.out); -// } catch (java.io.IOException e) { -// LOG.error(e, e); -// } -// } - /** * Method to load the jdom document of the file. * @param file the file from which the database is saved. @@ -185,10 +170,6 @@ */ @Override public final FileFilter getFileFilter() { -// if(fileFilter == null){ -// fileFilter = -// new FileNameExtensionFilter("Fichiers XML", "xml"); -// } return fileFilter; } 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-15 02:37:16 UTC (rev 243) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-15 18:35:39 UTC (rev 244) @@ -58,71 +58,77 @@ public void actionPerformed(ActionEvent e) { - JPanel pluginView = getPluginView(); - pluginView.setLayout(new BorderLayout()); + if (PluginView.get(pluginName) == null) { - pluginView.removeAll(); - JPanel titre = new JPanel(); - titre.add(new JLabel(pluginName), BorderLayout.CENTER); - pluginView.add(titre, BorderLayout.PAGE_START); + JPanel pluginView = new JPanel(new BorderLayout()); - JPanel description = new JPanel(); - description.add(new JLabel(" ")); - description.add(new JTextArea(pluginDescritpion)); - pluginView.add(description, BorderLayout.CENTER); + JPanel titre = new JPanel(); + titre.add(new JLabel(pluginName), BorderLayout.CENTER); + pluginView.add(titre, BorderLayout.PAGE_START); + JPanel description = new JPanel(); + description.add(new JLabel(" ")); + description.add(new JTextArea(pluginDescritpion)); + pluginView.add(description, BorderLayout.CENTER); - JPanel southButton = new JPanel(); - southButton.setLayout(new GridLayout(1,4)); - final JButton buttonActivate = new JButton(_("activate")); - final JButton buttonDesactivate = new JButton(_("desactivate")); - final JButton buttonLoad = new JButton(_("load")); - final JButton buttonUnload = new JButton(_("unload")); + JPanel southButton = new JPanel(); + southButton.setLayout(new GridLayout(1,4)); - buttonActivate.addActionListener(new ActionListener() { + final JButton buttonActivate = new JButton(_("activate")); + final JButton buttonDesactivate = new JButton(_("desactivate")); + final JButton buttonLoad = new JButton(_("load")); + final JButton buttonUnload = new JButton(_("unload")); - public void actionPerformed(ActionEvent e) { - //TODO; - buttonActivate.setEnabled(false); - buttonDesactivate.setEnabled(true); - } - }); + buttonActivate.addActionListener(new ActionListener() { - buttonDesactivate.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //TODO; + buttonActivate.setEnabled(false); + buttonDesactivate.setEnabled(true); + } + }); - public void actionPerformed(ActionEvent e) { - //TODO; - buttonActivate.setEnabled(true); - buttonDesactivate.setEnabled(false); - } - }); + buttonDesactivate.addActionListener(new ActionListener() { - buttonLoad.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //TODO; + buttonActivate.setEnabled(true); + buttonDesactivate.setEnabled(false); + } + }); - public void actionPerformed(ActionEvent e) { - plugin.load(); - buttonLoad.setEnabled(false); - buttonUnload.setEnabled(true); - } - }); + buttonLoad.addActionListener(new ActionListener() { - buttonUnload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + plugin.load(); + buttonLoad.setEnabled(false); + buttonUnload.setEnabled(true); + } + }); - public void actionPerformed(ActionEvent e) { - plugin.unload(); - buttonLoad.setEnabled(true); - buttonUnload.setEnabled(false); - } - }); + buttonUnload.addActionListener(new ActionListener() { - southButton.add(buttonActivate); - southButton.add(buttonDesactivate); - southButton.add(buttonLoad); - southButton.add(buttonUnload); + public void actionPerformed(ActionEvent e) { + plugin.unload(); + buttonLoad.setEnabled(true); + buttonUnload.setEnabled(false); + } + }); - pluginView.add(southButton, BorderLayout.PAGE_END); - pluginView.updateUI(); + southButton.add(buttonActivate); + southButton.add(buttonDesactivate); + southButton.add(buttonLoad); + southButton.add(buttonUnload); + + pluginView.add(southButton, BorderLayout.PAGE_END); + + PluginView.put(pluginName, pluginView); + + } + getPluginView().removeAll(); + getPluginView().add(PluginView.get(pluginName)); + getPluginView().updateUI(); } }); @@ -131,7 +137,6 @@ getPluginList().updateUI(); } - /** * {@inheritDoc} */ Added: 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 (rev 0) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-15 18:35:39 UTC (rev 244) @@ -0,0 +1,32 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.plugins.pluginmanager; + +import java.util.HashMap; +import java.util.Map; +import javax.swing.JPanel; + +/** + * + * @author Dorian Langlais + */ +public class PluginView { + + private static final Map<String, JPanel> pluginViews + = new HashMap<String, JPanel>(); + +// public PluginView() { +// pluginViews = new HashMap<String, JPanel>(); +// } + + public static void put(String pluginName, JPanel pluginView) { + pluginViews.put(pluginName, pluginView); + } + + public static JPanel get(String pluginName) { + return pluginViews.get(pluginName); + } +}

1 0