[Mapstoragemanager-commits] r129 - in trunk/msm/src: main/java/org/nuiton/mapstoragemanager main/java/org/nuiton/mapstoragemanager/core main/java/org/nuiton/mapstoragemanager/ui main/java/org/nuiton/mapstoragemanager/ui/gui main/resources main/resources/i18n main/resources/icons test/java/org/nuiton/mapstoragemanager/core

25 Feb 2010

Author: fgilet
Date: 2010-02-25 17:28:09 +0100 (Thu, 25 Feb 2010)
New Revision: 129

Added:
   trunk/msm/src/main/resources/icons/action-about.png
   trunk/msm/src/main/resources/icons/action-config.png
   trunk/msm/src/main/resources/icons/action-exit.png
   trunk/msm/src/main/resources/icons/action-help.png
   trunk/msm/src/main/resources/icons/action-i18n-fr.png
   trunk/msm/src/main/resources/icons/action-i18n-uk.png
   trunk/msm/src/main/resources/icons/action-site.png
   trunk/msm/src/main/resources/icons/cancel_16.png
   trunk/msm/src/main/resources/icons/cancel_32.png
   trunk/msm/src/main/resources/icons/database_16.png
   trunk/msm/src/main/resources/icons/database_32.png
   trunk/msm/src/main/resources/icons/login_16.png
   trunk/msm/src/main/resources/icons/login_32.png
   trunk/msm/src/main/resources/icons/ok_16.png
   trunk/msm/src/main/resources/icons/ok_32.png
   trunk/msm/src/main/resources/icons/password_16.png
   trunk/msm/src/main/resources/icons/password_32.png
   trunk/msm/src/main/resources/icons/warning_16.png
   trunk/msm/src/main/resources/icons/warning_32.png
   trunk/msm/src/main/resources/messages.properties
   trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java
Removed:
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties
   trunk/msm/src/main/resources/icons/ok.png
Modified:
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
   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:
Internationalisation fonctionelle.
Am?\195?\169lioration graphique:
	-ajout d'images aux boutons, labels
	-meilleurs espacements
	-cr?\195?\169ation d'un panel message

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
===================================================================

--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java	2010-02-25 16:28:09 UTC (rev 129)
@@ -10,7 +10,7 @@
 import javax.swing.*;
 import java.util.Locale;
 
-import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
 
 /**
  * Created: 21 janv. 2010
@@ -28,7 +28,7 @@
      */
     private static Log log = LogFactory.getLog(Main.class);
 
-    Locale locale = Locale.FRANCE;
+    public static Locale locale = Locale.FRANCE;
 
     private Main(String... args){
         try{
@@ -55,8 +55,8 @@
 
                 @Override
                 public void run() {
-
                     ui.setVisible(true);
+                    init();
                 }
             });
 
@@ -69,7 +69,27 @@
     
     public static void main(String... args) {
         new Main(args);
+        
     }
 
+    public static void setLocale(Locale locale){
+        Main.locale = locale;
+        MainUI.getInstance().dispose();
+        Main.main();
+    }
 
+    private void init() {
+        MainUI ui = MainUI.getInstance();
+        Locale locale = Main.locale;
+        if (locale.equals(Locale.FRANCE)){
+            ui.getMenuFileLanguageFR().setEnabled(false);
+        } else if (locale.equals(Locale.UK)){
+            ui.getMenuFileLanguageUK().setEnabled(false);
+        }
+        String message = n_("messageEntry");
+        ui.displayMessage(message, 1);
+
+
+    }
+
 }

Deleted: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties	2010-02-25 16:28:09 UTC (rev 129)
@@ -1 +0,0 @@
-Config.url=plugins/

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css	2010-02-25 16:28:09 UTC (rev 129)
@@ -50,12 +50,14 @@
 #menuExit {
     text:"mapstoragemanager.action.exit";
     toolTipText:"mapstoragemanager.action.exit.tip";
+    actionIcon:"exit";
     mnemonic:E;
 }
 
 #menuPreferences {
     text:"mapstoragemanager.action.preferences";
     toolTipText:"mapstoragemanager.action.preferences.tip";
+    actionIcon:"config";
     mnemonic:P;
 }
 
@@ -68,18 +70,21 @@
 #menuHelpHelp {
     text:"mapstoragemanager.action.help";
     toolTipText:"mapstoragemanager.action.help.tip";
+    actionIcon:"help";
     mnemonic:E;
 }
 
 #menuHelpSite {
     text:"mapstoragemanager.action.visitSite";
     toolTipText:"mapstoragemanager.action.visitSite.tip";
