Author: tchemit Date: 2013-02-15 21:01:16 +0100 (Fri, 15 Feb 2013) New Revision: 431 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/431 Log: use last nuiton-utils version Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-15 19:16:17 UTC (rev 430) +++ trunk/pom.xml 2013-02-15 20:01:16 UTC (rev 431) @@ -124,7 +124,7 @@ <!-- libraries version --> - <nuitonUtilsVersion>2.6.8-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.8</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> 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-02-15 19:16:17 UTC (rev 430) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-02-15 20:01:16 UTC (rev 431) @@ -29,6 +29,7 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeResult; +import fr.ifremer.tutti.service.TuttiTechnicalException; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import org.apache.commons.io.FileUtils; @@ -103,9 +104,9 @@ ApplicationUpdater.ApplicationInfo info = getInfo(UpdateType.DB, result); if (info == null) { - dbUpdated=false; + dbUpdated = false; } else { - dbUpdated=true; + dbUpdated = true; } } return result; @@ -302,11 +303,9 @@ } catch (IOException e) { throw new RuntimeException("Could not delete temporary directory " + target, e); } - } protected void synchronizetDatabase(ApplicationUpdater.ApplicationInfo info) { - //TODO synchro referential 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)); } @@ -317,5 +316,11 @@ TuttiActionUI actionUI = context.getActionUI(); actionUI.getModel().setProgressionModel(result.getProgressionModel()); service.prepare(dbDirectory, result); + + if (!result.isSuccess()) { + throw new TuttiTechnicalException("Could not prepare synchro", result.getError()); + } + + service.synchronize(dbDirectory, result); } }