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

22 Feb 2010

Author: sletellier
Date: 2010-02-22 21:17:51 +0100 (Mon, 22 Feb 2010)
New Revision: 121

Added:
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java
   trunk/msm/src/main/resources/msm.properties
Modified:
   trunk/msm/pom.xml
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
   trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx
   trunk/msm/src/main/resources/i18n/msm-en_GB.properties
   trunk/msm/src/main/resources/i18n/msm-fr_FR.properties
   trunk/pom.xml
Log:
- Utilisation de ApplicationConfig pour charger le proporties
- Utilisation de actionIcon
- Nettoyage du pom
- Nettoyage des sources (src a la racine du pom parent)



Modified: trunk/msm/pom.xml
===================================================================

--- trunk/msm/pom.xml	2010-02-22 18:17:14 UTC (rev 120)
+++ trunk/msm/pom.xml	2010-02-22 20:17:51 UTC (rev 121)
@@ -22,7 +22,8 @@
         <version>0.1-SNAPSHOT</version>
     </parent>
 
-    <version>0.1-SNAPSHOT</version>
+    <!--version>0.1-SNAPSHOT</version-->
+    <groupId>org.nuiton</groupId>
     <artifactId>msm</artifactId>
 
     <dependencies>
@@ -30,26 +31,22 @@
         <dependency>
             <groupId>org.nuiton</groupId>
             <artifactId>nuiton-utils</artifactId>
-            <version>${lutinutil.version}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
         <!--Jaxx-->
         <dependency>
             <groupId>org.nuiton.jaxx</groupId>
             <artifactId>jaxx-runtime</artifactId>
