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

r754 - trunk/tutti-service/src/test/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: tchemit Date: 2013-04-08 18:02:05 +0200 (Mon, 08 Apr 2013) New Revision: 754 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/754 Log: fix bad import Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java 2013-04-08 15:43:12 UTC (rev 753) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java 2013-04-08 16:02:05 UTC (rev 754) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.config.TuttiServiceConfig; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore;

1 0

r753 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: tchemit Date: 2013-04-08 17:43:12 +0200 (Mon, 08 Apr 2013) New Revision: 753 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/753 Log: back to required level 1.6 (jaxx does not still accept 1.7) Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-service/pom.xml 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/util/CustomTab.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/pom.xml 2013-04-08 15:43:12 UTC (rev 753) @@ -119,10 +119,10 @@ <projectId>tutti</projectId>  - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> +  +  +  +   @@ -226,6 +226,12 @@ <classifier>tests</classifier> </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${xworkVersion}</version> + </dependency> +  <dependency> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2013-04-08 15:43:12 UTC (rev 753) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $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% + */ + import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import java.io.Serializable; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-08 15:43:12 UTC (rev 753) @@ -112,7 +112,7 @@ // Get marine litter root batch SortingBatch vracMarineLitterBatch = getMarineLitterParentBatch(catchBatch); - BatchContainer<MarineLitterBatch> result = new BatchContainer<>(); + BatchContainer<MarineLitterBatch> result = new BatchContainer<MarineLitterBatch>(); result.setId(vracMarineLitterBatch.getId()); Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-service/pom.xml 2013-04-08 15:43:12 UTC (rev 753) @@ -115,6 +115,16 @@ <artifactId>commons-vfs2</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> +  <dependency> 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-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-08 15:43:12 UTC (rev 753) @@ -25,8 +25,6 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; @@ -43,8 +41,6 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -291,24 +287,18 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getSpeciesTabCreateBatch(); - titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); - title = n_("tutti.createSpeciesBatch.title"); - - break; - case SPLIT_BATCH_CARD: - tuttiUi = ui.getSpeciesTabSplitBatch(); - titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); - title = n_("tutti.splitSpeciesBatch.title"); - - break; - case EDIT_FREQUENCY_CARD: - tuttiUi = ui.getSpeciesTabFrequencyEditor(); - titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); - title = n_("tutti.editSpeciesFrequencies.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabCreateBatch(); + titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); + title = n_("tutti.createSpeciesBatch.title"); + } else if (SPLIT_BATCH_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabSplitBatch(); + titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); + title = n_("tutti.splitSpeciesBatch.title"); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabFrequencyEditor(); + titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); + title = n_("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { @@ -336,24 +326,18 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getBenthosTabCreateBatch(); - titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); - title = n_("tutti.createBenthosBatch.title"); - - break; - case SPLIT_BATCH_CARD: - tuttiUi = ui.getBenthosTabSplitBatch(); - titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); - title = n_("tutti.splitBenthosBatch.title"); - - break; - case EDIT_FREQUENCY_CARD: - tuttiUi = ui.getBenthosTabFrequencyEditor(); - titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); - title = n_("tutti.editBenthosFrequencies.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabCreateBatch(); + titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); + title = n_("tutti.createBenthosBatch.title"); + } else if (SPLIT_BATCH_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabSplitBatch(); + titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); + title = n_("tutti.splitBenthosBatch.title"); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabFrequencyEditor(); + titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); + title = n_("tutti.editBenthosFrequencies.title"); } if (tuttiUi != null) { @@ -381,12 +365,10 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getMarineLitterTabCreateBatch(); - titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); - title = n_("tutti.createMarineLitterBatch.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getMarineLitterTabCreateBatch(); + titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); + title = n_("tutti.createMarineLitterBatch.title"); } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-04-08 15:43:12 UTC (rev 753) @@ -74,9 +74,7 @@ } }, this.model); - } catch (NoSuchMethodException - | IllegalAccessException - | InvocationTargetException ex) { + } catch (Exception ex) { log.error("Error while adding the listener to the model modifications", ex); } 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-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-08 15:43:12 UTC (rev 753) @@ -1,3 +1,4 @@ +swing.error.cannot.open.file= swing.error.cannot.open.link= swing.error.desktop.browse.not.supported= swing.error.desktop.extension.not.supported=

1 0

