Author: tchemit Date: 2013-03-11 11:34:37 +0100 (Mon, 11 Mar 2013) New Revision: 573 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/573 Log: fixes #2077: [TECH] - Erreur chargement base 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/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 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-11 10:01:36 UTC (rev 572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-03-11 10:34:37 UTC (rev 573) @@ -34,6 +34,8 @@ import fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeResult; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionException; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -79,8 +81,12 @@ protected boolean dbUpdated; - public TuttiApplicationUpdaterCallBack(TuttiUIContext context, ProgressionModel progressionModel) { - this.context = context; + protected final AbstractTuttiAction action; + + public TuttiApplicationUpdaterCallBack(AbstractTuttiAction action, + ProgressionModel progressionModel) { + this.action = action; + this.context = action.getContext(); this.progressionModel = progressionModel; } @@ -142,6 +148,9 @@ if (UpdateType.I18N.name().toLowerCase().equals(info.name)) { progressionModel.setMessage("Téléchargement et installation d'une nouveau version I18N (version " + info.newVersion + ")"); } + if (UpdateType.HELP.name().toLowerCase().equals(info.name)) { + progressionModel.setMessage("Téléchargement et installation d'une nouveau version Help (version " + info.newVersion + ")"); + } } @Override @@ -193,6 +202,7 @@ if (log.isErrorEnabled()) { log.error("Could not update from " + propertiesURL, eee); } + throw TuttiActionException.propagateError(action, eee); } protected boolean updateDoneJre(Map<String, ApplicationInfo> appToUpdate, @@ -304,6 +314,7 @@ if (log.isErrorEnabled()) { log.error("Could not update db", error); } + throw new TuttiActionException(action, error); } else { ApplicationInfo info = getInfo(UpdateType.DB, appToUpdate); if (info != null) { 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-11 10:01:36 UTC (rev 572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-11 10:34:37 UTC (rev 573) @@ -80,7 +80,7 @@ progressionModel.setMessage("Recherche de mises à jour de JRE / Tutti / I18N"); TuttiApplicationUpdaterCallBack callback = - new TuttiApplicationUpdaterCallBack(context, progressionModel); + new TuttiApplicationUpdaterCallBack(this, progressionModel); callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.JRE, TuttiApplicationUpdaterCallBack.UpdateType.I18N, 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-11 10:01:36 UTC (rev 572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java 2013-03-11 10:34:37 UTC (rev 573) @@ -67,7 +67,8 @@ ProgressionModel progressionModel = new ProgressionModel(); context.getActionUI().getModel().setProgressionModel(progressionModel); progressionModel.setMessage("Recherche de mises à jour de base"); - TuttiApplicationUpdaterCallBack callback = new TuttiApplicationUpdaterCallBack(context, progressionModel); + TuttiApplicationUpdaterCallBack callback = + new TuttiApplicationUpdaterCallBack(this, progressionModel); callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.DB); up.update(url, current, 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-11 10:01:36 UTC (rev 572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-03-11 10:34:37 UTC (rev 573) @@ -71,7 +71,8 @@ getContext().getActionUI().getModel().setProgressionModel(progressionModel); progressionModel.setMessage("Recherche de mises à jour de base"); - TuttiApplicationUpdaterCallBack callback = new TuttiApplicationUpdaterCallBack(getContext(), progressionModel); + TuttiApplicationUpdaterCallBack callback = + new TuttiApplicationUpdaterCallBack(this, progressionModel); callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.DB); up.update(url, current, dest, false, callback);