[Mapstoragemanager-commits] r213 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui: . gui

11 Mar 2010

Author: dlanglais
Date: 2010-03-11 11:04:17 +0100 (Thu, 11 Mar 2010)
New Revision: 213

Log:
modification menu de connexion

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

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-11 07:30:09 UTC (rev 212)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css	2010-03-11 10:04:17 UTC (rev 213)
@@ -35,7 +35,7 @@
     mnemonic:E;
 }
 
-#menuConnect {
+#menuConnect, #menuConnectBis {
     text:"mapstoragemanager.action.connect";
     toolTipText:"mapstoragemanager.action.connect.tip";
     actionIcon:"connect";

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-11 07:30:09 UTC (rev 212)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-03-11 10:04:17 UTC (rev 213)
@@ -120,8 +120,9 @@
 	
     <JMenuBar>
         <JMenu id='menuFile'>
-            <JMenuItem id='menuConnect'
-                       onActionPerformed='engine.showToolBar()'/>
+            <!--JMenuItem id='menuConnect'
+                       onActionPerformed='engine.showToolBar()'/-->
+            <JMenu id='menuConnectBis' enabled='false'/>
             <JMenuItem id='menuDisconnect' enabled='false'
                        onActionPerformed='engine.disposeToolBar()'/>
             <JSeparator/>
@@ -182,7 +183,7 @@
                <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/>
             </JToolBar>
 
-            <JInternalFrame id='importFrame' title="Import Database" width='275' height='60' resizable='false' visible='false' opaque='true' >
+            <JInternalFrame id='importFrame' title="Import Database" width='300' height='60' resizable='false' visible='false' opaque='true' >
                 <JPanel id='importPanel'>
                     <JLabel text="Importer :" actionIcon='database_16' styleClass='boldUnderline' />
                     <JAXXComboBox id='importer' onActionPerformed='engine.doSomething()' >
@@ -192,7 +193,7 @@
                 </JPanel>
             </JInternalFrame>
 
-            <JInternalFrame id='exportFrame' title="Export Database" width='275' height='60' resizable='false' visible='false' opaque='true' >
+            <JInternalFrame id='exportFrame' title="Export Database" width='300' height='60' resizable='false' visible='false' opaque='true' >
                 <JPanel id='exportPanel'>
                     <JLabel text="Exporter :" actionIcon='database_16' styleClass='boldUnderline' />
                     <JAXXComboBox id='exporter' onActionPerformed='engine.doSomething()' >

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-11 07:30:09 UTC (rev 212)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java	2010-03-11 10:04:17 UTC (rev 213)
@@ -69,7 +69,7 @@
      * msmBasedir.
      */
     private static final File MSM_BASEDIR =
-        new File(new File("").getAbsolutePath()).getParentFile();
+            new File(new File("").getAbsolutePath()).getParentFile();
 
     /**
      * Constructor.
@@ -83,13 +83,13 @@
         try {
             String toPlugin = "plugins/";
             String pluginsFolderPath =
-                new File(MSM_BASEDIR, toPlugin).getPath();
+                    new File(MSM_BASEDIR, toPlugin).getPath();
 
             LOG.info("msmBasedir : " + MSM_BASEDIR + '\n'
-                + "pluginsFolderPath : " + pluginsFolderPath);
+                    + "pluginsFolderPath : " + pluginsFolderPath);
 
             pluginLoader = new PluginLoader(pluginsFolderPath,
-                this.getClass().getClassLoader());
+                    this.getClass().getClassLoader());
         } catch (MalformedURLException ex) {
             LOG.error(ex, ex);
         }
@@ -110,7 +110,7 @@
 
         int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]);
 
-        if( JFileChooser.APPROVE_OPTION == jfcReturn ) {
+        if (JFileChooser.APPROVE_OPTION == jfcReturn) {
 //            case JFileChooser.CANCEL_OPTION:
 //            case JFileChooser.ERROR_OPTION:
 //            case JFileChooser.APPROVE_OPTION:
@@ -118,7 +118,7 @@
             File pluginPath = jfc.getSelectedFile();
 
             LOG.info("msmBasedir : " + MSM_BASEDIR + '\n'
-                + "pluginPath : " + pluginPath.getAbsolutePath());
+                    + "pluginPath : " + pluginPath.getAbsolutePath());
 
             pluginLoader.loadPlugin(pluginPath);
 
@@ -126,11 +126,22 @@
 
             MainUI ui = MainUI.getInstance();
             for (Plugin btPlugin : pluginLoader.getAllPlugin(BigTable.class)) {
-                String btName = btPlugin.getPluginName();
+                final String btName = btPlugin.getPluginName();
                 jaxx.runtime.swing.Item bigTableItem =
-                    new jaxx.runtime.swing.Item(btName, null, btName, true);
+                        new jaxx.runtime.swing.Item(btName, null, btName, true);
                 ui.getNameBase().addItem(bigTableItem);
                 ui.getNameBase().setSelectedItem(bigTableItem);
+
+                JMenuItem menuItem = new JMenuItem(btName);
+                menuItem.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        connection(btName);
+                    }
+                });
+                ui.getMenuConnectBis().add(menuItem);
+                ui.getMenuConnectBis().setEnabled(true);
             }
             for (Plugin imPlugin : pluginLoader.getAllPlugin(Importer.class)) {
                 final String imName = imPlugin.getPluginName();
@@ -148,7 +159,7 @@
                     }
                 });
                 ui.getMenuImportBis().add(menuItem);
-                ui.getMenuImportBis ().setEnabled(true);
+                ui.getMenuImportBis().setEnabled(true);
             }
             for (Plugin exPlugin : pluginLoader.getAllPlugin(Exporter.class)) {
                 final String exName = exPlugin.getPluginName();
@@ -225,6 +236,7 @@
      */
     public void disposeToolBar() {
         MainUI ui = MainUI.getInstance();
+        setBigTable(null);
         ui.getToolBar().setVisible(false);
         clean(ui);
     }
