Author: dlanglais Date: 2010-03-04 03:19:58 +0100 (Thu, 04 Mar 2010) New Revision: 181 Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java Log: Modifications mineures pour la qualit?\195?\169. Cr?\195?\169ation d'une m?\195?\169thode updateNavigationTree(...) pour s?\195?\169parer cette fonctionnalit?\195?\169 de connection() sur ApplicationEngine. 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-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-03-04 02:19:58 UTC (rev 181) @@ -63,7 +63,7 @@ * Load a plugin. * @param file the plugin file. */ - public void loadPlugin(final File file) { + public final void loadPlugin(final File file) { LOG.info("Load plugin : " + file.getAbsolutePath()); if (file.getAbsolutePath().endsWith(".jar")) { 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-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-04 02:19:58 UTC (rev 181) @@ -36,22 +36,19 @@ * Logger. */ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); - /** * BigTable. */ private BigTable bigTable; - - /** + /** * classe instance (singleton pattern). */ - private static ApplicationEngine instance = null; - + private static ApplicationEngine instance = null; /** * BigtableLoader. */ private static BigTableLoader btl; - + /** * Constructor. */ @@ -90,11 +87,15 @@ JFileChooser jfc = new javax.swing.JFileChooser(msnBasedir); jfc.getSelectedFiles(); // File pluginPath = new File(msnBasedir, toPlugin); - switch(jfc.showOpenDialog(MainUI.getFrames()[0])) { - case JFileChooser.CANCEL_OPTION : return; - case JFileChooser.ERROR_OPTION : return; - case JFileChooser.APPROVE_OPTION : break; - default : break; + switch (jfc.showOpenDialog(MainUI.getFrames()[0])) { + case JFileChooser.CANCEL_OPTION: + return; + case JFileChooser.ERROR_OPTION: + return; + case JFileChooser.APPROVE_OPTION: + break; + default: + break; } File pluginPath = jfc.getSelectedFile(); @@ -106,7 +107,7 @@ + "pluginPath : " + pluginPath.getAbsolutePath()); // try { - btl.loadPlugin(pluginPath); + btl.loadPlugin(pluginPath); // bigTableLoader = // new BigTableLoader(pluginPath.getPath(), // this.getClass().getClassLoader()); @@ -166,31 +167,31 @@ Main.setLocale(locale); } - /** + /** * Show toolBar in order to connect. */ - public void showToolBar() { + public void showToolBar() { MainUI ui = MainUI.getInstance(); ui.getToolBar().setVisible(true); - } + } - /** + /** * Hide toolBar in order to disconnect. */ - public void disposeToolBar() { - MainUI ui = MainUI.getInstance(); - ui.getToolBar().setVisible(false); - clean(ui); - } + public void disposeToolBar() { + MainUI ui = MainUI.getInstance(); + ui.getToolBar().setVisible(false); + clean(ui); + } - /** - * Clean the application. - * @param ui application's ui - */ - public void clean(final MainUI ui) { + /** + * Clean the application. + * @param ui application's ui + */ + public void clean(final MainUI ui) { ui.getNavigation().removeAll(); ui.getNavigation().setModel(ui.getModelTree()); - } + } /** * Try to connect the user to a database. @@ -203,16 +204,19 @@ ui.getMenuDisconnect().setEnabled(true); Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); - String nameBase = selectedItems.getValue().toString(); - String login = ui.getLogin().getText(); - char[] password = ui.getPassword().getPassword(); + String nameBase = selectedItems.getValue().toString(); + String login = ui.getLogin().getText(); + char[] password = ui.getPassword().getPassword(); - if (nameBase.equals("OurHashMap")) { + LOG.info("nameBase: " + nameBase + + " login: " + login + + " mdp: " + password); + if ("OurHashMap".equals(nameBase)) { bigTable = new OurHashMap2(); } else { bigTable = btl.getBigTable(nameBase); } -// bigTable = new OurHashMap2(); + { bigTable.createTable("table1"); bigTable.createTable("table2"); @@ -240,38 +244,33 @@ goodUse = bigTable.connect(new Properties()); if (goodUse) { + //update tree - JTree tree = ui.getNavigation(); - tree.setModel(new MSMModel(nameBase)); - tree.addTreeSelectionListener(new MSMNavigationListener()); - - TreeModel model = tree.getModel(); - DefaultMutableTreeNode root; - root = (DefaultMutableTreeNode) model.getRoot(); - DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); - Set<String> tableNames = bigTable.getTablesNames(); - Iterator i = tableNames.iterator(); - while (i.hasNext()) { - - //display the node table - String tableName = (String) i.next(); - DefaultMutableTreeNode tableNameInsert; - tableNameInsert = new DefaultMutableTreeNode(tableName); - dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); - - //display the node column - Set<String> columnNames = bigTable.getColumnsNames(tableName); - Iterator i2 = columnNames.iterator(); - while (i2.hasNext()) { - String columnName = (String) i2.next(); - DefaultMutableTreeNode columnNameToInsert; - columnNameToInsert = new DefaultMutableTreeNode(columnName); - dtm.insertNodeInto(columnNameToInsert, tableNameInsert, - tableNameInsert.getChildCount()); - } - - - } + uptableNavigationTree(ui.getNavigation(), nameBase); +// JTree tree = ui.getNavigation(); +// tree.setModel(new MSMModel(nameBase)); +// tree.addTreeSelectionListener(new MSMNavigationListener()); +// +// TreeModel model = tree.getModel(); +// DefaultMutableTreeNode root; +// root = (DefaultMutableTreeNode) model.getRoot(); +// DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); +// +// //display the node table +// for (String tableName : bigTable.getTablesNames()) { +// DefaultMutableTreeNode tableNameInsert; +// tableNameInsert = new DefaultMutableTreeNode(tableName); +// dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); +// +// //display the node column +// for (String columnName : bigTable.getColumnsNames(tableName)) { +// DefaultMutableTreeNode columnNameToInsert; +// columnNameToInsert = new DefaultMutableTreeNode(columnName); +// dtm.insertNodeInto(columnNameToInsert, tableNameInsert, +// tableNameInsert.getChildCount()); +// } +// +// } String connexionOk = _("connectionValid"); ui.displayMessage(connexionOk, 0); ui.getNavigation().repaint(); @@ -297,8 +296,8 @@ } /** - * Dispose engine. - */ + * Dispose engine. + */ public void dispose() { instance = null; } @@ -328,7 +327,7 @@ } if (Desktop.isDesktopSupported() - && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { Desktop.getDesktop().browse(siteURL.toURI()); } catch (Exception ex) { @@ -351,9 +350,7 @@ JOptionPane.showMessageDialog(null, message); } - //GETTERS AND SETTERS - /** * Getter BigTable. * @return the application engine's bigtable. @@ -366,11 +363,46 @@ * Setter BigTable. * @param bigTable the bigtable to use. */ - public void setBigTable(final BigTable bigTable) { + public void setBigTable(final BigTable bigTable) { this.bigTable = bigTable; } - public BigTableLoader getBigTableLoader(){ - return btl; - } + /** + * Get the bigTableLoader. + * @return return the bigTableLoader. + */ + public BigTableLoader getBigTableLoader() { + return btl; + } + + /** + * update the navigationTree. + * @param tree the navigationTree. + * @param nameBase the name of the base. + */ + private void uptableNavigationTree(JTree tree, String nameBase) { + tree.setModel(new MSMModel(nameBase)); + tree.addTreeSelectionListener(new MSMNavigationListener()); + + TreeModel model = tree.getModel(); + DefaultMutableTreeNode root; + root = (DefaultMutableTreeNode) model.getRoot(); + DefaultTreeModel dtm = ((DefaultTreeModel) tree.getModel()); + + //display the node table + for (String tableName : bigTable.getTablesNames()) { + DefaultMutableTreeNode tableNameInsert; + tableNameInsert = new DefaultMutableTreeNode(tableName); + dtm.insertNodeInto(tableNameInsert, root, root.getChildCount()); + + //display the node column + for (String columnName : bigTable.getColumnsNames(tableName)) { + DefaultMutableTreeNode columnNameToInsert; + columnNameToInsert = new DefaultMutableTreeNode(columnName); + dtm.insertNodeInto(columnNameToInsert, tableNameInsert, + tableNameInsert.getChildCount()); + } + + } + } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-04 00:33:29 UTC (rev 180) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-04 02:19:58 UTC (rev 181) @@ -2,12 +2,11 @@ * 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.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.ui.MainUI; /** @@ -16,26 +15,31 @@ */ public class MessageThread extends Thread { - /** - * Constructor. - */ - public MessageThread() { - super(); - } + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(MessageThread.class); - @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); - } + /** + * Constructor. + */ + public MessageThread() { + super(); + } + @Override + public void run() { + MainUI ui = MainUI.getInstance(); + try { + sleep(5000); + ui.getMessagesPanel().removeAll(); + ui.getMessagesPanel().add(new JLabel(" ")); + ui.getMessagesPanel().repaint(); + ui.getMessagesPanel().revalidate(); + } catch (InterruptedException ex) { + LOG.error(ex, ex); } + + } } 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-04 00:33:29 UTC (rev 180) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-04 02:19:58 UTC (rev 181) @@ -112,11 +112,13 @@ @Override public final String get(final String table, final String column, final String key) { + String ret = null; try { - return this.tables.get(table).get(column, key).toString(); + ret = this.tables.get(table).get(column, key).toString(); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** @@ -125,11 +127,13 @@ @Override public final String get(final String table, final String column, final String key, final int version) { + String ret = null; try { - return this.tables.get(table).get(column, key, version).toString(); + ret = this.tables.get(table).get(column, key, version).toString(); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** 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-04 00:33:29 UTC (rev 180) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-04 02:19:58 UTC (rev 181) @@ -112,11 +112,13 @@ @Override public final String get(final String table, final String column, final String key) { + String ret = null; try { - return this.tables.get(table).get(column, key); + ret = this.tables.get(table).get(column, key); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** @@ -125,11 +127,13 @@ @Override public final String get(final String table, final String column, final String key, final int version) { + String ret = null; try { - return this.tables.get(table).get(column, key, version); + ret = this.tables.get(table).get(column, key, version); } catch (NoSuchElementException e) { - return null; + ret = null; } + return ret; } /** 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-04 00:33:29 UTC (rev 180) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-04 02:19:58 UTC (rev 181) @@ -7,7 +7,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.NoSuchElementException; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;