r752 - trunk
by tchemit＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: tchemit Date: 2013-04-08 16:04:34 +0200 (Mon, 08 Apr 2013) New Revision: 752 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/752 Log: update to last stable version fo eugene and jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-08 13:32:01 UTC (rev 751) +++ trunk/pom.xml 2013-04-08 14:04:34 UTC (rev 752) @@ -129,10 +129,10 @@ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <eugenePluginVersion>2.6.2-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.16-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.16</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

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

08 Apr '13

Author: kmorin Date: 2013-04-08 15:32:01 +0200 (Mon, 08 Apr 2013) New Revision: 751 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/751 Log: refs #2229 [CAPTURE] - Import/Export PUPITRI : erreur quand je demande ?\195?\160 visualiser la pi?\195?\168ce jointe (le .car) en cliquant que l'ic?\195?\180ne "oeil" 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/attachment/AttachmentEditorUIHandler.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/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-08 10:17:28 UTC (rev 750) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-08 13:32:01 UTC (rev 751) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiTechnicalException; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.FileChooserUtil; import jaxx.runtime.JAXXBinding; import jaxx.runtime.JAXXObject; @@ -278,9 +279,10 @@ } desktop.browse(uri); + throw new RuntimeException(_("swing.error.cannot.open.link")); } catch (Exception e) { - throw new TuttiTechnicalException("Could not open link: " + uri, e); + throw new TuttiTechnicalException(_("swing.error.cannot.open.link"), e); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-08 10:17:28 UTC (rev 750) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-08 13:32:01 UTC (rev 751) @@ -25,12 +25,14 @@ */ import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionException; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; @@ -255,7 +257,18 @@ public void openAttachment(Attachment attachment) { File file = persistenceService.getAttachmentFile(attachment.getId()); - TuttiUIUtil.openLink(file.toURI()); + try { + TuttiUIUtil.openLink(file.toURI()); + + } catch (TuttiTechnicalException e) { + String message; + if (e.getCause() instanceof TuttiTechnicalException) { + message = e.getCause().getMessage(); + } else { + message = _("swing.error.cannot.open.file"); + } + TuttiUIContext.getErrorHelper().showErrorDialog(message, e); + } } public void saveAttachment(Attachment attachment) { 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-08 10:17:28 UTC (rev 750) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-08 13:32:01 UTC (rev 751) @@ -1,4 +1,6 @@ +swing.error.cannot.open.link= swing.error.desktop.browse.not.supported= +swing.error.desktop.extension.not.supported= swing.error.desktop.not.supported= tutti.about.bottomText= tutti.about.message= 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-08 10:17:28 UTC (rev 750) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-08 13:32:01 UTC (rev 751) @@ -1,5 +1,7 @@ -swing.error.desktop.browse.not.supported= -swing.error.desktop.not.supported= +swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de Tutti. +swing.error.cannot.open.link=La cible du lien n'existe pas. +swing.error.desktop.browse.not.supported=Le navigateur n'a pas pu être ouvert. Vérifiez que vous avez défini un navigateur par défaut dans votre système. +swing.error.desktop.not.supported=Votre système ne permet pas d'ouvrir des liens ou fichiers en dehors de Tutti. tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.<hr/> Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>. tutti.about.title=À propos de Tutti

1 0

r750 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: tchemit Date: 2013-04-08 12:17:28 +0200 (Mon, 08 Apr 2013) New Revision: 750 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/750 Log: fixes #2227: [CAPTURE] Revoir la structure de l'arbre d'?\195?\169chantillonage Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-08 10:09:01 UTC (rev 749) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-08 10:17:28 UTC (rev 750) @@ -397,8 +397,8 @@ recorderDepartmentId, enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_VRAC_ID, - null, - null); + source.getCatchTotalSortedCarousselWeight(), + source.getCatchTotalSortedTremisWeight()); batch.setRankOrder((short) 1); { @@ -723,7 +723,7 @@ Integer sortingPmfmId, Integer sortingQualitativeValueId, Float weight, - Float sampleWeight) { + Float weightBeforeSampling) { Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); @@ -758,26 +758,30 @@ } // Sampling Ratio - if (sampleWeight == null || weight == null) { + if (weightBeforeSampling == null || weight == null) { target.setSamplingRatio(null); target.setSamplingRatioText(null); } else { - String samplingRatioText = weight + "/" + sampleWeight; + String samplingRatioText = weight + "/" + weightBeforeSampling; samplingRatioText = samplingRatioText.replaceAll(",", "."); target.setSamplingRatioText(samplingRatioText); - target.setSamplingRatio(weight / sampleWeight); + target.setSamplingRatio(weight / weightBeforeSampling); } // Weight - if (sampleWeight == null && weight == null) { + if (weightBeforeSampling == null && weight == null) { // Nothing to do : will be removed later, using notChangedQuantificationMeasurements } else { Float batchReferenceWeight = weight; if (batchReferenceWeight == null) { - batchReferenceWeight = sampleWeight; + batchReferenceWeight = weightBeforeSampling; } - QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement(target, - enumeration.PMFM_ID_WEIGHT_MEASURED, recorderDepartmentId, batchReferenceWeight, true); + QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement( + target, + enumeration.PMFM_ID_WEIGHT_MEASURED, + recorderDepartmentId, + batchReferenceWeight, + true); notChangedQuantificationMeasurements.remove(quantificationMeasurement); }