@@ -244,64 +256,142 @@
     public void connection() {
 
         MainUI ui = MainUI.getInstance();
+//
+//        //update menu
+//        ui.getMenuDisconnect().setEnabled(true);
 
-        //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();
 
-        LOG.info("nameBase: " + nameBase
-            + " login: " + login
-            + " mdp: " + password);
-        if ("OurHashMap".equals(nameBase)) {
-            bigTable = new OurHashMap2();
-        } else {
-            bigTable = (BigTable) pluginLoader.getPlugin(nameBase);
+        this.connection(nameBase);
+//        String login = ui.getLogin().getText();
+//        char[] password = ui.getPassword().getPassword();
+//
+//        LOG.info("nameBase: " + nameBase
+//                + " login: " + login
+//                + " mdp: " + password);
+//        if ("OurHashMap".equals(nameBase)) {
+//            bigTable = new OurHashMap2();
+//        } else {
+//            bigTable = (BigTable) pluginLoader.getPlugin(nameBase);
+//        }
+//
+//        {
+//            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());
+//
+//        if (goodUse) {
+//
+//            //update tree
+//            uptableNavigationTree(ui.getNavigation(), nameBase);
+//
+//            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"));
+//        }
+
+    }
+
+    /**
+     * Try to connect the user to a database.
+     */
+    public void connection(String nameBase) {
+        
+        int response = 0;
+        if (bigTableIsSet()) {
+            response = JOptionPane.showConfirmDialog(null,
+                _("alreadyConnected.JOptionPaneMessage"),
+                _("alreadyConnected.JOptionPaneTitle"),
+                JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
         }
 
-        {
-            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");
+        if (response == JOptionPane.YES_OPTION) {
+            System.out.println("Yes button clicked");
 
-            bigTable.put("table1", "column1", "1", "content1");
-            bigTable.put("table1", "column1", "2", "content2");
-            bigTable.put("table1", "column2", "3", "content3");
-            bigTable.put("table1", "column2", "4", "content4");
+            if (nameBase == null) {
+                JOptionPane.showMessageDialog(MainUI.getInstance(),
+                    _("notFoundPlugin.JOptionPaneMessage"),
+                    _("notFoundPlugin.JOptionPaneTitle"),
+                    JOptionPane.ERROR_MESSAGE);
+                
+            } else {
+                MainUI ui = MainUI.getInstance();
 
-            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");
-        }
+                //update menu
+                ui.getMenuDisconnect().setEnabled(true);
 
-        //connection verification
-        boolean goodUse = true;
-        goodUse = bigTable.connect(new Properties());
+                bigTable = (BigTable) pluginLoader.getPlugin(nameBase);
 
-        if (goodUse) {
+                {
+                    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");
 
-            //update tree
-            uptableNavigationTree(ui.getNavigation(), nameBase);
+                    bigTable.put("table1", "column1", "1", "content1");
+                    bigTable.put("table1", "column1", "2", "content2");
+                    bigTable.put("table1", "column2", "3", "content3");
+                    bigTable.put("table1", "column2", "4", "content4");
 
-            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"));
+                    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());
+
+                if (goodUse) {
+
+                    //update tree
+                    uptableNavigationTree(ui.getNavigation(), nameBase);
+
+                    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"));
+                }
+            }
         }
 
     }
@@ -349,7 +439,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) {
@@ -422,7 +512,7 @@
                 DefaultMutableTreeNode columnNameToInsert;
                 columnNameToInsert = new DefaultMutableTreeNode(columnName);
                 dtm.insertNodeInto(columnNameToInsert, tableNameInsert,
-                    tableNameInsert.getChildCount());
+                        tableNameInsert.getChildCount());
             }
 
         }