+    actionIcon:"site";
     mnemonic:V;
 }
 
 #menuHelpAbout {
     text:"mapstoragemanager.action.aboutUs";
     toolTipText:"mapstoragemanager.action.aboutUs.tip";
+    actionIcon:"about";
     mnemonic:A;
 }
 
@@ -87,12 +92,14 @@
 #menuFileLanguageFR {
     text:"mapstoragemanager.action.fr";
     toolTipText:"mapstoragemanager.action.fr.tip";
+    actionIcon:"i18n-fr";
     mnemonic:F;
 }
 
 #menuFileLanguageUK {
     text:"mapstoragemanager.action.uk";
     toolTipText:"mapstoragemanager.action.uk.tip";
+    actionIcon:"i18n-uk";
     mnemonic:U;
 }
 
@@ -108,7 +115,7 @@
 }
 
 JLabel.boldUnderline {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 JSplitPane {

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-02-25 16:28:09 UTC (rev 129)
@@ -7,6 +7,7 @@
             import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
             import javax.swing.tree.*;
             import static org.nuiton.i18n.I18n.n_;
+            import javax.swing.JLabel;
 
             ApplicationEngine engine = ApplicationEngine.getInstance();
 
@@ -34,14 +35,44 @@
                 return engine;
             }
 
+            /**
+            * Dispose UI.
+            */
+            public void dispose(){
+                instance = null;
+                engine.dispose();
+                this.setVisible(false);
+            }
 
+            /**
+            * Display the appropriate message.
+            * @param message the message to display.
+            * @param code code error (for images).
+            */
+            public void displayMessage(String message, int code){
+                this.getMessagesPanel().removeAll();
+                JLabel label = new JLabel(message);
+                /*
+                if (code==0){
+                    ImageIcon = new ImageIcon("ok_16.png");
+                }else if (code==1){
+                    ImageIcon = new ImageIcon("warning_16.png");
+                }else if (code==2){
+                    ImageIcon = new ImageIcon("cancel_16.png");
+                }
+                */
+                //label.setIcon(icon);
+                this.getMessagesPanel().add(label);
+            }
+
+
 	]]>
     </script>
 
     <!-- style definition -->
     <style source='MainUI.css'/>
 
-    <!-- content -->
+    <!-- content --> 
 	
     <JMenuBar>
         <JMenu id='menuFile'>
@@ -61,9 +92,9 @@
             <JSeparator/>
             <JMenu id='menuLanguage'>
                 <JMenuItem id='menuFileLanguageFR'
+                           onActionPerformed='engine.setLocale("fr","FR")'/>
+                <JMenuItem id='menuFileLanguageUK'
                            onActionPerformed='engine.setLocale("en","GB")'/>
-                <JMenuItem id='menuFileLanguageUK'
-                           onActionPerformed='engine.setLocale("fr","FR")'/>
             </JMenu>
         </JMenu>
 
@@ -78,31 +109,27 @@
 
     </JMenuBar>
 
-    <!-- images 
-    <javax.swing.ImageIcon id='valid' constructorParams='getClass().getResource("ok.png")'/>
-    -->
-
+    <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
     <JPanel layout='{new BorderLayout()}' id='mainPanel'>
         <JToolBar constraints='BorderLayout.NORTH' opaque='true'>
-            <JLabel text="name base :" styleClass='boldUnderline' />
+            <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 :" styleClass='boldUnderline'/>
+            <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/>
             <JTextField id='login'/>
-            <JLabel text="password :" styleClass='boldUnderline'/>
+            <JLabel text="password :" actionIcon='password_16' styleClass='boldUnderline'/>
             <JPasswordField id='password'/>
-            <!--  <JButton text="ok" onActionPerformed='engine.connection()'/>  -->
-           <JButton text="ok" actionIcon='ok' onActionPerformed='engine.connection()'/>
+           <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/>
         </JToolBar>
 
         <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' >
                <JScrollPane>
                 <JTree id='navigation'
-                        model='{new DefaultTreeModel(new DefaultMutableTreeNode(n_("welcome.MapStorageManager")))}' />
+                        model='{new DefaultTreeModel(new DefaultMutableTreeNode("Empty"))}' />
                </JScrollPane>
                <JScrollPane >
                     <JPanel layout='{new BorderLayout()}'>
@@ -110,8 +137,10 @@
                         <JPanel id='tableContent' constraints='BorderLayout.CENTER'/>
                         <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/>
                     </JPanel>
