Author: tchemit Date: 2013-05-01 15:18:36 +0200 (Wed, 01 May 2013) New Revision: 904 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/904 Log: refs #2383: [TECH] - Mise ?\195?\160 jour de la base : ?\195?\169crasement des donn?\195?\169es si on force la mise ?\195?\160 jour Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 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-05-01 13:17:24 UTC (rev 903) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-05-01 13:18:36 UTC (rev 904) @@ -41,7 +41,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; import org.nuiton.util.updater.ApplicationInfo; import org.nuiton.util.updater.ApplicationUpdater; import org.nuiton.util.updater.ApplicationUpdaterCallback; @@ -161,10 +160,10 @@ public void startUpdate(ApplicationInfo info) { if (UpdateType.DB.name().toLowerCase().equals(info.name)) { - if (Version.VZERO.toString().equals(info.oldVersion)) { + if (dbInstalled) { progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.db.installation", info.newVersion)); - } else { + } else if (dbUpdated) { progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.db.update", info.newVersion)); } } @@ -362,12 +361,12 @@ persistenceConfig.generateExternalDbFiles(true); - if (ApplicationUpdater.ZERO_VERSION.equals(info.oldVersion)) { + if (dbInstalled) { // first database, just copy it to correct directory prepareFirstDatabase(info); - } else { + } else if (dbUpdated) { // launch a referential synchronize operation synchronizetDatabase(info);