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

r889 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/util/action resources/i18n
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 19:42:04 +0200 (Mon, 29 Apr 2013) New Revision: 889 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/889 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier 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/util/action/TuttiActionHelper.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 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/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-04-29 17:42:04 UTC (rev 889) @@ -416,12 +416,12 @@ try { FileUtils.copyDirectory(source, target); } catch (IOException e) { - throw new RuntimeException("Could not copy directory content from " + source + " to " + target, e); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.copyDirectory.error", source, target), e); } try { FileUtils.deleteDirectory(source.getParentFile()); } catch (IOException e) { - throw new RuntimeException("Could not delete temporary directory " + target, e); + throw new TuttiTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error", target), e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 17:42:04 UTC (rev 889) @@ -133,8 +133,7 @@ A result = ConstructorUtils.invokeConstructor(actionName, handler); return result; } catch (Exception e) { - throw new RuntimeException( - "Could not instanciate action " + actionName, e); + throw new TuttiTechnicalException(_("tutti.action.create.error", actionName), e); } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-29 17:42:04 UTC (rev 889) @@ -16,6 +16,8 @@ tutti.about.update.content= tutti.about.update.title= tutti.action.create.error= +tutti.applicationUpdater.prepareFirstDB.copyDirectory.error= +tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error= tutti.applicationUpdater.synchroDB.prepare.error= tutti.applicationUpdater.synchroDB.synchro.error= tutti.applicationUpdater.synchroDB.writeVersion.error= 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-04-29 17:38:12 UTC (rev 888) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-29 17:42:04 UTC (rev 889) @@ -14,6 +14,8 @@ tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> tutti.about.update.title=Mise à jour Tutti tutti.action.create.error=Erreur à l'instanciation de l'action %s +tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s +tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error=Erreur lors de la suppression du dossier %s tutti.applicationUpdater.synchroDB.prepare.error=Erreur lors de la préparation de la synchronisation de la base tutti.applicationUpdater.synchroDB.synchro.error=Erreur lors de la synchronisation de la base tutti.applicationUpdater.synchroDB.writeVersion.error=Erreur lors de l'écriture de la nouvelle version de la base de données dans le fichier %s

1 0