-                </JScrollPane>
+               </JScrollPane>
         </JSplitPane>
     </JPanel>
+    <JPanel id='messagesPanel' constraints='BorderLayout.SOUTH'/>
+    </JPanel>
 </Application>
 

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-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java	2010-02-25 16:28:09 UTC (rev 129)
@@ -5,12 +5,14 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.mapstoragemanager.plugins.OurHashMap;
+import org.nuiton.mapstoragemanager.Main;
 import org.nuiton.mapstoragemanager.plugins.OurHashMap2;
 import org.nuiton.mapstoragemanager.ui.MainUI;
 import static org.nuiton.i18n.I18n.n_;
@@ -46,12 +48,13 @@
      */
      private static ApplicationEngine instance  = null;
 
+     //public ImageIcon imgOk = new ImageIcon(getClass().getResource("ok.png"));
 
-
     /**
      * Constructor.
      */
     private ApplicationEngine(){
+        
         ohm = new  OurHashMap2();
         ohm.createTable("table1");
         ohm.createTable("table2");
@@ -101,13 +104,8 @@
      * @param country the country
      */
     public void setLocale(String language, String country) {
-        /*Locale locale = new Locale(language,country);
-        System.out.println("local en "+language+"_"+country);
-        I18n.close();
-        I18n.setUniqueBundleName("mapstoragemanager-i18n");
-        I18n.init(locale);
-        final MainUI ui = new MainUI();
-        ui.setVisible(true);*/
+        Locale locale = new Locale(language,country);
+        Main.setLocale(locale);
     }
 
      /*public void setMainUI(MainUI application) {
@@ -118,9 +116,10 @@
      * Try to connect the user to a database.
      */
     public void connection(){
-        String nameBase =  MainUI.getInstance().getNameBase().getSelectedJaxxItem().getValue().toString();
-        String login =  MainUI.getInstance().getLogin().getText();
-        char[] password =  MainUI.getInstance().getPassword().getPassword();
+        MainUI ui = MainUI.getInstance();
+        String nameBase =  ui.getNameBase().getSelectedJaxxItem().getValue().toString();
+        String login =  ui.getLogin().getText();
+        char[] password =  ui.getPassword().getPassword();
 
         //connection verification
         boolean goodUse = true;
@@ -128,11 +127,11 @@
 
         if(goodUse){
             //update tree
-            MainUI.getInstance().getNavigation().setModel(new MSMModel(nameBase));
-            MainUI.getInstance().getNavigation().addTreeSelectionListener(new MSMNavigationListener());
+            ui.getNavigation().setModel(new MSMModel(nameBase));
+            ui.getNavigation().addTreeSelectionListener(new MSMNavigationListener());
 
-            DefaultMutableTreeNode root =  (DefaultMutableTreeNode) MainUI.getInstance().getNavigation().getModel().getRoot();
-            DefaultTreeModel dtm = ((DefaultTreeModel) MainUI.getInstance().getNavigation().getModel());
+            DefaultMutableTreeNode root =  (DefaultMutableTreeNode) ui.getNavigation().getModel().getRoot();
+            DefaultTreeModel dtm = ((DefaultTreeModel) ui.getNavigation().getModel());
 
             Set<String> tableNames = ohm.getTablesNames();
 
@@ -142,11 +141,11 @@
                dtm.insertNodeInto(new DefaultMutableTreeNode(tableName), root, root.getChildCount());
             }
 
-            MainUI.getInstance().getNavigation().repaint();
-            MainUI.getInstance().getNavigation().revalidate();
+            ui.getNavigation().repaint();
+            ui.getNavigation().revalidate();
         }else{
             //display error
-            JOptionPane.showMessageDialog(null, n_("connectionError"));
+            JOptionPane.showMessageDialog(null, n_("jaxxdemo.tree.component"));
         }
 
     }
@@ -162,6 +161,14 @@
         return instance;
     }
 
