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

3 Mar 2010

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

    

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

dlanglais＠users.nuiton.org

tags

participants (1)