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

r179 - in trunk: . msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-04 00:30:50 +0100 (Thu, 04 Mar 2010) New Revision: 179 Added: trunk/plugins/ Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Au d?\195?\169marrage de msm : - Chargement des plugins se trouvant dans le dossier "plugins" ?\195?\160 la racine du projet. En cours d'utilisation : - Possibilit?\195?\169 de charger un plugin. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 22:09:37 UTC (rev 178) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 23:30:50 UTC (rev 179) @@ -49,13 +49,7 @@ classLoader); for (File file : new File(pluginsFolderPath).listFiles()) { - if (file.getAbsolutePath().endsWith(".jar")) { - try { - this.addURL(file.toURI().toURL()); - } catch (MalformedURLException e) { - LOG.error(e.toString(), e); - } - } + loadPlugin(file); } bigTableSetLoader = ServiceLoader.load(BigTable.class, this); @@ -66,6 +60,21 @@ } /** + * Load a plugin. + * @param file the plugin file. + */ + public void loadPlugin(final File file) { + LOG.info("Load plugin : " + file.getAbsolutePath()); + if (file.getAbsolutePath().endsWith(".jar")) { + try { + this.addURL(file.toURI().toURL()); + } catch (MalformedURLException e) { + LOG.error(e.toString(), e); + } + } + } + + /** * Returns a string displaying all the available BigTable implementations. * @return a string displaying all the available BigTable implementations */ 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-03 22:09:37 UTC (rev 178) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-03 23:30:50 UTC (rev 179) @@ -4,98 +4,106 @@  <script> <![CDATA[ - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - 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.MsmConfig; - import org.nuiton.mapstoragemanager.ui.gui.MessageThread; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + import org.nuiton.mapstoragemanager.core.BigTableLoader; + 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.MsmConfig; + import org.nuiton.mapstoragemanager.plugins.BigTable; + import org.nuiton.mapstoragemanager.ui.gui.MessageThread; - ApplicationEngine engine = ApplicationEngine.getInstance(); + ApplicationEngine engine = ApplicationEngine.getInstance(); - /** - * classe instance (singleton pattern). - */ - private static MainUI instance = null; + /** + * classe instance (singleton pattern). + */ + private static MainUI instance = null; - /** - * getInstance method (singleton pattern). - * @return instance of the class - */ - public static MainUI getInstance() { - if (instance == null){ - instance = new MainUI(); - } - return instance; + /** + * getInstance method (singleton pattern). + * @return instance of the class + */ + public static MainUI getInstance() { + if (instance == null){ + instance = new MainUI(); + for (BigTable btPlugin : instance.getEngine().getBigTableLoader().getAllBigTable()) { + String btName = btPlugin.getPluginName(); + jaxx.runtime.swing.Item bigTableItem = + new jaxx.runtime.swing.Item(btName, null, btName, true); + instance.getNameBase().addItem(bigTableItem); + } } + return instance; + } - /** - * Access to the engine. - * @return instance of the class - */ - public ApplicationEngine getEngine(){ - return engine; - } + /** + * Access to the engine. + * @return instance of the class + */ + public ApplicationEngine getEngine(){ + return engine; + } - /** - * Access to the config. - * @return instance of the class - */ - public MsmConfig getConfig() { - return getContextValue(MsmConfig.class); - } + /** + * Access to the config. + * @return instance of the class + */ + public MsmConfig getConfig() { + return getContextValue(MsmConfig.class); + } - /** - * Dispose UI. - */ - public void dispose(){ - instance = null; - engine.dispose(); - this.setVisible(false); + /** + * Dispose UI. + */ + public void dispose(){ + instance = null; + engine.dispose(); + this.setVisible(false); + } + + /** + * Display the appropriate message. + * @param message the message to display. + * @param code code error (for images). + */ + public void displayMessage(String message, int code){ + + //clear the message panel + this.getMessagesPanel().removeAll(); + + //display message + if (code==0){ + String icon ="ok_16"; + }else if (code==1){ + String icon ="warning_16.png"; + }else if (code==2){ + String icon ="cancel_16.png"; } - /** - * Display the appropriate message. - * @param message the message to display. - * @param code code error (for images). - */ - public void displayMessage(String message, int code){ - - //clear the message panel - this.getMessagesPanel().removeAll(); + JLabel label = new JLabel(message); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); + this.getMessagesPanel().add(label); + this.getMessagesPanel().repaint(); + this.getMessagesPanel().revalidate(); - //display message - if (code==0){ - String icon ="ok_16"; - }else if (code==1){ - String icon ="warning_16.png"; - }else if (code==2){ - String icon ="cancel_16.png"; - } + //remove message after a short time + MessageThread m = new MessageThread(); + m.start(); - JLabel label = new JLabel(message); - label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); - this.getMessagesPanel().add(label); - this.getMessagesPanel().repaint(); - this.getMessagesPanel().revalidate(); + } - //remove message after a short time - MessageThread m = new MessageThread(); - m.start(); - - } + /** + * Test. + */ + public DefaultTreeModel getModelTree(){ + n_("Empty"); + return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"))); + } - /** - * Test. - */ - public DefaultTreeModel getModelTree(){ - n_("Empty"); - return new DefaultTreeModel(new DefaultMutableTreeNode(_("Empty"))); - } - ]]> </script> 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-03 22:09:37 UTC (rev 178) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 23:30:50 UTC (rev 179) @@ -22,8 +22,6 @@ import org.nuiton.mapstoragemanager.MsmConfig; import org.nuiton.mapstoragemanager.core.BigTableLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; -//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; -//import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -52,12 +50,27 @@ /** * BigtableLoader. */ - private static BigTableLoader bigTableLoader; + private static BigTableLoader btl; /** * Constructor. */ private ApplicationEngine() { + try { + String basedir = new File("").getAbsolutePath(); + File msnBasedir = new File(basedir).getParentFile(); + String toPlugin = "plugins/"; + String pluginsFolderPath = new File(msnBasedir, toPlugin).getPath(); + + LOG.info("basedir : " + basedir + '\n' + + "msnBasedir : " + msnBasedir + '\n' + + "pluginsFolderPath : " + pluginsFolderPath); + + btl = new BigTableLoader(pluginsFolderPath, + this.getClass().getClassLoader()); + } catch (MalformedURLException ex) { + LOG.error(ex, ex); + } } /** @@ -73,38 +86,38 @@ String basedir = new File("").getAbsolutePath(); File msnBasedir = new File(basedir).getParentFile(); +// String toPlugin = "msm-bighashmapV2/target/"; JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); - String toPlugin = "msm-bighashmapV2/target/"; jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); jfc.showOpenDialog(MainUI.getFrames()[0]); - File pluginPath = jfc.getSelectedFile().getParentFile(); + File pluginPath = jfc.getSelectedFile(); // BigTableLoader btl = null; LOG.info("basedir : " + basedir + '\n' - + "msnBbasedir : " + msnBasedir + '\n' - + "pluginPath : " + pluginPath.getPath()); + + "msnBasedir : " + msnBasedir + '\n' + + "pluginPath : " + pluginPath.getAbsolutePath()); - try { - bigTableLoader = - new BigTableLoader(pluginPath.getPath(), - this.getClass().getClassLoader()); - } catch (MalformedURLException ex) { - LOG.fatal(ex, ex); - } +// try { + btl.loadPlugin(pluginPath); +// bigTableLoader = +// new BigTableLoader(pluginPath.getPath(), +// this.getClass().getClassLoader()); +// } catch (MalformedURLException ex) { +// LOG.fatal(ex, ex); +// } - LOG.info("getBigtable() : " + bigTableLoader.getBigTable()); + LOG.info("getBigtable() : " + btl.getBigTable()); MainUI ui = MainUI.getInstance(); - for (BigTable btPlugin : bigTableLoader.getAllBigTable()) { + for (BigTable btPlugin : btl.getAllBigTable()) { String btName = btPlugin.getPluginName(); jaxx.runtime.swing.Item bigTableItem = new jaxx.runtime.swing.Item(btName, null, btName, true); ui.getNameBase().addItem(bigTableItem); ui.getNameBase().setSelectedItem(bigTableItem); - } // ui.getNameBase().re @@ -192,7 +205,7 @@ if (nameBase.equals("OurHashMap")) { bigTable = new OurHashMap2(); } else { - bigTable = bigTableLoader.getBigTable(nameBase); + bigTable = btl.getBigTable(nameBase); } // bigTable = new OurHashMap2(); { @@ -273,7 +286,7 @@ */ public static ApplicationEngine getInstance() { if (instance == null) { - instance = new ApplicationEngine(); + instance = new ApplicationEngine(); } return instance; } @@ -352,4 +365,7 @@ this.bigTable = bigTable; } + public BigTableLoader getBigTableLoader(){ + return btl; + } }

