- Tutti-commits - mailman.cloud.codelutin.com

r1214 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: maven-release Date: 2013-09-23 18:11:15 +0200 (Mon, 23 Sep 2013) New Revision: 1214 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1214 Log: [maven-release-plugin] prepare release tutti-2.5.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-persistence/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-service/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-ui-swing/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1213 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation
by tchemit＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: tchemit Date: 2013-09-23 17:56:04 +0200 (Mon, 23 Sep 2013) New Revision: 1213 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1213 Log: fixes #3321: [donn?\195?\169es individuelles] erreur ?\195?\160 l'enregistrement pour la cration d'une nouvelle ligne Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:55:03 UTC (rev 1212) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:56:04 UTC (rev 1213) @@ -93,6 +93,9 @@ public IndividualObservationBatchRowModel(WeightUnit weightUnit) { super(IndividualObservationBatch.class, fromBeanBinder, toBeanBinder); this.weightUnit = weightUnit; + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } public IndividualObservationBatchRowModel(WeightUnit weightUnit, @@ -102,10 +105,6 @@ fromEntity(entity); - if (getCaracteristics() == null) { - setCaracteristics(new CaracteristicMap()); - } - // move default caracteristics from caracteristic map CaracteristicMap caracteristics = getCaracteristics(); for (Caracteristic caracteristic : defaultCaracteristicsSet) { @@ -139,6 +138,10 @@ // convert weight setWeight(weightUnit.fromEntity(getWeight())); + + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } @Override

1 0

r1212 - in trunk: . src/update
by tchemit＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: tchemit Date: 2013-09-23 17:55:03 +0200 (Mon, 23 Sep 2013) New Revision: 1212 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1212 Log: fixes #3323: [TECH] Mettre ?\195?\160 jour l'ancien fichier des mises ?\195?\160 jour Added: trunk/src/update/update-tutti.properties Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) +++ trunk/pom.xml 2013-09-23 15:55:03 UTC (rev 1212) @@ -609,6 +609,76 @@ </profile> <profile> + <id>deploy-legacy-tutti-application-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <defaultGoal>deploy</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy tutti-application.properties to site</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="copy tutti-application.properties to site" /> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> + <filterset> + <filter value="${project.version}" token="projectVersion" /> + <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${dbVersion}" token="dbVersion" /> + </filterset> + <fileset dir="${basedir}/src/update/"> + <include name="update-tutti.properties" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>forge.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/update-tutti.properties + </fromFile> + <url> + scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti + </url> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> + + </profile> + + <profile> <id>deploy-tutti-application-update</id> <activation> <property> Added: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties (rev 0) +++ trunk/src/update/update-tutti.properties 2013-09-23 15:55:03 UTC (rev 1212) @@ -0,0 +1,70 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +################################################################################ +### IMPORTANT NOTE ############################################################# +### This is the legacy update files, will be removed in version 3.0 ############ +### IMPORTANT NOTE ############################################################# +################################################################################ + +################################################################################ +### JRE Updates ################################################################ +################################################################################ + +jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip +#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip + +################################################################################ +### Tutti Updates ############################################################## +################################################################################ + +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip + +################################################################################ +### I18n Updates ############################################################### +################################################################################ + +i18n.version=@projectVersion@ +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip + +################################################################################ +### Help Updates ############################################################### +################################################################################ + +help.version=@projectVersion@ +help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip + + +################################################################################ +### DB Updates ################################################################# +################################################################################ + +db.version=@dbVersion@ +db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip +db.auth=true \ No newline at end of file Property changes on: trunk/src/update/update-tutti.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

[ANN] - Tutti 2.5 released
by forge.codelutin.com Release Notification 23 Sep '13

23 Sep '13