r888 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service java/fr/ifremer/tutti/service/protocol resources/i18n
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 19:38:12 +0200 (Mon, 29 Apr 2013) New Revision: 888 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/888 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-04-29 17:38:12 UTC (rev 888) @@ -190,10 +190,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new RuntimeException( - "Could not find entity of type " + - entityType.getSimpleName() + " with '" + - propertyName + "' = " + value); + throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); } } return result; @@ -232,10 +229,8 @@ if (existingValues.contains(value)) { - // can not find entity this is a big problem for us... - throw new RuntimeException( - "Property '" + - propertyName + "' with value " + value + " is already defined."); + // entity already defined + throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityAlreadyDefined", propertyName, value)); } } return value; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 17:38:12 UTC (rev 888) @@ -66,7 +66,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error")); + throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); } taxonIds.add(referenceTaxonId); return species; Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-29 17:38:12 UTC (rev 888) @@ -50,6 +50,8 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight= tutti.service.compressZipFile.error= tutti.service.context.serviceInstanciation.error= +tutti.service.csv.parse.entityAlreadyDefined= +tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= tutti.service.export.catches.error= tutti.service.export.context.error= @@ -119,6 +121,7 @@ tutti.service.protocol.export.species.error= tutti.service.protocol.import.benthos.error= tutti.service.protocol.import.species.error= +tutti.service.protocol.import.taxonUsed.error= tutti.service.pupitri.export.species.error= tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.trunk.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 17:32:57 UTC (rev 887) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-29 17:38:12 UTC (rev 888) @@ -50,6 +50,8 @@ tutti.service.catches.computeWeights.species.error.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. tutti.service.compressZipFile.error=Erreur lors de la compression du dossier %1s dans le fichier %2s tutti.service.context.serviceInstanciation.error=Erreur lors de l'instanciation du service %s +tutti.service.csv.parse.entityAlreadyDefined=La propriété %1s de valeur %2s est déjà définie +tutti.service.csv.parse.entityNotFound=L'entité de type %1s avec la propriété %2s de valeur %3s n'a pas été trouvée tutti.service.cvs.format.error=Erreur lors du formattage de la valeur %s tutti.service.export.catches.error=Erreur lors de l'export des captures tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export @@ -94,6 +96,7 @@ tutti.service.protocol.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.protocol.import.benthos.error=Erreur lors de l'import du benthos du protocole %1s du fichier %2s tutti.service.protocol.import.species.error=Erreur lors de l'import des espèces du protocole %1s du fichier %2s +tutti.service.protocol.import.taxonUsed.error=Le taxon référent d'id %s est déjà utilisé tutti.service.pupitri.export.species.error=Erreur lors de l'export des espèces pour Pupitri dans le fichier %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trèmis %2s pour le trait %1s

1 0

Jenkins build became unstable: tutti #726
by admin+hudson＠codelutin.com 29 Apr '13

29 Apr '13

See <http://ci.nuiton.org/jenkins/job/tutti/726/changes>

1 2

Jenkins build became unstable: tutti » Tutti :: Service #726
by admin+hudson＠codelutin.com 29 Apr '13

29 Apr '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/726/c…>

1 2

r887 - in trunk/tutti-persistence/src/main: java/fr/ifremer/tutti/persistence java/fr/ifremer/tutti/persistence/service/synchro resources/i18n
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 19:32:57 +0200 (Mon, 29 Apr 2013) New Revision: 887 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/887 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:32:57 UTC (rev 887) @@ -29,6 +29,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,6 +41,8 @@ import java.util.Enumeration; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * A class loader that search first in a given directory before in parent * class loader. @@ -179,9 +182,7 @@ directories.toArray(new File[directories.size()])); loader = URLClassLoader.newInstance(urls, null); } catch (IOException e) { - throw new RuntimeException( - "Could not convert directories " + directories - + " to url.", e); + throw new TuttiTechnicalException(_("tutti.persistence.loader.error", directories), e); } } return loader; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.mapping.Table; @@ -40,6 +41,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Tutti database metadatas. * @@ -61,8 +64,7 @@ this.delegate = new DatabaseMetadata(connection, dialect, true); this.meta = connection.getMetaData(); } catch (SQLException e) { - throw new RuntimeException( - "Could not init database meta on connection " + connection, e); + throw new TuttiTechnicalException(_("tutti.persistence.dbMetadata.instanciation.error", connection), e); } tables = Maps.newTreeMap(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import org.hibernate.mapping.ForeignKey; import org.hibernate.tool.hbm2ddl.ColumnMetadata; @@ -43,6 +44,8 @@ import java.util.Set; import java.util.SortedSet; +import static org.nuiton.i18n.I18n._; + /** * Overrides of the {@link TableMetadata} with some improvements: * <ul> @@ -124,7 +127,7 @@ this.existingPrimaryKeysQuery = String.format(QUERY_SELECT_PRIMARY_KEYS, Joiner.on(',').join(pkNames), getName()); this.countQuery = String.format(QUERY_SELECT_COUNT, getName()); } catch (Exception e) { - throw new RuntimeException("Could not init " + this, e); + throw new TuttiTechnicalException(_("tutti.persistence.tableMetadata.instanciation.error", this), e); } } Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,11 @@ tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= +tutti.persistence.dbmetadata.instanciation.error= +tutti.persistence.dbmetadata.table.error= +tutti.persistence.loader.error= tutti.persistence.protocol.fromFile.error= +tutti.persistence.tableMetadata.instanciation.error= tutti.sampleCategoryType.age= tutti.sampleCategoryType.maturity= tutti.sampleCategoryType.sex= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,10 @@ tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données +tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s +tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocol du fichier %s +tutti.persistence.tableMetadata.instanciation.error=Erreur à l'initialisation de %s tutti.sampleCategoryType.age=Age tutti.sampleCategoryType.maturity=Maturité tutti.sampleCategoryType.sex=Sexe

1 0

r886 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 19:16:30 +0200 (Mon, 29 Apr 2013) New Revision: 886 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/886 Log: make test succeed Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 17:11:09 UTC (rev 885) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 17:16:30 UTC (rev 886) @@ -121,8 +121,8 @@ BatchContainer<MarineLitterBatch> rootMarineLitterBatch; try { - rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation, - catchBatch.getMarineLitterTotalWeight()); + Float weight = catchBatch == null ? null : catchBatch.getMarineLitterTotalWeight(); + rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation, weight); } catch (TuttiBusinessException e) { result.put(fishingOperationId, e.getMessage());

1 0

r885 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 19:11:09 +0200 (Mon, 29 Apr 2013) New Revision: 885 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/885 Log: make test succeed Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-04-29 16:47:02 UTC (rev 884) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-04-29 17:11:09 UTC (rev 885) @@ -204,8 +204,8 @@ BatchContainer<MarineLitterBatch> rootMarineLitterBatch; try { - rootMarineLitterBatch = tuttiWeightComputingService.getComputedMarineLitterBatches(fishingOperation, - catchBatch.getMarineLitterTotalWeight()); + Float weight = catchBatch == null ? null : catchBatch.getMarineLitterTotalWeight(); + rootMarineLitterBatch = tuttiWeightComputingService.getComputedMarineLitterBatches(fishingOperation, weight); } catch (TuttiBusinessException e) { errors.add(e.getMessage());

1 0

r884 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 18:47:02 +0200 (Mon, 29 Apr 2013) New Revision: 884 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/884 Log: fixes #2378 [Captures] - Macro-d?\195?\169chets - Erreur ?\195?\160 l'?\195?\169l?\195?\169vation des poids Removed: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 16:22:40 UTC (rev 883) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-29 16:47:02 UTC (rev 884) @@ -121,7 +121,8 @@ BatchContainer<MarineLitterBatch> rootMarineLitterBatch; try { - rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation); + rootMarineLitterBatch = getComputedMarineLitterBatches(fishingOperation, + catchBatch.getMarineLitterTotalWeight()); } catch (TuttiBusinessException e) { result.put(fishingOperationId, e.getMessage()); @@ -590,19 +591,22 @@ return result; } - public BatchContainer<MarineLitterBatch> getComputedMarineLitterBatches(FishingOperation operation) { + public BatchContainer<MarineLitterBatch> getComputedMarineLitterBatches(FishingOperation operation, + Float marineLitterweight) { + String fishingOperationId = operation.getId(); BatchContainer<MarineLitterBatch> rootMarineLitterBatch = - persistenceService.getRootMarineLitterBatch(operation.getId()); + persistenceService.getRootMarineLitterBatch(fishingOperationId); if (rootMarineLitterBatch != null) { + boolean checkWeight = marineLitterweight == null; + List<MarineLitterBatch> children = rootMarineLitterBatch.getChildren(); for (int i = 0; i < children.size(); i++) { MarineLitterBatch batch = children.get(i); - NuitonValidatorResult validator = validationService.validateMarineLitterBatch(batch); - if (validator.hasWarningMessages()) { + if (checkWeight && batch.getWeight() == null) { throw new TuttiWeightComputingException( - _(validator.getMessagesForScope(NuitonValidatorScope.WARNING).get(0)), + _("tutti.validator.warning.marineLitter.weight.required"), TuttiWeightComputingException.CatchType.MARINE_LITTER, i); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-04-29 16:22:40 UTC (rev 883) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-04-29 16:47:02 UTC (rev 884) @@ -204,7 +204,8 @@ BatchContainer<MarineLitterBatch> rootMarineLitterBatch; try { - rootMarineLitterBatch = tuttiWeightComputingService.getComputedMarineLitterBatches(fishingOperation); + rootMarineLitterBatch = tuttiWeightComputingService.getComputedMarineLitterBatches(fishingOperation, + catchBatch.getMarineLitterTotalWeight()); } catch (TuttiBusinessException e) { errors.add(e.getMessage()); Deleted: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml 2013-04-29 16:22:40 UTC (rev 883) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml 2013-04-29 16:47:02 UTC (rev 884) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="weight"> - <field-validator type="required" short-circuit="true"> - <message>tutti.validator.warning.marineLitter.weight.required</message> - </field-validator> - </field> - -</validators> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-29 16:22:40 UTC (rev 883) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-29 16:47:02 UTC (rev 884) @@ -91,7 +91,8 @@ BatchContainer<MarineLitterBatch> computedMarineLitterBatches; try { computedMarineLitterBatches = - tuttiWeightComputingService.getComputedMarineLitterBatches(model.getFishingOperation()); + tuttiWeightComputingService.getComputedMarineLitterBatches(model.getFishingOperation(), + model.getMarineLitterTotalWeight()); } catch (TuttiWeightComputingException e) { getUI().getTabPane().setSelectedIndex(3);

1 0

r883 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/protocol tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action
by kmorin＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: kmorin Date: 2013-04-29 18:22:40 +0200 (Mon, 29 Apr 2013) New Revision: 883 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/883 Log: fixes #2375 [Observation individuelles] R?\195?\169utiliser les donn?\195?\169es d?\195?\169j?\195?\160 pr?\195?\169sentes lors de la cr?\195?\169ation Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 16:22:40 UTC (rev 883) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; @@ -34,6 +35,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Model to import / export {@link SpeciesRow}. * @@ -63,8 +66,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new RuntimeException( - "Reference taxon Id [" + referenceTaxonId + "] already used before."); + throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error")); } taxonIds.add(referenceTaxonId); return species; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-29 16:22:40 UTC (rev 883) @@ -22,6 +22,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -66,6 +67,14 @@ return result; } + public Caracteristic getLastLengthStepCaracteristicUsed() { + Caracteristic result = null; + if (!rows.isEmpty()) { + result = rows.get(rows.size() - 1).getLengthStepCaracteristic(); + } + return result; + } + //------------------------------------------------------------------------// //-- TabContentModel --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-29 16:22:40 UTC (rev 883) @@ -179,6 +179,8 @@ model.setSpecies(batchModel.getLastSpeciesUsed()); + model.setLengthStepCaracteristic(batchModel.getLastLengthStepCaracteristicUsed()); + model.setAvailableSpecies(getDataContext().getReferentSpeciesWithSurveyCode()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 16:22:40 UTC (rev 883) @@ -196,12 +196,12 @@ Float endLatitude, Float endLongitude) { - double sLat = startLatitude * Math.PI / 180; - double sLong = startLongitude * Math.PI / 180; - double eLat = endLatitude * Math.PI / 180; - double eLong = endLongitude * Math.PI / 180; + double sLat = startLatitude * Math.PI / 180.0; + double sLong = startLongitude * Math.PI / 180.0; + double eLat = endLatitude * Math.PI / 180.0; + double eLong = endLongitude * Math.PI / 180.0; - Double d = 6378288 * + Double d = 6378288.0 * (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); return d.intValue(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 16:22:40 UTC (rev 883) @@ -105,7 +105,6 @@ return result; } catch (Exception e) { throw new TuttiTechnicalException(_("tutti.action.create.error", actionName), e); - //"Could not instanciate action " + actionName, e); } }

1 0

r882 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: . operation/catches
by tchemit＠users.forge.codelutin.com 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 14:31:29 +0200 (Mon, 29 Apr 2013) New Revision: 882 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/882 Log: fixes Evolution #2374: Mettre l'onglet Captures accidentelles en dernier Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-04-29 12:31:29 UTC (rev 882) @@ -49,7 +49,7 @@ protected boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { - String answer = null; + String answer; do { answer = JOptionPane.showInputDialog(getContext().getActionUI(), _("tutti.manageTemporaryReferential.passwordDialog.message"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) @@ -315,7 +315,7 @@ public boolean quitCurrentScreen() { boolean canClose; - if (context.getScreen() == null) { + if (context.getScreen() == null || currentBody==null) { // no screen, surely can quit canClose = true; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) @@ -121,8 +121,8 @@ setCustomTab(1, ui.getSpeciesTabContent().getModel()); setCustomTab(2, ui.getBenthosTabContent().getModel()); setCustomTab(3, ui.getMarineLitterTabContent().getModel()); - setCustomTab(4, ui.getAccidentalTabContent().getModel()); - setCustomTab(5, ui.getIndividualObservationTabContent().getModel()); + setCustomTab(4, ui.getIndividualObservationTabContent().getModel()); + setCustomTab(5, ui.getAccidentalTabContent().getModel()); getTabPanel().setSelectedIndex(1); }

1 0