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'/> + <!--item value='HBase'/> <item value='Cassandra'/> - <item value='Other'/> + <item value='Other'/--> </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