The Tutti team is pleased to announce the tutti-2.5 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [DONNEES INDIVIDUELLES] gérer les colonnes du tableau dans le protocole Issue: 3297. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] liste des espèces possibles. Saisie au km Issue: 3303. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] pouvoir choisir dans la configuration l'unité de saisie des poids (espèces benthos macro déchets) kg ou g et donc adapter les intitulés des colonnes Issue: 3310. Thanks to Tony Chemit. Resolved by tchemit. o [MACRO-DECHET] Ajout du champs *Poids* sur l'écran de création Issue: 3311. Thanks to Tony Chemit. Resolved by tchemit. o [ESPECE] Ajout du contexte d'un lot sur l'écran de catégorisation Issue: 3267. Thanks to Tony Chemit. Resolved by tchemit. o [ESPECE] pouvoir saisir plusieurs lots pères sans refermer le formulaire Issue: 3270. Thanks to Tony Chemit. Resolved by tchemit. o [MENSURATION] ajout bouton "enregistrer et passer à l'espèce suivante" dans écran mensurations Issue: 3271. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] pouvoir saisir aussi le nombre dès la création d'un lot Issue: 3279. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] à la création d'un lot, scanner le protocole et proposer la catégorisation du protocole Issue: 3280. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURES ACCIDENTELLES] Permettre la saisie de plusieurs captures accidentelles sans avoir à fermer l'écran de création Issue: 3292. Thanks to Tony Chemit. Resolved by tchemit. o [MACRO-DECHETS] Permettre la saisie de plusieurs macro-déchets sans avoir à fermer l'écran de création Issue: 3291. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [DONNEES INDIVIDUELLES] L'ordre de saisie n'est pas conservé Issue: 3306. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] Utilisation du code campagne sur les espèces Issue: 3304. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] Ligne à supprimer non sélectionnée Issue: 3309. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURES ACCIDENTELLES] L'ordre de saisie n'est pas conservé Issue: 3308. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Problème de génération du fichier des mises à jour Issue: 3262. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] Barre de progression trop longue Issue: 3263. Thanks to Tony Chemit. Resolved by tchemit. o [TRAIT] Vérifier que l'ordre de saisie des captures est bien celui de la configuration de catégorisation Issue: 3265. Thanks to Tony Chemit. Resolved by tchemit. o [ESPECE] Sur l'écran de création d'un lot, libellé manquant + hors-vrac sélectionné au lieu de vrac Issue: 3264. Thanks to Tony Chemit. Resolved by tchemit. o suite Evolution #2460, oui on peut suprimer une espèce dans le protocole via clic droit mais la ligne se désélectionne donc on ne sais pas ce que l'on va supprimer Issue: 2881. Thanks to Vincent BADTS. Resolved by tchemit. o Lors d'un import d'une base, la version affichée dans le gestionnaire reste sur la version avant migration Issue: 3268. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOL] Dans le tableau Benthos la categorie V/HV apparait Issue: 3287. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] Impossible de créer un lot espèce / benthos (V ou HV) après avoir supprimer le lot pour cette même espèce. Issue: 3289. Thanks to Tony Chemit. Resolved by tchemit. o [MENSURATION] Ne pas conserver les id des catégories dans la barre de rappel Issue: 3266. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Updates mavenpom to 4.1 Issue: 3269. Thanks to Tony Chemit. Resolved by tchemit. o Updates jaxx to 2.5.26 Issue: 3293. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1211 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: maven-release Date: 2013-09-23 16:32:15 +0200 (Mon, 23 Sep 2013) New Revision: 1211 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1211 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 14:32:06 UTC (rev 1210) +++ trunk/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-23 14:32:06 UTC (rev 1210) +++ trunk/tutti-persistence/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-23 14:32:06 UTC (rev 1210) +++ trunk/tutti-service/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-23 14:32:06 UTC (rev 1210) +++ trunk/tutti-ui-swing/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1210 - tags
by maven-release＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: maven-release Date: 2013-09-23 16:32:06 +0200 (Mon, 23 Sep 2013) New Revision: 1210 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1210 Log: [maven-release-plugin] copy for tag tutti-2.5 Added: tags/tutti-2.5/

1 0

