Author: tchemit Date: 2013-03-13 00:08:47 +0100 (Wed, 13 Mar 2013) New Revision: 600 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/600 Log: fixes #2006: [TECH] - Am?\195?\169liorer la progression lors des mises ?\195?\160 jour Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.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/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/pom.xml 2013-03-12 23:08:47 UTC (rev 600) @@ -120,7 +120,7 @@ <!-- libraries version --> - <nuitonUtilsVersion>2.6.10</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-persistence/pom.xml 2013-03-12 23:08:47 UTC (rev 600) @@ -57,6 +57,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-updater</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2013-03-12 23:08:47 UTC (rev 600) @@ -25,6 +25,7 @@ */ import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.util.updater.DownloadMonitor; /** * Simple model for a progression long task. @@ -32,7 +33,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ProgressionModel extends AbstractSerializableBean { +public class ProgressionModel extends AbstractSerializableBean implements DownloadMonitor { private static final long serialVersionUID = 1L; @@ -86,7 +87,6 @@ Object oldValue = getRate(); this.rate = rate; firePropertyChange(PROPERTY_RATE, oldValue, rate); - } public String getMessage() { @@ -98,4 +98,14 @@ this.message = message; firePropertyChange(PROPERTY_MESSAGE, oldValue, message); } + + @Override + public void setSize(long size) { + setTotal((int)size); + } + + @Override + public void setCurrent(long current) { + setCurrent((int)current); + } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2013-03-12 23:08:47 UTC (rev 600) @@ -28,9 +28,9 @@ import com.esotericsoftware.yamlbeans.YamlReader; import com.esotericsoftware.yamlbeans.YamlWriter; import com.google.common.base.Charsets; -import com.google.common.io.Closeables; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiTechnicalException; +import org.apache.commons.io.IOUtils; import java.io.BufferedWriter; import java.io.File; @@ -58,7 +58,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not transform protocol " + id + " to file " + file, e); } finally { - Closeables.closeQuietly(fileWriter); + IOUtils.closeQuietly(fileWriter); } } @@ -75,7 +75,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not import protocol from file " + file, e); } finally { - Closeables.closeQuietly(fileReader); + IOUtils.closeQuietly(fileReader); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-03-12 23:08:47 UTC (rev 600) @@ -31,7 +31,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; -import com.google.common.io.Closeables; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; @@ -41,6 +40,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder; @@ -107,14 +107,14 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new IOException("Could not import protocol [" + protocol.getName() + "] caracteristic from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } protocol.setLengthClassesPmfmId( @@ -157,7 +157,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export all caracteristics to file " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } @@ -201,7 +201,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export protocol [" + protocol.getName() + "] caracteristic to file " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } @@ -259,13 +259,13 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new TuttiTechnicalException("Could not import protocol [" + protocol.getName() + "] caracteristic from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } List<SpeciesProtocol> values = Lists.newArrayList(ids.values()); @@ -302,7 +302,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export species protocol to file " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 23:08:47 UTC (rev 600) @@ -29,7 +29,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.common.io.Closeables; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -39,6 +38,7 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; @@ -99,14 +99,14 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new IOException("Could not import species from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } List<Species> result = @@ -148,14 +148,14 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new IOException("Could not import vessels from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } List<Vessel> result = persistenceService.importTemporaryVessel(toImport); @@ -181,14 +181,14 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new IOException("Could not import persons from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } List<Person> result = persistenceService.importTemporaryPerson(toImport); @@ -229,14 +229,14 @@ } importer.close(); } finally { - Closeables.closeQuietly(importer); + IOUtils.closeQuietly(importer); } reader.close(); } catch (Exception e) { throw new IOException("Could not import gears from file " + file, e); } finally { - Closeables.closeQuietly(reader); + IOUtils.closeQuietly(reader); } List<Gear> result = persistenceService.importTemporaryGear(toImport); return result; @@ -272,7 +272,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export species to file: " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } @@ -318,7 +318,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export species to file: " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } @@ -355,7 +355,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export species to file: " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } @@ -398,7 +398,7 @@ } catch (Exception e) { throw new TuttiTechnicalException("Could not export species to file: " + file, e); } finally { - Closeables.closeQuietly(writer); + IOUtils.closeQuietly(writer); } } 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-12 18:50:50 UTC (rev 599) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-12 23:08:47 UTC (rev 600) @@ -71,13 +71,12 @@ File dest = new File(config.getTuttiBasedir(), "NEW"); if (log.isInfoEnabled()) { - log.info(String.format("Try to update jre, i18N or tutti (current application location: %s), using update url: %s", current, url)); + log.info(String.format("Try to update jre, i18N, help or tutti (current application location: %s), using update url: %s", current, url)); } - ApplicationUpdater up = new ApplicationUpdater(); ProgressionModel progressionModel = new ProgressionModel(); context.getActionUI().getModel().setProgressionModel(progressionModel); - progressionModel.setMessage("Recherche de mises à jour de JRE / Tutti / I18N"); + progressionModel.setMessage("Recherche de mises à jour de JRE / Tutti / I18N / Help"); TuttiApplicationUpdaterCallBack callback = new TuttiApplicationUpdaterCallBack(this, progressionModel); @@ -86,6 +85,8 @@ TuttiApplicationUpdaterCallBack.UpdateType.I18N, TuttiApplicationUpdaterCallBack.UpdateType.TUTTI, TuttiApplicationUpdaterCallBack.UpdateType.HELP); + ApplicationUpdater up = new ApplicationUpdater(); + up.setDownloadMonitor(progressionModel); up.update(url, current, dest, 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-12 18:50:50 UTC (rev 599) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateReferentialAction.java 2013-03-12 23:08:47 UTC (rev 600) @@ -61,7 +61,6 @@ if (log.isInfoEnabled()) { log.info(String.format("Try to update db (current data location: %s), using update url: %s", current, url)); } - ApplicationUpdater up = new ApplicationUpdater(); File dest = new File(config.getTuttiBasedir(), "NEW"); ProgressionModel progressionModel = new ProgressionModel(); @@ -70,6 +69,8 @@ TuttiApplicationUpdaterCallBack callback = new TuttiApplicationUpdaterCallBack(this, progressionModel); callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.DB); + ApplicationUpdater up = new ApplicationUpdater(); + up.setDownloadMonitor(progressionModel); up.update(url, current, dest, 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-12 18:50:50 UTC (rev 599) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-03-12 23:08:47 UTC (rev 600) @@ -68,6 +68,7 @@ File dest = new File(config.getTuttiBasedir(), "NEW"); ProgressionModel progressionModel = new ProgressionModel(); + up.setDownloadMonitor(progressionModel); getContext().getActionUI().getModel().setProgressionModel(progressionModel); progressionModel.setMessage("Recherche de mises à jour de base"); @@ -90,6 +91,6 @@ super.postSuccessAction(); String jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - sendMessage(_("tutti.flash.information.db.installed.", jdbcUrl)); + sendMessage(_("tutti.flash.information.db.installed", jdbcUrl)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 18:50:50 UTC (rev 599) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 23:08:47 UTC (rev 600) @@ -161,7 +161,6 @@ tutti.flash.information.db.closed=La base de données <strong>%s</strong> est fermée. tutti.flash.information.db.exported=Base exportée dans l'archive <strong>%s</strong>. tutti.flash.information.db.installed=La base de données <strong>%s</strong> est installée. -tutti.flash.information.db.installed.= tutti.flash.information.db.opened=La base de données <strong>%s</strong> est ouverte. tutti.flash.information.programCreated=La série de campagne <strong>%s</strong> a été créée. tutti.flash.information.programSaved=La série de campagne <strong>%s</strong> a été enregistrée.