r184 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources resources/i18n resources/icons - Mapstoragemanager-commits

4 Mar 2010

Author: dlanglais
Date: 2010-03-04 13:29:29 +0100 (Thu, 04 Mar 2010)
New Revision: 184

Added:
   trunk/msm/src/main/resources/icons/Database.png
   trunk/msm/src/main/resources/icons/databaseExport_16.png
   trunk/msm/src/main/resources/icons/databaseExport_32.png
   trunk/msm/src/main/resources/icons/databaseImport_16.png
   trunk/msm/src/main/resources/icons/databaseImport_32.png
   trunk/msm/src/main/resources/icons/fleche.png
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
   trunk/msm/src/main/resources/msm.properties
Log:
Int?\195?\169gration de frame pour l'import/export de base de donn?\195?\169e.

Ic?\195?\180nes provisoires (droits ?).

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-04 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css	2010-03-04 12:29:29 UTC (rev 184)
@@ -49,6 +49,18 @@
     mnemonic:D;
 }
 
+#menuImport {
+    text:"mapstoragemanager.action.import";
+    toolTipText:"mapstoragemanager.action.import.tip";
+    actionIcon:"databaseImport_16";
+}
+
+#menuExport {
+    text:"mapstoragemanager.action.export";
+    toolTipText:"mapstoragemanager.action.export.tip";
+    actionIcon:"databaseExport_16";
+}
+
 #menuExit {
     text:"mapstoragemanager.action.exit";
     toolTipText:"mapstoragemanager.action.exit.tip";
@@ -135,7 +147,17 @@
     visible:false;
 }
 
+#importFrame {
+    visible:false;
+    /*actionIcon:"databaseImport_16";*/
+}
 
+#exportFrame {
+    visible:false;
+    /*actionIcon:"databaseExport_16";*/
+}
+
+
 JLabel.boldUnderline {
     font-weight: bold;
 }

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-04 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-03-04 12:29:29 UTC (rev 184)
@@ -119,6 +119,11 @@
             <JMenuItem id='menuDisconnect' enabled='false'
                        onActionPerformed='engine.disposeToolBar()'/>
             <JSeparator/>
+            <JMenuItem id='menuImport'
+                       onActionPerformed='engine.showImportFrame()'/>
+            <JMenuItem id='menuExport'
+                       onActionPerformed='engine.showExportFrame()'/>
+            <JSeparator/>
             <JMenuItem id='menuExit'
                        onActionPerformed='engine.close()'/>
         </JMenu>
@@ -160,9 +165,6 @@
                 <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='Cassandra'/>
-                    <item value='Other'/-->
                 </JAXXComboBox>
                 <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/>
                 <JTextField id='login'/>
@@ -171,6 +173,30 @@
                <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' >
+                <JPanel id='importPanel'>
+                    <JLabel text="Importer :" actionIcon='database_16' styleClass='boldUnderline' />
+                    <JAXXComboBox id='importer' onActionPerformed='engine.doSomething()' >
+                        <item value='                    ' selected='true'/>
+                    </JAXXComboBox>
+                    <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.importBase()'/>
+                </JPanel>
+            </JInternalFrame>
+
+            <JInternalFrame id='exportFrame' title="Export Database" width='275' 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()' >
+                        <item value='                    ' selected='true'/>
+                        <item value='A' selected='false'/>
+                        <item value='B' selected='false'/>
+                        <item value='C' selected='false'/>
+                        <item value='D' selected='false'/>
+                    </JAXXComboBox>
+                    <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.exportBase()'/>
+                </JPanel>
+            </JInternalFrame>
+
             <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' >
                    <JScrollPane>
                     <JTree id='navigation'

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 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java	2010-03-04 12:29:29 UTC (rev 184)
@@ -176,6 +176,28 @@
     }
 
     /**
+     * Show importBar in order to connect.
+     */
+    public void showImportFrame() {
+        LOG.info("showImportFrame");
+        MainUI ui = MainUI.getInstance();
+        boolean visible = ui.getImportFrame().isVisible();
+        ui.getImportFrame().setVisible(!visible);
+        clean(ui);
+    }
+
+    /**
+     * Show exportBar in order to connect.
+     */
+    public void showExportFrame() {
+        LOG.info("showExportBar");
+        MainUI ui = MainUI.getInstance();
+        boolean visible = ui.getExportFrame().isVisible();
+        ui.getExportFrame().setVisible(!visible);
+        clean(ui);
+    }
+
+    /**
      * Hide toolBar in order to disconnect.
      */
     public void disposeToolBar() {
@@ -405,4 +427,25 @@
 
         }
     }