r1209 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: maven-release Date: 2013-09-23 16:31:56 +0200 (Mon, 23 Sep 2013) New Revision: 1209 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1209 Log: [maven-release-plugin] prepare release tutti-2.5 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 13:14:53 UTC (rev 1208) +++ trunk/pom.xml 2013-09-23 14:31:56 UTC (rev 1209) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-23 13:14:53 UTC (rev 1208) +++ trunk/tutti-persistence/pom.xml 2013-09-23 14:31:56 UTC (rev 1209) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-23 13:14:53 UTC (rev 1208) +++ trunk/tutti-service/pom.xml 2013-09-23 14:31:56 UTC (rev 1209) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-23 13:14:53 UTC (rev 1208) +++ trunk/tutti-ui-swing/pom.xml 2013-09-23 14:31:56 UTC (rev 1209) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1208 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/util/action resources/i18n
by tchemit＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: tchemit Date: 2013-09-23 15:14:53 +0200 (Mon, 23 Sep 2013) New Revision: 1208 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1208 Log: improve action progress bar Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-23 13:14:53 UTC (rev 1208) @@ -305,8 +305,10 @@ @Override public void showInformationMessage(String message) { - if (log.isInfoEnabled()) { - log.info(message); + if (StringUtils.isNotBlank(message)) { + if (log.isInfoEnabled()) { + log.info(message); + } } } }; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-23 13:14:53 UTC (rev 1208) @@ -67,7 +67,9 @@ if (ProgressionModel.PROPERTY_MESSAGE.equals(propertyName)) { // change message - ui.getTaskActionLabel().setText((String) evt.getNewValue()); + String newMessage = (String) evt.getNewValue(); + ui.getTaskActionLabel().setText("<html><body>" + newMessage + "</body></html>"); + ui.pack(); } else if (ProgressionModel.PROPERTY_TOTAL.equals(propertyName)) { // change total progressbar max 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-09-23 13:00:24 UTC (rev 1207) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-23 13:14:53 UTC (rev 1208) @@ -1226,7 +1226,7 @@ tutti.multiPostImportLog.totalWeight=Poids total \: %s kg tutti.openDb.step.check.dbContext=Vérification du context de saisie tutti.openDb.step.checkSchemaVersion=Vérification de la compatibilité de la base -tutti.openDb.step.open=Ouverture de la base %s +tutti.openDb.step.open=Ouverture de la base <strong>%s</strong> tutti.openDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s tutti.option.cancel=Annuler tutti.option.cleanAndClone=Nettoyer et Cloner

1 0

r1207 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: tchemit Date: 2013-09-23 15:00:24 +0200 (Mon, 23 Sep 2013) New Revision: 1207 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1207 Log: refs #3297: [DONNEES INDIVIDUELLES] g?\195?\169rer les colonnes du tableau dans le protocole (fix NPE if no caracteristics defined in protocol) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-09-23 12:59:33 UTC (rev 1206) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-09-23 13:00:24 UTC (rev 1207) @@ -40,6 +40,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -692,14 +693,22 @@ if (log.isInfoEnabled()) { log.info("Loading defaultIndividualObservationCaracteristics"); } - List<Caracteristic> list ; + List<Caracteristic> list; if (isProtocolFilled()) { List<String> individualObservationPmfmId = getProtocol().getIndividualObservationPmfmId(); - list = Lists.newArrayListWithCapacity(individualObservationPmfmId.size()); - for (String id : individualObservationPmfmId) { - Caracteristic caracteristic = service.getCaracteristic(Integer.valueOf(id)); - list.add(caracteristic); + if (CollectionUtils.isEmpty(individualObservationPmfmId)) { + + // no conf + list = Lists.newArrayList(); + + } else { + list = Lists.newArrayListWithCapacity(individualObservationPmfmId.size()); + for (String id : individualObservationPmfmId) { + Caracteristic caracteristic = service.getCaracteristic(Integer.valueOf(id)); + list.add(caracteristic); + } } + } else { // no default caracteristics to use list = Lists.newArrayList(); @@ -718,7 +727,7 @@ public void resetProtocol() { protocol = null; lengthStepCaracteristics = null; - defaultIndividualObservationCaracteristics=null; + defaultIndividualObservationCaracteristics = null; } public void resetGears() {

1 0

r1206 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db
by tchemit＠users.forge.codelutin.com 23 Sep '13

23 Sep '13

Author: tchemit Date: 2013-09-23 14:59:33 +0200 (Mon, 23 Sep 2013) New Revision: 1206 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1206 Log: fixes #3268: Lors d'un import d'une base, la version affich?\195?\169e dans le gestionnaire reste sur la version avant migration Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-09-23 12:20:59 UTC (rev 1205) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-09-23 12:59:33 UTC (rev 1206) @@ -267,7 +267,7 @@ if (updateSchema) { // need to migrate schema - progressionModel.adaptTotal(progressionModel.getTotal() + 1); + progressionModel.adaptTotal(progressionModel.getTotal() + 2); // ------------------------------------------------------------------ // // --- update schema // @@ -281,6 +281,14 @@ getHandler().getPersistenceService().updateSchema(); sendMessage(_("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); + + // reload a special databinding (dbLoaded) + AbstractTuttiUIHandler currentHandler = getHandler().getCurrentHandler(); + if (currentHandler instanceof DbManagerUIHandler) { + DbManagerUIHandler dbManagerUIHandler = (DbManagerUIHandler) currentHandler; + dbManagerUIHandler.getUI().applyDataBinding(DbManagerUI.BINDING_INFORMATION_AREA_TEXT); + + } } // ------------------------------------------------------------------ //

1 0