+    /**
+    * Dispose engine.
+    */
+    public void dispose(){
+        instance = null;
+    }
+
+
     //GETTERS AND SETTERS
 
     public OurHashMap2 getOurHashMap(){

Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-02-25 16:28:09 UTC (rev 129)
@@ -1,35 +1,37 @@
-Map\ Storage\ Manager=Map Storage Manager
-TABLE\ NAME\ \:\ TODO=
-connectionError=The connection attempt to failed, please retry \!
-login\ \:=Login
-map\ Storage\ Manager=
-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=
-name\ base\ \:=Name base
-ok=Validate
-password\ \:=Password
-welcome.MapStorageManager=Welcome to MapStorageManager
+Map\ Storage\ Manager=Map Storage Manager
+TABLE\ NAME\ \:\ TODO=
+connectionError=The connection attempt to failed, please retry \!
+jaxxdemo.tree.component=
+login\ \:=Login 
+map\ Storage\ Manager=
+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 
+ok=Validate
+password\ \:=Password 
+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-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties	2010-02-25 16:28:09 UTC (rev 129)
@@ -1,35 +1,37 @@
-Map\ Storage\ Manager=Map Storage Manager
-TABLE\ NAME\ \:\ TODO=
-connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \!
-login\ \:=Identifiant
-map\ Storage\ Manager=
-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=
-name\ base\ \:=Nom de la base
-ok=Valider
-password\ \:=Mot de passe
-welcome.MapStorageManager=Bienvenue dans MapStorageManager
+Map\ Storage\ Manager=Map Storage Manager
+TABLE\ NAME\ \:\ TODO=
+connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \!
+jaxxdemo.tree.component=
+login\ \:=Identifiant  
+map\ Storage\ Manager=
+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  
+ok=Valider
+password\ \:=Mot de passe  
+welcome.MapStorageManager=Bienvenue dans MapStorageManager

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


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

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


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

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


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

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


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

Added: trunk/msm/src/main/resources/icons/action-i18n-fr.png
===================================================================
(Binary files differ)


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

Added: trunk/msm/src/main/resources/icons/action-i18n-uk.png
===================================================================
(Binary files differ)


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

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


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

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


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

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


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

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


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

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


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

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


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

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


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

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

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


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

Copied: trunk/msm/src/main/resources/icons/ok_32.png (from rev 123, trunk/msm/src/main/resources/icons/ok.png)
===================================================================
(Binary files differ)

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


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

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


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

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


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

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


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

Copied: trunk/msm/src/main/resources/messages.properties (from rev 123, trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties)
===================================================================
--- trunk/msm/src/main/resources/messages.properties	                        (rev 0)
+++ trunk/msm/src/main/resources/messages.properties	2010-02-25 16:28:09 UTC (rev 129)
@@ -0,0 +1 @@
+Config.url=plugins/

Modified: trunk/msm/src/main/resources/msm.properties
===================================================================
--- trunk/msm/src/main/resources/msm.properties	2010-02-25 16:01:41 UTC (rev 128)
+++ trunk/msm/src/main/resources/msm.properties	2010-02-25 16:28:09 UTC (rev 129)
@@ -1 +1,14 @@
-icon.action.ok=ok.png
\ No newline at end of file
+icon.action.ok_16=ok_16.png
+icon.action.ok_32=ok_32.png
+icon.action.database_16=database_16.png
+icon.action.database_32=database_32.png
+icon.action.login_16=login_16.png
+icon.action.login_32=login_32.png
+icon.action.password_16=password_16.png
+icon.action.about=action-about.png
+icon.action.help=action-help.png
+icon.action.site=action-site.png
+icon.action.exit=action-exit.png
+icon.action.config=action-config.png
+icon.action.i18n-fr=action-i18n-fr.png
+icon.action.i18n-uk=action-i18n-uk.png
\ No newline at end of file

Copied: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java (from rev 123, trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java)
===================================================================
--- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java	                        (rev 0)
+++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java	2010-02-25 16:28:09 UTC (rev 129)
@@ -0,0 +1,36 @@
+package org.nuiton.mapstoragemanager.core;
+
+import java.net.MalformedURLException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.mapstoragemanager.core.BigTableLoader;
+
+/**
+ * @author fdesbois
+ * @deprecated Use org.nuiton.mapstoragemanager.core.BigTableLoaderText instead
+ */
+@Deprecated
+public final class TestServiceLoader {
+
+    /**
+     * Logger.
+     */
+    private static final Log LOG = LogFactory.getLog(TestServiceLoader.class);
+
+    private TestServiceLoader() {
+        try {
+            BigTableLoader p =
+                new BigTableLoader("plugins", this.getClass().getClassLoader());
+            LOG.info(p.getBigTable());
+        } catch (MalformedURLException e) {
+            // TODO Auto-generated catch block
+            //e.printStackTrace();
+            LOG.error(e.toString(),e);
+        }
+    }
+
+    public static void main(final String[] args) {
+
+        new TestServiceLoader();
+    }
+}
\ No newline at end of file

    

fgilet＠users.nuiton.org