1 0

r178 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources/i18n
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 23:09:37 +0100 (Wed, 03 Mar 2010) New Revision: 178 Modified: 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/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Log: Ajout d'un menu plugin : -> charger plugins ; -> montrer plugins (ne fait rien). Chargement d'un plugin -> ok. Cr?\195?\169ation d'une instance d'un plugin de type BigHashMap et remplissage (pour test). 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-03 18:24:21 UTC (rev 177) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-03 22:09:37 UTC (rev 178) @@ -63,6 +63,23 @@ mnemonic:P; } +#menuPlugin { + text:"mapstoragemanager.action.plugin"; + toolTipText:"mapstoragemanager.action.plugin.tip"; +} + +#menuPluginLoad { + text:"mapstoragemanager.action.pluginload"; + toolTipText:"mapstoragemanager.action.pluginload.tip"; + actionIcon:"config"; +} + +#menuPluginShow { + text:"mapstoragemanager.action.pluginshow"; + toolTipText:"mapstoragemanager.action.pluginshow.tip"; + actionIcon:"config"; +} + #menuHelp { text:"mapstoragemanager.action.menuHelp"; toolTipText:"mapstoragemanager.action.menuHelp.tip"; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-03 18:24:21 UTC (rev 177) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-03 22:09:37 UTC (rev 178) @@ -128,6 +128,15 @@ </JMenu> </JMenu> + <JMenu id='menuPlugin'> + <JMenuItem id='menuPluginLoad' + onActionPerformed='engine.loadAPlugin()'/> + <JSeparator/> + <JMenuItem id='menuPluginShow' + onActionPerformed='engine.doSomething()'/> + <JSeparator/> + </JMenu> + <JMenu id='menuHelp'> <JMenuItem id='menuHelpHelp' onActionPerformed='engine.showHelp()'/> @@ -144,9 +153,9 @@ <JLabel text="name base :" actionIcon='database_16' styleClass='boldUnderline' /> <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > <item value='OurHashMap' selected='true'/> - <item value='HBase'/> +  </JAXXComboBox> <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/> <JTextField id='login'/> 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-03 18:24:21 UTC (rev 177) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 22:09:37 UTC (rev 178) @@ -23,6 +23,7 @@ import org.nuiton.mapstoragemanager.core.BigTableLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; //import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; +//import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -41,75 +42,96 @@ /** * BigTable. */ - private BigTable bigTable; + private BigTable bigTable; /** * classe instance (singleton pattern). */ - private static ApplicationEngine instance = null; + private static ApplicationEngine instance = null; /** + * BigtableLoader. + */ + private static BigTableLoader bigTableLoader; + + /** * Constructor. */ private ApplicationEngine() { - + } + + /** + * do nothing. + */ + public void doSomething() { + } + + /** + * do nothing. + */ + public void loadAPlugin() { + String basedir = new File("").getAbsolutePath(); File msnBasedir = new File(basedir).getParentFile(); - JFileChooser jfc = new javax.swing.JFileChooser(); + JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); String toPlugin = "msm-bighashmapV2/target/"; jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); jfc.showOpenDialog(MainUI.getFrames()[0]); - + File pluginPath = jfc.getSelectedFile().getParentFile(); - BigTableLoader btl = null; +// BigTableLoader btl = null; LOG.info("basedir : " + basedir + '\n' + "msnBbasedir : " + msnBasedir + '\n' + "pluginPath : " + pluginPath.getPath()); try { - btl = + bigTableLoader = new BigTableLoader(pluginPath.getPath(), this.getClass().getClassLoader()); } catch (MalformedURLException ex) { LOG.fatal(ex, ex); } - LOG.info("getBigtable() : " + btl.getBigTable()); + LOG.info("getBigtable() : " + bigTableLoader.getBigTable()); + MainUI ui = MainUI.getInstance(); + for (BigTable btPlugin : bigTableLoader.getAllBigTable()) { + String btName = btPlugin.getPluginName(); + jaxx.runtime.swing.Item bigTableItem = + new jaxx.runtime.swing.Item(btName, null, btName, true); + ui.getNameBase().addItem(bigTableItem); + ui.getNameBase().setSelectedItem(bigTableItem); + + } +// ui.getNameBase().re - bigTable = btl.getBigTable("BigHashMapV2"); -// bigTable = new OurHashMap2(); - bigTable.createTable("table1"); - bigTable.createTable("table2"); - bigTable.createColumn("table1", "column1"); - bigTable.createColumn("table1", "column2"); - bigTable.createColumn("table2", "column3"); - bigTable.createColumn("table2", "column4"); - bigTable.createColumn("table2", "column5"); - - bigTable.put("table1", "column1", "1", "content1"); - bigTable.put("table1", "column1", "2", "content2"); - bigTable.put("table1", "column2", "3", "content3"); - bigTable.put("table1", "column2", "4", "content4"); - - bigTable.put("table2", "column3", "5", "content5"); - bigTable.put("table2", "column3", "6", "content6"); - bigTable.put("table2", "column4", "7", "content7"); - bigTable.put("table2", "column4", "8", "content8"); - bigTable.put("table2", "column5", "9", "content9"); - bigTable.put("table2", "column5", "10", "content10"); +// bigTable = btl.getBigTable("BigHashMapV2"); +//// bigTable = new OurHashMap2(); +// bigTable.createTable("table1"); +// bigTable.createTable("table2"); +// bigTable.createColumn("table1", "column1"); +// bigTable.createColumn("table1", "column2"); +// bigTable.createColumn("table2", "column3"); +// bigTable.createColumn("table2", "column4"); +// bigTable.createColumn("table2", "column5"); +// +// bigTable.put("table1", "column1", "1", "content1"); +// bigTable.put("table1", "column1", "2", "content2"); +// bigTable.put("table1", "column2", "3", "content3"); +// bigTable.put("table1", "column2", "4", "content4"); +// +// bigTable.put("table2", "column3", "5", "content5"); +// bigTable.put("table2", "column3", "6", "content6"); +// bigTable.put("table2", "column4", "7", "content7"); +// bigTable.put("table2", "column4", "8", "content8"); +// bigTable.put("table2", "column5", "9", "content9"); +// bigTable.put("table2", "column5", "10", "content10"); } /** - * do nothing. - */ - public void doSomething() { - } - - /** * Method to close the application. */ public void close() { @@ -156,18 +178,45 @@ * Try to connect the user to a database. */ public void connection() { + MainUI ui = MainUI.getInstance(); //update menu ui.getMenuDisconnect().setEnabled(true); - - Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); String nameBase = selectedItems.getValue().toString(); String login = ui.getLogin().getText(); char[] password = ui.getPassword().getPassword(); + if (nameBase.equals("OurHashMap")) { + bigTable = new OurHashMap2(); + } else { + bigTable = bigTableLoader.getBigTable(nameBase); + } +// bigTable = new OurHashMap2(); + { + bigTable.createTable("table1"); + bigTable.createTable("table2"); + bigTable.createColumn("table1", "column1"); + bigTable.createColumn("table1", "column2"); + bigTable.createColumn("table2", "column3"); + bigTable.createColumn("table2", "column4"); + bigTable.createColumn("table2", "column5"); + + bigTable.put("table1", "column1", "1", "content1"); + bigTable.put("table1", "column1", "2", "content2"); + bigTable.put("table1", "column2", "3", "content3"); + bigTable.put("table1", "column2", "4", "content4"); + + bigTable.put("table2", "column3", "5", "content5"); + bigTable.put("table2", "column3", "6", "content6"); + bigTable.put("table2", "column4", "7", "content7"); + bigTable.put("table2", "column4", "8", "content8"); + bigTable.put("table2", "column5", "9", "content9"); + bigTable.put("table2", "column5", "10", "content10"); + } + //connection verification boolean goodUse = true; goodUse = bigTable.connect(new Properties()); Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 18:24:21 UTC (rev 177) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 22:09:37 UTC (rev 178) @@ -24,6 +24,12 @@ mapstoragemanager.action.language.tip= mapstoragemanager.action.menuHelp=Help mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin= +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload= +mapstoragemanager.action.pluginload.tip= +mapstoragemanager.action.pluginshow= +mapstoragemanager.action.pluginshow.tip= 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-03 18:24:21 UTC (rev 177) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 22:09:37 UTC (rev 178) @@ -24,6 +24,12 @@ mapstoragemanager.action.language.tip= mapstoragemanager.action.menuHelp=Aide mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin= +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload= +mapstoragemanager.action.pluginload.tip= +mapstoragemanager.action.pluginshow= +mapstoragemanager.action.pluginshow.tip= mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences mapstoragemanager.action.preferences.tip=Permet de configurer l'application mapstoragemanager.action.uk=Anglais