1 0

r749 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch
by kmorin＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: kmorin Date: 2013-04-08 12:09:01 +0200 (Mon, 08 Apr 2013) New Revision: 749 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/749 Log: fixes #2251 [CAPTURE] - Esp?\195?\168ces - La donn?\195?\169e "?\195?\160 confirmer" n'est pas sauv?\195?\169e sur le lot Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-04-08 10:06:53 UTC (rev 748) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-04-08 10:09:01 UTC (rev 749) @@ -33,6 +33,7 @@ import fr.ifremer.adagio.core.dao.data.measure.Measurement; import fr.ifremer.adagio.core.dao.data.measure.QuantificationMeasurement; import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; +import fr.ifremer.adagio.core.dao.referential.QualityFlag; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; @@ -200,6 +201,9 @@ target.setChildBatchs(targetChilds); } + QualityFlag qualityFlag = source.getQualityFlag(); + target.setSpeciesToConfirm(qualityFlag != null && enumeration.QUALITY_FLAG_CODE_DOUBTFUL.equals(qualityFlag.getCode())); + return target; }

1 0

r748 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 08 Apr '13

08 Apr '13

Author: tchemit Date: 2013-04-08 12:06:53 +0200 (Mon, 08 Apr 2013) New Revision: 748 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/748 Log: fixes #2235: [ESPECE] suppression d'un lot fils puis tentative de suppression du p?\195?\168re : erreur Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-08 10:00:00 UTC (rev 747) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-08 10:06:53 UTC (rev 748) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.batch.BatchPersistenceHelper; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -202,7 +203,47 @@ @Override public void deleteSpeciesSubBatch(String id) { Preconditions.checkNotNull(id); - deleteSpeciesBatch(id); + + getCurrentSession().setFlushMode(FlushMode.COMMIT); + + Integer speciesBatchId = Integer.valueOf(id); + + // get catch batch + Integer catchBatchId = catchBatchDao.getIdBySortingBatchId(speciesBatchId); + + Preconditions.checkNotNull( + catchBatchId, + "Could not find catchBatch for speciesBatch: " + speciesBatchId); + + CatchBatch catchBatch = + catchBatchDao.loadFullTree(catchBatchId); + + // get species batch + SortingBatch sortingBatch = catchBatchDao.getSortingBatchById( + catchBatch, speciesBatchId); + + // get his children + Collection<Batch> childBatchs = sortingBatch.getChildBatchs(); + + if (CollectionUtils.isNotEmpty(childBatchs)) { + + for (Batch childBatch : childBatchs) { + + // delete this child and all his children + Integer childBatchId = childBatch.getId(); + + if (log.isInfoEnabled()) { + log.info("Delete child [" + childBatchId + "] of species batch: " + id); + } + catchBatchDao.removeWithChildren(childBatchId); + + // delete his attachment (if any) + attachmentPersistenceService.deleteAllAttachment(childBatchId); + } + } + + + getCurrentSession().flush(); } @Override

1 0

Jenkins build is back to normal : tutti » Tutti :: Service #613
by admin+hudson＠codelutin.com 08 Apr '13

08 Apr '13

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

1 0

Jenkins build is back to normal : tutti » Tutti #613
by admin+hudson＠codelutin.com 08 Apr '13

08 Apr '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer$tutti/613/>

1 0

Jenkins build is back to normal : tutti » Tutti :: Persistence #613
by admin+hudson＠codelutin.com 08 Apr '13

08 Apr '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/6…>

1 0