@@ -505,15 +595,15 @@
 
         if (importer == null) {
             JOptionPane.showMessageDialog(MainUI.getInstance(),
-                _("notFoundPlugin.JOptionPaneTitle"),
-                _("notFoundPlugin.JOptionPaneMessage"),
-                JOptionPane.ERROR_MESSAGE);
-        } else if (! bigTableIsSet()) {
+                    _("notFoundPlugin.JOptionPaneMessage"),
+                    _("notFoundPlugin.JOptionPaneTitle"),
+                    JOptionPane.ERROR_MESSAGE);
+        } else if (!bigTableIsSet()) {
             JOptionPane.showMessageDialog(MainUI.getInstance(),
-                _("unconnectedError.JOptionPaneTitle"),
-                _("unconnectedError.JOptionPaneMessage"),
-                JOptionPane.ERROR_MESSAGE);
-            
+                    _("unconnectedError.JOptionPaneMessage"),
+                    _("unconnectedError.JOptionPaneTitle"),
+                    JOptionPane.ERROR_MESSAGE);
+
         } else {
 
             /** Create FileChooser and set FileFilter.   */
@@ -523,7 +613,7 @@
             /** ShowOpenDialog and get the return value. */
             int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]);
 
-            if( JFileChooser.APPROVE_OPTION == jfcReturn ) {
+            if (JFileChooser.APPROVE_OPTION == jfcReturn) {
 
                 lastPath = jfc.getSelectedFile().getAbsolutePath();
 
@@ -536,18 +626,18 @@
                     MainUI ui = MainUI.getInstance();
                     clean(ui);
                     uptableNavigationTree(ui.getNavigation(),
-                        importFile.getName());
+                            importFile.getName());
 
                     JOptionPane.showMessageDialog(MainUI.getInstance(),
-                        _("importSuccessfull.JOptionPaneTitle"),
-                        _("importSuccessfull.JOptionPaneMessage"),
-                        JOptionPane.INFORMATION_MESSAGE);
+                            _("importSuccessfull.JOptionPaneMessage"),
+                            _("importSuccessfull.JOptionPaneTitle"),
+                            JOptionPane.INFORMATION_MESSAGE);
                 } catch (Exception ex) {
                     LOG.error(ex, ex);
                     JOptionPane.showMessageDialog(MainUI.getInstance(),
-                        _("importUnsuccessfull.JOptionPaneTitle"),
-                        _("importUnsuccessfull.JOptionPaneMessage"),
-                        JOptionPane.ERROR_MESSAGE);
+                            _("importUnsuccessfull.JOptionPaneMessage"),
+                            _("importUnsuccessfull.JOptionPaneTitle"),
+                            JOptionPane.ERROR_MESSAGE);
                 }
             }
         }
@@ -564,14 +654,14 @@
 
         if (exporter == null) {
             JOptionPane.showMessageDialog(MainUI.getInstance(),
-                _("notFoundPlugin.JOptionPaneTitle"),
-                _("notFoundPlugin.JOptionPaneMessage"),
-                JOptionPane.ERROR_MESSAGE);
-        } else if (! bigTableIsSet()) {
+                    _("notFoundPlugin.JOptionPaneMessage"),
+                    _("notFoundPlugin.JOptionPaneTitle"),
+                    JOptionPane.ERROR_MESSAGE);
+        } else if (!bigTableIsSet()) {
             JOptionPane.showMessageDialog(MainUI.getInstance(),
-                _("unconnectedError.JOptionPaneTitle"),
-                _("unconnectedError.JOptionPaneMessage"),
-                JOptionPane.ERROR_MESSAGE);
+                    _("unconnectedError.JOptionPaneMessage"),
+                    _("unconnectedError.JOptionPaneTitle"),
+                    JOptionPane.ERROR_MESSAGE);
         } else {
 
             /** Create FileChooser and set FileFilter.   */
@@ -592,15 +682,15 @@
                     /** Export */
                     exporter.exportTo(bigTable, importFile);
                     JOptionPane.showMessageDialog(MainUI.getInstance(),
-                        _("exportSuccessfull.JOptionPaneTitle"),
-                        _("exportSuccessfull.JOptionPaneMessage"),
-                        JOptionPane.INFORMATION_MESSAGE);
+                            _("exportSuccessfull.JOptionPaneMessage"),
+                            _("exportSuccessfull.JOptionPaneTitle"),
+                            JOptionPane.INFORMATION_MESSAGE);
                 } catch (Exception ex) {
                     LOG.error(ex, ex);
                     JOptionPane.showMessageDialog(MainUI.getInstance(),
-                        _("exportUnsuccessfull.JOptionPaneTitle"),
-                        _("exportUnsuccessfull.JOptionPaneMessage"),
-                        JOptionPane.ERROR_MESSAGE);
+                            _("exportUnsuccessfull.JOptionPaneMessage"),
+                            _("exportUnsuccessfull.JOptionPaneTitle"),
+                            JOptionPane.ERROR_MESSAGE);
                 }
             }
         }

    

[Mapstoragemanager-commits] r213 - in trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui: . gui

dlanglais＠users.nuiton.org