1 0

r177 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager: . ui/gui
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 19:24:21 +0100 (Wed, 03 Mar 2010) New Revision: 177 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: J'arrive ?\195?\160 loader des plugin s'ils ont un META-INF (c'est temporaire mais pour le moment il faut donner le jar du plugin au lancement de l'appli). Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-03 17:57:28 UTC (rev 176) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-03 18:24:21 UTC (rev 177) @@ -40,7 +40,7 @@ */ private Main(final String... args) { try { - I18n.setUniqueBundleName("mapstoragemanager-i18n"); + I18n.setUniqueBundleName("msm-i18n"); I18n.init(locale); try { 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-03 17:57:28 UTC (rev 176) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 18:24:21 UTC (rev 177) @@ -8,6 +8,7 @@ import java.util.Locale; import java.util.Properties; import java.util.Set; +import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; @@ -21,8 +22,8 @@ import org.nuiton.mapstoragemanager.MsmConfig; import org.nuiton.mapstoragemanager.core.BigTableLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; +//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; -//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -54,8 +55,13 @@ String basedir = new File("").getAbsolutePath(); File msnBasedir = new File(basedir).getParentFile(); - String toPlugin = "msm-bighashmapV2/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmapv2"; - File pluginPath = new File(msnBasedir, toPlugin); + JFileChooser jfc = new javax.swing.JFileChooser(); + String toPlugin = "msm-bighashmapV2/target/"; + jfc.getSelectedFiles(); +// File pluginPath = new File(msnBasedir, toPlugin); + jfc.showOpenDialog(MainUI.getFrames()[0]); + + File pluginPath = jfc.getSelectedFile().getParentFile(); BigTableLoader btl = null; @@ -65,7 +71,8 @@ try { btl = - new BigTableLoader(pluginPath.getPath(), this.getClass().getClassLoader()); + new BigTableLoader(pluginPath.getPath(), + this.getClass().getClassLoader()); } catch (MalformedURLException ex) { LOG.fatal(ex, ex); } @@ -73,7 +80,8 @@ LOG.info("getBigtable() : " + btl.getBigTable()); - bigTable = new OurHashMap2(); + bigTable = btl.getBigTable("BigHashMapV2"); +// bigTable = new OurHashMap2(); bigTable.createTable("table1"); bigTable.createTable("table2"); bigTable.createColumn("table1", "column1");

1 0

r176 - in trunk: msm msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/META-INF/services msm-bighashmapV2/META-INF/services
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 18:57:28 +0100 (Wed, 03 Mar 2010) New Revision: 176 Added: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable Removed: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable Modified: trunk/msm/pom.xml trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Il ne reste plus grand chose pour pouvoir utiliser le plugin BigHashMapV2, J'ai l'impression que lors du build, le Dossier META-INF de chaque plugin n'est pas copi?\195?\169 dans le jar final.. Modified: trunk/msm/pom.xml =================================================================== --- trunk/msm/pom.xml 2010-03-03 17:08:42 UTC (rev 175) +++ trunk/msm/pom.xml 2010-03-03 17:57:28 UTC (rev 176) @@ -285,3 +285,4 @@ </project> + 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-03 17:08:42 UTC (rev 175) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 17:57:28 UTC (rev 176) @@ -1,6 +1,8 @@ package org.nuiton.mapstoragemanager.ui.gui; import java.awt.Desktop; +import java.io.File; +import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; import java.util.Locale; @@ -17,8 +19,10 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.MsmConfig; +import org.nuiton.mapstoragemanager.core.BigTableLoader; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +//import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -47,8 +51,29 @@ * Constructor. */ private ApplicationEngine() { + + String basedir = new File("").getAbsolutePath(); + File msnBasedir = new File(basedir).getParentFile(); + String toPlugin = "msm-bighashmapV2/target/classes/org/nuiton/mapstoragemanager/plugins/bighashmapv2"; + File pluginPath = new File(msnBasedir, toPlugin); - bigTable = new OurHashMap2(); + BigTableLoader btl = null; + + LOG.info("basedir : " + basedir + '\n' + + "msnBbasedir : " + msnBasedir + '\n' + + "pluginPath : " + pluginPath.getPath()); + + try { + btl = + new BigTableLoader(pluginPath.getPath(), this.getClass().getClassLoader()); + } catch (MalformedURLException ex) { + LOG.fatal(ex, ex); + } + + LOG.info("getBigtable() : " + btl.getBigTable()); + + + bigTable = new OurHashMap2(); bigTable.createTable("table1"); bigTable.createTable("table2"); bigTable.createColumn("table1", "column1"); Added: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable =================================================================== --- trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (rev 0) +++ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable 2010-03-03 17:57:28 UTC (rev 176) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap \ No newline at end of file Deleted: trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable =================================================================== --- trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-03-03 17:08:42 UTC (rev 175) +++ trunk/msm-bighashmap/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-03-03 17:57:28 UTC (rev 176) @@ -1 +0,0 @@ -org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap \ No newline at end of file Added: trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable =================================================================== --- trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (rev 0) +++ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable 2010-03-03 17:57:28 UTC (rev 176) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2 \ No newline at end of file Deleted: trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable =================================================================== --- trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-03-03 17:08:42 UTC (rev 175) +++ trunk/msm-bighashmapV2/META-INF/services/org.nuiton.mapstoragemanager.plugins.NewBigTable 2010-03-03 17:57:28 UTC (rev 176) @@ -1 +0,0 @@ -org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMap \ No newline at end of file

1 0

r175 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 18:08:42 +0100 (Wed, 03 Mar 2010) New Revision: 175 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java Log: pr?\195?\169paration utilisation plugin BigHashMapV2 bien avanc?\195?\169. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 16:54:44 UTC (rev 174) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 17:08:42 UTC (rev 175) @@ -1,11 +1,14 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.util.Iterator; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Set; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; -import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; /** @@ -18,12 +21,12 @@ /** * columnNames. */ - private String[] titres; + private String[] columnNames; /** * data. */ - private String[][] data; + private Map<Integer, List<String>> data; /** * Constructor. @@ -32,25 +35,32 @@ */ public ColumnModel(final TreeNode parent, final DefaultMutableTreeNode node) { - String table = parent.toString(); - String column = node.toString(); + // table and column names. + String tableName = parent.toString(); + String columnName = node.toString(); + ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 testHashmap2 = (OurHashMap2) engine.getBigTable(); - titres = new String[2]; - titres[0] = _("table.keys"); - titres[1] = _("table.values"); + BigTable bigTable = engine.getBigTable(); + columnNames = new String[2]; + columnNames[0] = _("table.keys"); + columnNames[1] = _("table.values"); + + Set<String> tableKeys = bigTable.getKeys(tableName); + //content - Set<String> keySetTable = testHashmap2.getKeys(table, column); - Iterator i = keySetTable.iterator(); - data = new String[2][keySetTable.size()]; + data = new HashMap<Integer, List<String>>(); + data.put(0, new ArrayList<String>()); + data.put(1, new ArrayList<String>()); + int j = 0; - while (i.hasNext()) { - String key = (String) i.next(); - String value = testHashmap2.get(table, column, key); - data[0][j] = key; - data[1][j] = value; - j++; + for (String key : tableKeys) { + String value = bigTable.get(tableName, columnName, key); + if (value != null) { + data.get(0).add(j, key); + data.get(1).add(j, value); + j++; + } } } @@ -59,7 +69,7 @@ */ @Override public final Object getValueAt(final int rowIndex, final int colIndex) { - return data[colIndex][rowIndex]; + return data.get(colIndex).get(rowIndex); } /** @@ -67,7 +77,7 @@ */ @Override public final int getColumnCount() { - return titres.length; + return columnNames.length; } /** @@ -75,7 +85,7 @@ */ @Override public final int getRowCount() { - return data[0].length; + return data.get(0).size(); } /** @@ -83,7 +93,7 @@ */ @Override public final String getColumnName(final int col) { - return titres[col]; + return columnNames[col]; } /** Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 16:54:44 UTC (rev 174) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 17:08:42 UTC (rev 175) @@ -1,10 +1,9 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.util.Iterator; import java.util.Set; import javax.swing.table.AbstractTableModel; import javax.swing.tree.DefaultMutableTreeNode; -import org.nuiton.mapstoragemanager.plugins.OurHashMap2; +import org.nuiton.mapstoragemanager.plugins.BigTable; import static org.nuiton.i18n.I18n._; /** @@ -37,12 +36,12 @@ String table = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 hashmap = (OurHashMap2) engine.getBigTable(); - Set<String> columnsNames = hashmap.getColumnsNames(table); + BigTable bigTable = engine.getBigTable(); + Set<String> columnsNames = bigTable.getColumnsNames(table); //content - Set<String> keySetTable = hashmap.getKeys(table); - Iterator<String> columnName = columnsNames.iterator(); + Set<String> tableKeys = bigTable.getKeys(table); +// Iterator<String> columnName = columnsNames.iterator(); /** * indexes @@ -53,23 +52,21 @@ if (showTableKeys) { titles = new String[columnsNames.size() + 1]; titles[0] = _("table.keys"); - data = new String[columnsNames.size() + 1][keySetTable.size()]; + data = new String[columnsNames.size() + 1][tableKeys.size()]; colIndex++; } else { titles = new String[columnsNames.size()]; - data = new String[columnsNames.size()][keySetTable.size()]; + data = new String[columnsNames.size()][tableKeys.size()]; } - while (columnName.hasNext()) { - String titreTemp = columnName.next(); - titles[colIndex] = titreTemp; + for (String columnName : columnsNames) { + + titles[colIndex] = columnName; + rowindex = 0; - Set<String> columnKeys = hashmap.getKeys(table, titles[colIndex]); - Iterator<String> columnKey = columnKeys.iterator(); - while (columnKey.hasNext()) { - String key = columnKey.next(); - String str = hashmap.get(table, titreTemp, key); + for (String key : tableKeys) { + String str = bigTable.get(table, columnName, key); if (showTableKeys) { data[0][rowindex] = key; }

1 0

r174 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core
by gcrieloue＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: gcrieloue Date: 2010-03-03 17:54:44 +0100 (Wed, 03 Mar 2010) New Revision: 174 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java Log: Utilisation de la m?\195?\169thode getPluginName pour les cl?\195?\169s de la map dans le BigTableLoader Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 16:17:20 UTC (rev 173) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-03 16:54:44 UTC (rev 174) @@ -60,15 +60,8 @@ bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - /** - * Identifiant for the plugin - */ - - //define better identifiants - int pluginNumber = 0; for (BigTable bigTableImpl : bigTableSetLoader) { - plugins.put("BigTable" + pluginNumber, bigTableImpl); - pluginNumber++; + plugins.put(bigTableImpl.getPluginName(), bigTableImpl); } }

1 0

r173 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui/gui resources/i18n
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 17:17:20 +0100 (Wed, 03 Mar 2010) New Revision: 173 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Log: Preparation de l'application pour utiliser le plugin BigHashMapV2. 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-03 14:16:36 UTC (rev 172) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 16:17:20 UTC (rev 173) @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.Locale; import java.util.Properties; -import java.util.ResourceBundle; import java.util.Set; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -18,6 +17,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; import org.nuiton.mapstoragemanager.MsmConfig; +import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.OurHashMap2; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -34,9 +34,9 @@ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); /** - * OurHashMap2. + * BigTable. */ - private OurHashMap2 ohm; + private BigTable bigTable; /** * classe instance (singleton pattern). @@ -48,26 +48,26 @@ */ private ApplicationEngine() { - ohm = new OurHashMap2(); - ohm.createTable("table1"); - ohm.createTable("table2"); - ohm.createColumn("table1", "column1"); - ohm.createColumn("table1", "column2"); - ohm.createColumn("table2", "column3"); - ohm.createColumn("table2", "column4"); - ohm.createColumn("table2", "column5"); + bigTable = new OurHashMap2(); + bigTable.createTable("table1"); + bigTable.createTable("table2"); + bigTable.createColumn("table1", "column1"); + bigTable.createColumn("table1", "column2"); + bigTable.createColumn("table2", "column3"); + bigTable.createColumn("table2", "column4"); + bigTable.createColumn("table2", "column5"); - ohm.put("table1", "column1", "1", "content1"); - ohm.put("table1", "column1", "2", "content2"); - ohm.put("table1", "column2", "3", "content3"); - ohm.put("table1", "column2", "4", "content4"); + bigTable.put("table1", "column1", "1", "content1"); + bigTable.put("table1", "column1", "2", "content2"); + bigTable.put("table1", "column2", "3", "content3"); + bigTable.put("table1", "column2", "4", "content4"); - ohm.put("table2", "column3", "5", "content5"); - ohm.put("table2", "column3", "6", "content6"); - ohm.put("table2", "column4", "7", "content7"); - ohm.put("table2", "column4", "8", "content8"); - ohm.put("table2", "column5", "9", "content9"); - ohm.put("table2", "column5", "10", "content10"); + bigTable.put("table2", "column3", "5", "content5"); + bigTable.put("table2", "column3", "6", "content6"); + bigTable.put("table2", "column4", "7", "content7"); + bigTable.put("table2", "column4", "8", "content8"); + bigTable.put("table2", "column5", "9", "content9"); + bigTable.put("table2", "column5", "10", "content10"); } /** @@ -137,7 +137,7 @@ //connection verification boolean goodUse = true; - goodUse = ohm.connect(new Properties()); + goodUse = bigTable.connect(new Properties()); if (goodUse) { //update tree @@ -149,7 +149,7 @@ DefaultMutableTreeNode root; root = (DefaultMutableTreeNode) model.getRoot(); DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); - Set<String> tableNames = ohm.getTablesNames(); + Set<String> tableNames = bigTable.getTablesNames(); Iterator i = tableNames.iterator(); while (i.hasNext()) { @@ -160,7 +160,7 @@ dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); //display the node column - Set<String> columnNames = ohm.getColumnsNames(tableName); + Set<String> columnNames = bigTable.getColumnsNames(tableName); Iterator i2 = columnNames.iterator(); while (i2.hasNext()) { String columnName = (String) i2.next(); @@ -255,19 +255,19 @@ //GETTERS AND SETTERS /** - * Getter OurHashMap. - * @return ohm our hash map + * Getter BigTable. + * @return the application engine's bigtable. */ - public OurHashMap2 getOurHashMap() { - return ohm; + public BigTable getBigTable() { + return bigTable; } /** - * Setter OurHashMap. - * @param ourhashmap our hash map + * Setter BigTable. + * @param bigTable the bigtable to use. */ - public void setOurHashMap(final OurHashMap2 ourhashmap) { - this.ohm = ourhashmap; + public void setBigTable(final BigTable bigTable) { + this.bigTable = bigTable; } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 14:16:36 UTC (rev 172) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ColumnModel.java 2010-03-03 16:17:20 UTC (rev 173) @@ -35,7 +35,7 @@ String table = parent.toString(); String column = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 testHashmap2 = engine.getOurHashMap(); + OurHashMap2 testHashmap2 = (OurHashMap2) engine.getBigTable(); titres = new String[2]; titres[0] = _("table.keys"); titres[1] = _("table.values"); Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 14:16:36 UTC (rev 172) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/TableModel.java 2010-03-03 16:17:20 UTC (rev 173) @@ -37,7 +37,7 @@ String table = node.toString(); ApplicationEngine engine = ApplicationEngine.getInstance(); - OurHashMap2 hashmap = engine.getOurHashMap(); + OurHashMap2 hashmap = (OurHashMap2) engine.getBigTable(); Set<String> columnsNames = hashmap.getColumnsNames(table); //content Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 14:16:36 UTC (rev 172) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 16:17:20 UTC (rev 173) @@ -1,40 +1,40 @@ -Empty=Empty -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 14:16:36 UTC (rev 172) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 16:17:20 UTC (rev 173) @@ -1,40 +1,40 @@ -Empty=Vide -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.language=choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Permet de configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablis une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.language=choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Permet de configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager

1 0

r172 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources/i18n
by fgilet＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: fgilet Date: 2010-03-03 15:16:36 +0100 (Wed, 03 Mar 2010) New Revision: 172 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Log: MessagePanel am?\195?\169lior?\195?\169 (thread) 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-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-03 14:16:36 UTC (rev 172) @@ -10,7 +10,9 @@ import static org.nuiton.i18n.I18n._; import javax.swing.JLabel; import org.nuiton.mapstoragemanager.MsmConfig; + import org.nuiton.mapstoragemanager.ui.gui.MessageThread; + ApplicationEngine engine = ApplicationEngine.getInstance(); /** @@ -60,20 +62,29 @@ * @param code code error (for images). */ public void displayMessage(String message, int code){ + + //clear the message panel this.getMessagesPanel().removeAll(); - - /* - if (code==0){ - ImageIcon icon = new ImageIcon(getClass().getResource("ok_16.png")); + + //display message + if (code==0){ + String icon ="ok_16"; }else if (code==1){ - ImageIcon icon = new ImageIcon(getClass().getResource("warning_16.png")); + String icon ="warning_16.png"; }else if (code==2){ - ImageIcon icon = new ImageIcon(getClass().getResource("cancel_16.png")); + String icon ="cancel_16.png"; } - */ - //JLabel label = new JLabel(message, icon, SwingConstants.CENTER); + JLabel label = new JLabel(message); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); this.getMessagesPanel().add(label); + this.getMessagesPanel().repaint(); + this.getMessagesPanel().revalidate(); + + //remove message after a short time + MessageThread m = new MessageThread(); + m.start(); + } /** 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-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 14:16:36 UTC (rev 172) @@ -34,16 +34,6 @@ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); /** - * current Locale. - */ - private Locale currentLocale; - - /** - * ResourceBundle. - */ - private ResourceBundle messages; - - /** * OurHashMap2. */ private OurHashMap2 ohm; @@ -125,10 +115,8 @@ * @param ui application's ui */ public void clean(final MainUI ui) { - ui.getNavigation().setVisible(false); - ui.getTableContent().setVisible(false); - ui.getTableName().setVisible(false); - ui.getTableTips().setVisible(false); + ui.getNavigation().removeAll(); + ui.getNavigation().setModel(ui.getModelTree()); } /** @@ -184,11 +172,14 @@ } - + String connexionOk = _("connectionValid"); + ui.displayMessage(connexionOk, 0); ui.getNavigation().repaint(); ui.getNavigation().revalidate(); } else { //display error + String connexionNok = _("connectionError"); + ui.displayMessage(connexionNok, 2); JOptionPane.showMessageDialog(null, _("connectionError")); } Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-03 14:16:36 UTC (rev 172) @@ -0,0 +1,41 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.ui.gui; + +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JLabel; +import org.nuiton.mapstoragemanager.ui.MainUI; + +/** + * + * @author E045231P + */ +public class MessageThread extends Thread { + + /** + * Constructor. + */ + public MessageThread() { + super(); + } + + @Override + public void run() { + MainUI ui = MainUI.getInstance(); + try { + this.sleep(5000); + ui.getMessagesPanel().removeAll(); + ui.getMessagesPanel().add(new JLabel(" ")); + ui.getMessagesPanel().repaint(); + ui.getMessagesPanel().revalidate(); + } catch (InterruptedException ex) { + Logger.getLogger(MessageThread.class.getName()).log(Level.SEVERE, null, ex); + } + + } +} + Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 14:16:36 UTC (rev 172) @@ -1,6 +1,7 @@ Empty=Empty Map\ Storage\ Manager=Map Storage Manager connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established jaxxdemo.message.goto.site=Visit site login\ \:=Login mapstoragemanager.action.aboutUs=About us Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 14:16:36 UTC (rev 172) @@ -1,6 +1,7 @@ Empty=Vide Map\ Storage\ Manager=Map Storage Manager connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie jaxxdemo.message.goto.site=Visitez le site login\ \:=Identifiant mapstoragemanager.action.aboutUs=A propos

1 0

r171 - trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 13:42:10 +0100 (Wed, 03 Mar 2010) New Revision: 171 Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java Log: suppression exception catach?\195?\169e inutilement 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-03 12:41:12 UTC (rev 170) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-03 12:42:10 UTC (rev 171) @@ -119,7 +119,7 @@ String content; for (String key : keys) { - try { +// try { content = bigTable.get(tableName, columnName, key); if (content != null && !"".equals(content)) { @@ -139,9 +139,9 @@ // we add the value to the cell. cell.addContent(value); } - } catch (NoSuchElementException e) { - LOG.trace(e, e); - } +// } catch (NoSuchElementException e) { +// LOG.trace(e, e); +// } } }

1 0

r170 - trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org 03 Mar '10

03 Mar '10

Author: dlanglais Date: 2010-03-03 13:41:12 +0100 (Wed, 03 Mar 2010) New Revision: 170 Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java Log: r?\195?\169paration du build qui logiquement a p?\195?\169t?\195?\169 et logiquement devrait builder. 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-03 12:24:09 UTC (rev 169) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-03 12:41:12 UTC (rev 170) @@ -121,7 +121,7 @@ for (String key : keys) { try { content = bigTable.get(tableName, columnName, key); - if (!"".equals(content)) { + if (content != null && !"".equals(content)) { // new cell Element. Element cell = new Element("cell");

1 0