+
+    public void importBase() {
+        JFileChooser jfc = new JFileChooser();
+        jfc.showOpenDialog(jfc);
+        File exportFile = jfc.getSelectedFile();
+        LOG.info("chosen file for import : " + exportFile.getPath());
+        
+        MainUI ui = MainUI.getInstance();
+        Item selectedItem = ui.getImporter().getSelectedJaxxItem();
+        String importerName = selectedItem.getValue().toString();
+    }
+    public void exportBase() {
+        JFileChooser jfc = new JFileChooser();
+        jfc.showSaveDialog(jfc);
+        File exportFile = jfc.getSelectedFile();
+        LOG.info("chosen file for export : " + exportFile.getPath());
+
+        MainUI ui = MainUI.getInstance();
+        Item selectedItem = ui.getExporter().getSelectedJaxxItem();
+        String exporterName = selectedItem.getValue().toString();
+    }
 }

Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-03-04 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-03-04 12:29:29 UTC (rev 184)
@@ -1,46 +1,54 @@
-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.plugin=Plugins
-mapstoragemanager.action.plugin.tip=
-mapstoragemanager.action.pluginload=Load
-mapstoragemanager.action.pluginload.tip=Load plugins
-mapstoragemanager.action.pluginshow=Show
-mapstoragemanager.action.pluginshow.tip=Show plugins
-mapstoragemanager.action.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
+Export\ Database=
+Exporter\ \:=
+Import\ Database=
+Importer\ \:=
+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.export=
+mapstoragemanager.action.export.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.import=
+mapstoragemanager.action.import.tip=
+mapstoragemanager.action.language=Choose language
+mapstoragemanager.action.language.tip=
+mapstoragemanager.action.menuHelp=Help
+mapstoragemanager.action.menuHelp.tip=
+mapstoragemanager.action.plugin=Plugins
+mapstoragemanager.action.plugin.tip=
+mapstoragemanager.action.pluginload=Load
+mapstoragemanager.action.pluginload.tip=Load plugins
+mapstoragemanager.action.pluginshow=Show
+mapstoragemanager.action.pluginshow.tip=Show plugins
+mapstoragemanager.action.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-04 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties	2010-03-04 12:29:29 UTC (rev 184)
@@ -1,46 +1,54 @@
-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=Etablir 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.plugin=Plugins
-mapstoragemanager.action.plugin.tip=
-mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer
-mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier
-mapstoragemanager.action.pluginshow=Lister
-mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible
-mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences
-mapstoragemanager.action.preferences.tip=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
+Export\ Database=
+Exporter\ \:=
+Import\ Database=
+Importer\ \:=
+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=Etablir 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.export=
+mapstoragemanager.action.export.tip=
+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.import=
+mapstoragemanager.action.import.tip=
+mapstoragemanager.action.language=Choisir la langue
+mapstoragemanager.action.language.tip=
+mapstoragemanager.action.menuHelp=Aide
+mapstoragemanager.action.menuHelp.tip=Aide contextuelle
+mapstoragemanager.action.plugin=Plugins
+mapstoragemanager.action.plugin.tip=
+mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer
+mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier
+mapstoragemanager.action.pluginshow=Lister
+mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible
+mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences
+mapstoragemanager.action.preferences.tip=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

Added: trunk/msm/src/main/resources/icons/Database.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/Database.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msm/src/main/resources/icons/databaseExport_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/databaseExport_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msm/src/main/resources/icons/databaseExport_32.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/databaseExport_32.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msm/src/main/resources/icons/databaseImport_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/databaseImport_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msm/src/main/resources/icons/databaseImport_32.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/databaseImport_32.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msm/src/main/resources/icons/fleche.png
===================================================================
(Binary files differ)


Property changes on: trunk/msm/src/main/resources/icons/fleche.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/msm/src/main/resources/msm.properties
===================================================================
--- trunk/msm/src/main/resources/msm.properties	2010-03-04 09:47:31 UTC (rev 183)
+++ trunk/msm/src/main/resources/msm.properties	2010-03-04 12:29:29 UTC (rev 184)
@@ -14,4 +14,8 @@
 icon.action.i18n-uk=action-i18n-uk.png
 icon.action.connect=action-connect.png
 icon.action.disconnect=action-disconnect.png
+icon.action.databaseImport_16=databaseImport_16.png
+icon.action.databaseExport_16=databaseExport_16.png
+icon.action.databaseImport_32=databaseImport_32.png
+icon.action.databaseExport_32=databaseExport_32.png
 application.site.url=http://www.nuiton.org/projects/show/mapstoragemanager
\ No newline at end of file

    

r184 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources resources/i18n resources/icons

dlanglais＠users.nuiton.org

tags

participants (1)