-            <version>${jaxx.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.nuiton.jaxx</groupId>
             <artifactId>jaxx-widgets</artifactId>
-            <version>${jaxx.version}</version>
         </dependency>
 
         <!-- JUnit for tests -->
@@ -136,6 +133,28 @@
     <!-- ************************************************************* -->
     <!-- *** Build Settings ****************************************** -->
     <!-- ************************************************************* -->
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+
+        <!--MSM Main Class in JAR -->
+        <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>
+
+        <!-- jaxx configuration -->
+        <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
+        <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
+        <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
+
+        <jaxx.extraImportList>
+            static org.nuiton.i18n.I18n.n_
+        </jaxx.extraImportList>
+
+        <!-- jaxx help configuration -->
+        <!--jaxx.helpSetName>vradi</jaxx.helpSetName>
+        <jaxx.locale>fr</jaxx.locale>
+        <jaxx.helpTarget>src/main/help</jaxx.helpTarget-->
+
+    </properties>
+    
     <packaging>jar</packaging>
 
     <!--<properties>
@@ -157,12 +176,27 @@
 
     <build>
 
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>msm.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+                     
         <plugins>
 
-            <!--<plugin>
+            <plugin>
                 <groupId>org.nuiton.jaxx</groupId>
                 <artifactId>maven-jaxx-plugin</artifactId>
-                <version>${jaxx.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -170,7 +204,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>-->
+            </plugin>
 
             <plugin>
                 <groupId>org.nuiton.i18n</groupId>

Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java	2010-02-22 18:17:14 UTC (rev 120)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java	2010-02-22 20:17:51 UTC (rev 121)
@@ -1,11 +1,17 @@
 package org.nuiton.mapstoragemanager;
 
+import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.ErrorDialogUI;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.nuiton.i18n.I18n;
 import org.nuiton.mapstoragemanager.ui.MainUI;
 
 import javax.swing.*;
 import java.util.Locale;
 
+import static org.nuiton.i18n.I18n._;
+
 /**
  * Created: 21 janv. 2010
  *
@@ -17,25 +23,52 @@
  */
 public final class Main {
 
+    /**
+     * Logger
+     */
+    private static Log log = LogFactory.getLog(Main.class);
+
     Locale locale = Locale.FRANCE;
 
-    private Main(){
-        I18n.setUniqueBundleName("mapstoragemanager-i18n");
-        I18n.init(locale);
-        final MainUI ui = MainUI.getInstance();
+    private Main(String... args){
+        try{
+            I18n.setUniqueBundleName("mapstoragemanager-i18n");
+            I18n.init(locale);
 
-        SwingUtilities.invokeLater(new Runnable() {
+            try {
+                SwingUtil.initNimbusLoookAndFeel();
+            } catch (Exception e) {
+                // could not find nimbus look-and-feel
+                log.warn("Could not find nimbus look-and-feel");
+            }
 
-            @Override
-            public void run() {
+            // init config
+            MsmConfig config = new MsmConfig();
+            config.parse(args);
 
-                ui.setVisible(true);
-            }
-        });
+            // chargement de la configuration des uis
+            SwingUtil.loadUIConfig(MsmConfig.APPLICATION_PROPERTIES, null);
+    
+            final MainUI ui = MainUI.getInstance();
+
+            SwingUtilities.invokeLater(new Runnable() {
+
+                @Override
+                public void run() {
+
+                    ui.setVisible(true);
+                }
+            });
+
+        } catch (Exception e) {
+            ErrorDialogUI.showError(e);
+            log.error(e.getMessage(), e);
+            System.exit(1);
+        }
     }
     
     public static void main(String... args) {
-        new Main();
+        new Main(args);
     }
 
 

Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java
===================================================================
--- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java	                        (rev 0)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java	2010-02-22 20:17:51 UTC (rev 121)
@@ -0,0 +1,53 @@
+package org.nuiton.mapstoragemanager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.util.Version;
+import org.nuiton.util.VersionUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * La configuration de l'application.
+ * <p/>
+ *
+ * @author sletellier
+ * @since 0.1-SNAPSHOT
+ */
+public class NMsmConfig  extends org.nuiton.util.ApplicationConfig {
+
+    /**
+     * to use log facility, just put in your code: log.info(\"...\");
+     */
+    static private Log log = LogFactory.getLog(MsmConfig.class);
+    /**
+     * le fichier de configuration de l'application avec les informations sur
+     * le projet (version, license,...) et la configuration des ui (icons, ...)
+     */
+    public static final String APPLICATION_PROPERTIES = "/msm.properties";
+
+    public MsmConfig() {
+
+        // chargement de la configuration interne
+        InputStream stream = getClass().getResourceAsStream(
+                APPLICATION_PROPERTIES);
+
+        Properties p = new Properties();
+        try {
+            p.load(stream);
+            for (Object k : p.keySet()) {
+                String key = k + "";
+                Object value = p.get(k);
+                if (log.isDebugEnabled()) {
+                    log.debug("install properties " + k + " : " + value);
+                }
+                setDefaultOption(key, "" + value);
+            }
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+}

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-22 18:17:14 UTC (rev 120)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx	2010-02-22 20:17:51 UTC (rev 121)
@@ -96,7 +96,7 @@
             <JLabel text="password :" styleClass='boldUnderline'/>
             <JPasswordField id='password'/>
             <!--  <JButton text="ok" onActionPerformed='engine.connection()'/>  -->
-           <JButton text="ok" icon='ok.png' onActionPerformed='engine.connection()'/>
+           <JButton text="ok" actionIcon='ok' onActionPerformed='engine.connection()'/>
         </JToolBar>
 
         <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' >

Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-02-22 18:17:14 UTC (rev 120)
+++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties	2010-02-22 20:17:51 UTC (rev 121)
@@ -1,35 +1,35 @@
-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 \!
+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

Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties
===================================================================
--- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties	2010-02-22 18:17:14 UTC (rev 120)
+++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties	2010-02-22 20:17:51 UTC (rev 121)
@@ -1,35 +1,35 @@
-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 \!
+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

Added: trunk/msm/src/main/resources/msm.properties
===================================================================
--- trunk/msm/src/main/resources/msm.properties	                        (rev 0)
+++ trunk/msm/src/main/resources/msm.properties	2010-02-22 20:17:51 UTC (rev 121)
@@ -0,0 +1 @@
+icon.action.ok=ok.png
\ No newline at end of file

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-02-22 18:17:14 UTC (rev 120)
+++ trunk/pom.xml	2010-02-22 20:17:51 UTC (rev 121)
@@ -20,6 +20,7 @@
         <version>2.0.5</version>
     </parent>
 
+    <groupId>org.nuiton</groupId>
     <version>0.1-SNAPSHOT</version>
     <artifactId>mapstoragemanager</artifactId>
     
@@ -108,25 +109,87 @@
     <packaging>pom</packaging>
 
     <properties>
+        <projectId>mapstoragemanager</projectId>
 
+        <jaxx.version>2.0.0-beta-6-SNAPSHOT</jaxx.version>
+        <nuitonutils.version>1.1.0</nuitonutils.version>
+        <i18n.version>1.0.1</i18n.version>
+
+        <!-- Must be in ui module -->
         <!-- main class in jar -->
-        <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>
+        <!--maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class-->
 
-        <jaxx.version>2.0.0-beta-3</jaxx.version>
-        <lutinutil.version>1.1.2</lutinutil.version>
-        <i18n.version>1.0.1</i18n.version>
-
         <!-- jaxx -->
-        <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
+        <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
         <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
-        <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
+        <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath-->
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <!-- librairie des lutinutil-->
+            <dependency>
+                <groupId>org.nuiton</groupId>
+                <artifactId>nuiton-utils</artifactId>
+                <version>${nuitonutils.version}</version>
+                <scope>compile</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-compress</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+
+            <!-- librairie Jaxx -->
+            <dependency>
+                <groupId>org.nuiton.jaxx</groupId>
+                <artifactId>jaxx-runtime</artifactId>
+                <version>${jaxx.version}</version>
+                <scope>compile</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.help</groupId>
+                        <artifactId>javahelp</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.nuiton.jaxx</groupId>
+                <artifactId>jaxx-widgets</artifactId>
+                <version>${jaxx.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.nuiton.jaxx</groupId>
+                <artifactId>jaxx-runtime</artifactId>
+                <version>${jaxx.version}</version>
+                <scope>test</scope>
+                <classifier>tests</classifier>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
+    
     <build>
 
         <plugins>
 
-            <plugin>
+            <!-- <plugin>
                 <groupId>org.nuiton.jaxx</groupId>
                 <artifactId>maven-jaxx-plugin</artifactId>
                 <version>${jaxx.version}</version>
@@ -137,8 +200,9 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
 
+  
             <!--<plugin>
                 <groupId>org.nuiton.i18n</groupId>
                 <artifactId>maven-i18n-plugin</artifactId>

    

r121 - in trunk: . msm msm/src/main/java/org/nuiton/mapstoragemanager msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/resources msm/src/main/resources/i18n

sletellier＠users.nuiton.org

tags

participants (1)