3 Mar 2013

Author: tchemit
Date: 2013-03-03 16:52:58 +0100 (Sun, 03 Mar 2013)
New Revision: 519

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/519

Log:
use new Applicationconfig and Applicationupdater API


Added:
   trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider
   trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider
   trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider
Removed:
   trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
   trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
   trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
Modified:
   trunk/pom.xml
   trunk/tutti-persistence/pom.xml
   trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java
   trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java
   trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java
   trunk/tutti-service/pom.xml
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java
   trunk/tutti-ui-swing/pom.xml
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java

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

--- trunk/pom.xml	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/pom.xml	2013-03-03 15:52:58 UTC (rev 519)
@@ -183,6 +183,19 @@
 
       <dependency>
         <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-config</artifactId>
+        <version>${nuitonUtilsVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-updater</artifactId>
+        <version>${nuitonUtilsVersion}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>org.nuiton</groupId>
         <artifactId>nuiton-csv</artifactId>
         <version>${nuitonUtilsVersion}</version>
       </dependency>
@@ -233,6 +246,12 @@
 
       <dependency>
         <groupId>org.nuiton.jaxx</groupId>
+        <artifactId>jaxx-config</artifactId>
+        <version>${jaxxVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton.jaxx</groupId>
         <artifactId>jaxx-runtime</artifactId>
         <version>${jaxxVersion}</version>
         <scope>test</scope>
@@ -679,7 +698,7 @@
             <reportSets>
               <reportSet>
                 <reports>
-                  <report>aggregate-application-config-report</report>
+                  <report>aggregate-config-report</report>
                 </reports>
               </reportSet>
             </reportSets>

Modified: trunk/tutti-persistence/pom.xml
===================================================================
--- trunk/tutti-persistence/pom.xml	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-persistence/pom.xml	2013-03-03 15:52:58 UTC (rev 519)
@@ -52,6 +52,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>

Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -33,7 +33,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.config.ApplicationConfig;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -26,7 +26,7 @@
 
 import org.hibernate.dialect.HSQLDialect;
 import org.hsqldb.jdbcDriver;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import java.io.File;
 
@@ -38,7 +38,7 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 0.2
  */
-public enum TuttiPersistenceConfigOption implements ApplicationConfig.OptionDef {
+public enum TuttiPersistenceConfigOption implements ConfigOptionDef {
 
     DB_DIRECTORY(
             "tutti.persistence.db.directory",

Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -24,8 +24,9 @@
  * #L%
  */
 
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ApplicationConfigProvider;
+import org.nuiton.util.config.ConfigActionDef;
+import org.nuiton.util.config.ApplicationConfigProvider;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import java.util.Locale;
 
@@ -50,12 +51,12 @@
     }
 
     @Override
-    public ApplicationConfig.OptionDef[] getOptions() {
+    public ConfigOptionDef[] getOptions() {
         return TuttiPersistenceConfigOption.values();
     }
 
     @Override
-    public ApplicationConfig.ActionDef[] getActions() {
-        return new ApplicationConfig.ActionDef[0];
+    public ConfigActionDef[] getActions() {
+        return new ConfigActionDef[0];
     }
 }

Deleted: trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
===================================================================
--- trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -1 +0,0 @@
-fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigProvider
\ No newline at end of file

Copied: trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider (from rev 514, trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider)
===================================================================
--- trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	                        (rev 0)
+++ trunk/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -0,0 +1 @@
+fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigProvider
\ No newline at end of file

Modified: trunk/tutti-service/pom.xml
===================================================================
--- trunk/tutti-service/pom.xml	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-service/pom.xml	2013-03-03 15:52:58 UTC (rev 519)
@@ -54,6 +54,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -26,10 +26,8 @@
 
 import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
 import org.nuiton.util.Version;
+import org.nuiton.util.config.ApplicationConfig;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,9 +41,6 @@
  */
 public class TuttiServiceConfig {
 
-    /** Logger. */
-    private static final Log log = LogFactory.getLog(TuttiServiceConfig.class);
-
     /** Delegate application config object containing configuration. */
     protected final ApplicationConfig applicationConfig;
 
@@ -119,6 +114,5 @@
             FileUtils.deleteDirectory(tmpDirectory);
         }
         FileUtils.forceMkdir(tmpDirectory);
-
     }
 }

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -24,8 +24,8 @@
  * #L%
  */
 
-import org.nuiton.util.ApplicationConfig;
 import org.nuiton.util.Version;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import java.io.File;
 import java.net.URL;
@@ -38,7 +38,7 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 0.1
  */
-public enum TuttiServiceConfigOption implements ApplicationConfig.OptionDef {
+public enum TuttiServiceConfigOption implements ConfigOptionDef {
 
     BASEDIR(
             "tutti.basedir",

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -24,8 +24,9 @@
  * #L%
  */
 
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ApplicationConfigProvider;
+import org.nuiton.util.config.ConfigActionDef;
+import org.nuiton.util.config.ApplicationConfigProvider;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import java.util.Locale;
 
@@ -50,12 +51,12 @@
     }
 
     @Override
-    public ApplicationConfig.OptionDef[] getOptions() {
+    public ConfigOptionDef[] getOptions() {
         return TuttiServiceConfigOption.values();
     }
 
     @Override
-    public ApplicationConfig.ActionDef[] getActions() {
-        return new ApplicationConfig.ActionDef[0];
+    public ConfigActionDef[] getActions() {
+        return new ConfigActionDef[0];
     }
 }
\ No newline at end of file

Deleted: trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
===================================================================
--- trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -1 +0,0 @@
-fr.ifremer.tutti.service.config.TuttiServiceConfigProvider
\ No newline at end of file

Copied: trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider (from rev 514, trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider)
===================================================================
--- trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	                        (rev 0)
+++ trunk/tutti-service/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -0,0 +1 @@
+fr.ifremer.tutti.service.config.TuttiServiceConfigProvider
\ No newline at end of file

Modified: trunk/tutti-ui-swing/pom.xml
===================================================================
--- trunk/tutti-ui-swing/pom.xml	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/pom.xml	2013-03-03 15:52:58 UTC (rev 519)
@@ -234,6 +234,16 @@
     </dependency>
 
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-updater</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>
@@ -295,6 +305,11 @@
 
     <dependency>
       <groupId>org.nuiton.jaxx</groupId>
+      <artifactId>jaxx-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton.jaxx</groupId>
       <artifactId>jaxx-validator</artifactId>
     </dependency>
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -37,8 +37,10 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationUpdater;
 import org.nuiton.util.Version;
+import org.nuiton.util.updater.ApplicationInfo;
+import org.nuiton.util.updater.ApplicationUpdater;
+import org.nuiton.util.updater.ApplicationUpdaterCallback;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,7 +53,7 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 1.0
  */
-public class TuttiApplicationUpdaterCallBack implements ApplicationUpdater.ApplicationUpdaterCallback {
+public class TuttiApplicationUpdaterCallBack implements ApplicationUpdaterCallback {
 
     /** Logger. */
     private static final Log log =
@@ -93,11 +95,11 @@
     }
 
     @Override
-    public Map<String, ApplicationUpdater.ApplicationInfo> updateToDo(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate) {
-        Map<String, ApplicationUpdater.ApplicationInfo> result = Maps.newHashMap();
+    public Map<String, ApplicationInfo> updateToDo(Map<String, ApplicationInfo> appToUpdate) {
+        Map<String, ApplicationInfo> result = Maps.newHashMap();
 
         for (UpdateType type : types) {
-            ApplicationUpdater.ApplicationInfo info = getInfo(type, appToUpdate);
+            ApplicationInfo info = getInfo(type, appToUpdate);
             if (info != null) {
                 result.put(info.name, info);
                 if (UpdateType.DB.equals(type)) {
@@ -111,13 +113,13 @@
         }
         if (types.contains(UpdateType.DB)) {
 
-            ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.DB, result);
+            ApplicationInfo info = getInfo(UpdateType.DB, result);
             dbUpdated = info != null;
         }
         return result;
     }
 
-    public void startUpdate(ApplicationUpdater.ApplicationInfo info) {
+    public void startUpdate(ApplicationInfo info) {
         if (UpdateType.DB.name().toLowerCase().equals(info.name)) {
 
             if (Version.VZERO.toString().equals(info.oldVersion)) {
@@ -141,7 +143,7 @@
     }
 
     @Override
-    public void updateDone(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate,
+    public void updateDone(Map<String, ApplicationInfo> appToUpdate,
                            Map<String, Exception> appUpdateError) {
 
         boolean doRestart = updateDoneJre(appToUpdate, appUpdateError);
@@ -187,7 +189,7 @@
         }
     }
 
-    protected boolean updateDoneJre(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate,
+    protected boolean updateDoneJre(Map<String, ApplicationInfo> appToUpdate,
                                     Map<String, Exception> appUpdateError) {
         boolean doRestart = false;
         Exception error = getError(UpdateType.JRE, appUpdateError);
@@ -198,7 +200,7 @@
                 log.error("Could not update jre", error);
             }
         } else {
-            ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.JRE, appToUpdate);
+            ApplicationInfo info = getInfo(UpdateType.JRE, appToUpdate);
             if (info != null) {
 
                 if (log.isInfoEnabled()) {
@@ -212,7 +214,7 @@
         return doRestart;
     }
 
-    protected boolean updateDoneTutti(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate,
+    protected boolean updateDoneTutti(Map<String, ApplicationInfo> appToUpdate,
                                       Map<String, Exception> appUpdateError) {
         boolean doRestart = false;
         Exception error = getError(UpdateType.TUTTI, appUpdateError);
@@ -223,7 +225,7 @@
                 log.error("Could not update tutti", error);
             }
         } else {
-            ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.TUTTI, appToUpdate);
+            ApplicationInfo info = getInfo(UpdateType.TUTTI, appToUpdate);
             if (info != null) {
 
                 if (log.isInfoEnabled()) {
@@ -237,7 +239,7 @@
         return doRestart;
     }
 
-    protected boolean updateDoneI18n(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate,
+    protected boolean updateDoneI18n(Map<String, ApplicationInfo> appToUpdate,
                                      Map<String, Exception> appUpdateError) {
         boolean doRestart = false;
         Exception error = getError(UpdateType.I18N, appUpdateError);
@@ -248,7 +250,7 @@
                 log.error("Could not update i18n", error);
             }
         } else {
-            ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.I18N, appToUpdate);
+            ApplicationInfo info = getInfo(UpdateType.I18N, appToUpdate);
             if (info != null) {
 
                 if (log.isInfoEnabled()) {
@@ -262,7 +264,7 @@
         return doRestart;
     }
 
-    protected void updateDoneDb(Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate,
+    protected void updateDoneDb(Map<String, ApplicationInfo> appToUpdate,
                                 Map<String, Exception> appUpdateError) {
         Exception error = getError(UpdateType.DB, appUpdateError);
         if (error != null) {
@@ -272,7 +274,7 @@
                 log.error("Could not update db", error);
             }
         } else {
-            ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.DB, appToUpdate);
+            ApplicationInfo info = getInfo(UpdateType.DB, appToUpdate);
             if (info != null) {
 
                 if (log.isInfoEnabled()) {
@@ -294,8 +296,8 @@
         }
     }
 
-    protected ApplicationUpdater.ApplicationInfo getInfo(UpdateType type,
-                                                         Map<String, ApplicationUpdater.ApplicationInfo> appToUpdate) {
+    protected ApplicationInfo getInfo(UpdateType type,
+                                      Map<String, ApplicationInfo> appToUpdate) {
         return appToUpdate.get(type.name().toLowerCase());
     }
 
@@ -304,7 +306,7 @@
         return appUpdateError.get(type.name().toLowerCase());
     }
 
-    protected File getDbDirectory(ApplicationUpdater.ApplicationInfo info) {
+    protected File getDbDirectory(ApplicationInfo info) {
         File[] sources = info.destDir.listFiles();
         Preconditions.checkState(
                 sources != null && sources.length == 1,
@@ -313,7 +315,7 @@
         return result;
     }
 
-    protected void prepareFirstDatabase(ApplicationUpdater.ApplicationInfo info) {
+    protected void prepareFirstDatabase(ApplicationInfo info) {
         if (log.isInfoEnabled()) {
             log.info("First time database was downloaded at version: " + info.newVersion);
         }
@@ -334,7 +336,7 @@
         }
     }
 
-    protected void synchronizetDatabase(ApplicationUpdater.ApplicationInfo info) {
+    protected void synchronizetDatabase(ApplicationInfo info) {
         if (log.isInfoEnabled()) {
             log.info(String.format("A database update was downloaded (oldVersion: %s, newVersion: %s), will launch a referential synchronize operation ", info.oldVersion, info.newVersion));
         }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -33,10 +33,10 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ApplicationConfigHelper;
-import org.nuiton.util.ApplicationConfigProvider;
-import org.nuiton.util.ArgumentsParserException;
+import org.nuiton.util.config.ApplicationConfig;
+import org.nuiton.util.config.ApplicationConfigHelper;
+import org.nuiton.util.config.ApplicationConfigProvider;
+import org.nuiton.util.config.ArgumentsParserException;
 import org.nuiton.util.Version;
 
 import javax.swing.KeyStroke;

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -25,7 +25,7 @@
  */
 
 import fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import javax.swing.KeyStroke;
 import java.awt.Color;
@@ -40,7 +40,7 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 0.1
  */
-public enum TuttiApplicationConfigOption implements ApplicationConfig.OptionDef {
+public enum TuttiApplicationConfigOption implements ConfigOptionDef {
 
     TUTTI_LAUNCH_MODE(
             "tutti.launch.mode",

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigProvider.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -24,8 +24,9 @@
  * #L%
  */
 
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ApplicationConfigProvider;
+import org.nuiton.util.config.ApplicationConfigProvider;
+import org.nuiton.util.config.ConfigActionDef;
+import org.nuiton.util.config.ConfigOptionDef;
 
 import java.util.Locale;
 
@@ -50,12 +51,12 @@
     }
 
     @Override
-    public ApplicationConfig.OptionDef[] getOptions() {
+    public ConfigOptionDef[] getOptions() {
         return TuttiApplicationConfigOption.values();
     }
 
     @Override
-    public ApplicationConfig.ActionDef[] getActions() {
-        return new ApplicationConfig.ActionDef[0];
+    public ConfigActionDef[] getActions() {
+        return new ConfigActionDef[0];
     }
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -27,9 +27,9 @@
 import fr.ifremer.tutti.service.config.TuttiServiceConfigOption;
 import fr.ifremer.tutti.ui.swing.content.MainUI;
 import jaxx.runtime.SwingUtil;
-import jaxx.runtime.swing.editor.config.ConfigUI;
-import jaxx.runtime.swing.editor.config.ConfigUIHelper;
-import jaxx.runtime.swing.editor.config.model.MainCallBackFinalizer;
+import jaxx.runtime.swing.config.ConfigUI;
+import jaxx.runtime.swing.config.ConfigUIHelper;
+import jaxx.runtime.swing.config.model.MainCallBackFinalizer;
 
 import static org.nuiton.i18n.I18n.n_;
 
@@ -124,7 +124,7 @@
 
         ConfigUI configUI = helper.buildUI(
                 mainUI,
-                "tutti.config.category.applications");
+                n_("tutti.config.category.applications"));
 
         helper.displayUI(mainUI, false);
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -49,7 +49,7 @@
 import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.config.ApplicationConfig;
 import org.nuiton.widget.SwingSession;
 
 import javax.swing.Icon;

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -32,7 +32,7 @@
 import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationUpdater;
+import org.nuiton.util.updater.ApplicationUpdater;
 
 import java.io.File;
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -30,7 +30,7 @@
 import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationUpdater;
+import org.nuiton.util.updater.ApplicationUpdater;
 
 import java.io.File;
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -32,7 +32,7 @@
 import fr.ifremer.tutti.ui.swing.content.MainUIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.ApplicationUpdater;
+import org.nuiton.util.updater.ApplicationUpdater;
 
 import java.io.File;
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java	2013-03-03 15:52:58 UTC (rev 519)
@@ -82,28 +82,28 @@
 
         Throwable cause = ex;
 
-        if (cause instanceof NullPointerException) {
-
-            // See http://forge.codelutin.com/issues/2055
-            if (ex.getStackTrace().length > 0 &&
-                ex.getStackTrace()[0].getClassName().contains("swing.")) {
-                if (log.isWarnEnabled()) {
-                    log.warn("AWT bad error (See http://forge.codelutin.com/issues/2055)", ex);
-                }
-                return;
-            }
-        }
-
-        if (cause instanceof IndexOutOfBoundsException) {
-            // See http://forge.codelutin.com/issues/2055
-            if (ex.getStackTrace().length > 0 &&
-                "convertRowIndexToModel".equals(ex.getStackTrace()[0].getMethodName())) {
-                if (log.isWarnEnabled()) {
-                    log.warn("AWT bad error (See http://forge.codelutin.com/issues/2055)", ex);
-                }
-                return;
-            }
-        }
+//        if (cause instanceof NullPointerException) {
+//
+//            // See http://forge.codelutin.com/issues/2055
+//            if (ex.getStackTrace().length > 0 &&
+//                ex.getStackTrace()[0].getClassName().contains("swing.")) {
+//                if (log.isWarnEnabled()) {
+//                    log.warn("AWT bad error (See http://forge.codelutin.com/issues/2055)", ex);
+//                }
+//                return;
+//            }
+//        }
+//
+//        if (cause instanceof IndexOutOfBoundsException) {
+//            // See http://forge.codelutin.com/issues/2055
+//            if (ex.getStackTrace().length > 0 &&
+//                "convertRowIndexToModel".equals(ex.getStackTrace()[0].getMethodName())) {
+//                if (log.isWarnEnabled()) {
+//                    log.warn("AWT bad error (See http://forge.codelutin.com/issues/2055)", ex);
+//                }
+//                return;
+//            }
+//        }
         if (cause instanceof TuttiTechnicalException) {
             cause = cause.getCause();
         }

Deleted: trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 07:20:40 UTC (rev 518)
+++ trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -1 +0,0 @@
-fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfigProvider
\ No newline at end of file

Copied: trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider (from rev 514, trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider)
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider	2013-03-03 15:52:58 UTC (rev 519)
@@ -0,0 +1 @@
+fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfigProvider
\ No newline at end of file

    

tchemit＠users.forge.codelutin.com

tags

participants (1)