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

r1009 - trunk
by tchemit＠users.forge.codelutin.com May 26, 2013

May 26, 2013

Author: tchemit Date: 2013-05-26 08:57:31 +0200 (Sun, 26 May 2013) New Revision: 1009 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1009 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-24 15:24:15 UTC (rev 1008) +++ trunk/pom.xml 2013-05-26 06:57:31 UTC (rev 1009) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11-SNAPSHOT</version> + <version>3.4.11</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1008 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos benthos/split species species/split
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 17:24:15 +0200 (Fri, 24 May 2013) New Revision: 1008 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1008 Log: debug sampling categories Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,8 +122,6 @@ public static final String PROPERTY_BATCH_ROOT = "batchRoot"; - public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; - /** * Species. * @@ -167,16 +165,6 @@ protected SampleCategory<Float> ageCategory; /** - * Sample category of this batch. - * <p/> - * This is one of the sample category befined above, used to know if the - * table row which sample category affects this row exactly. - * - * @since 0.3 - */ - private SampleCategory<?> sampleCategory; - - /** * Is the species need to be confirmed?. * * @since 0.2 @@ -277,17 +265,27 @@ //-- Sample category --// //------------------------------------------------------------------------// - public SampleCategory<?> getSampleCategory() { - return sampleCategory; + public void setSampleCategory(SampleCategory sampleCategory) { + switch (sampleCategory.getCategoryType()) { + case sortedUnsorted: + setSortedUnsortedCategory(sampleCategory); + break; + case size: + setSizeCategory(sampleCategory); + break; + case sex: + setSexCategory(sampleCategory); + break; + case maturity: + setMaturityCategory(sampleCategory); + break; + case age: + setAgeCategory(sampleCategory); + } } - public void setSampleCategory(SampleCategory<?> sampleCategory) { - Object oldValue = getSampleCategory(); - this.sampleCategory = sampleCategory; - firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); - } - public SampleCategory<?> getSampleCategory(SampleCategoryEnum sampleCategoryEnum) { + SampleCategory sampleCategory = null; switch (sampleCategoryEnum) { case sortedUnsorted: sampleCategory = getSortedUnsortedCategory(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -112,7 +112,6 @@ LogFactory.getLog(BenthosBatchUIHandler.class); public static final Set<String> SAMPLING_PROPERTIES = Sets.newHashSet( - BenthosBatchRowModel.PROPERTY_SAMPLE_CATEGORY, BenthosBatchRowModel.PROPERTY_SPECIES, BenthosBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, BenthosBatchRowModel.PROPERTY_SIZE_CATEGORY, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -263,7 +263,7 @@ if (batch != null) { //TODO Use the samplingOrder (+ the one from the table model) - SampleCategory<?> lastCategory = batch.getSampleCategory(); + SampleCategory<?> lastCategory = batch.getFinestCategory(); Preconditions.checkNotNull( lastCategory, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,7 +122,7 @@ } public Float getBatchWeight() { - return batch == null ? null : batch.getSampleCategory().getCategoryWeight(); + return batch == null ? null : batch.getFinestCategory().getCategoryWeight(); } public Float getSampleWeight() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -112,8 +112,6 @@ public static final String PROPERTY_BATCH_ROOT = "batchRoot"; - public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; - /** * Delegate edit object. * @@ -157,16 +155,6 @@ protected SampleCategory<Float> ageCategory; /** - * Sample category of this batch. - * <p/> - * This is one of the sample category defined above, used to know if the - * table row which sample category affects this row exactly. - * - * @since 0.3 - */ - private SampleCategory<?> sampleCategory; - - /** * Observed weight. * * @since 0.2 @@ -446,17 +434,27 @@ //-- Sample category --// //------------------------------------------------------------------------// - public SampleCategory<?> getSampleCategory() { - return sampleCategory; + public void setSampleCategory(SampleCategory sampleCategory) { + switch (sampleCategory.getCategoryType()) { + case sortedUnsorted: + setSortedUnsortedCategory(sampleCategory); + break; + case size: + setSizeCategory(sampleCategory); + break; + case sex: + setSexCategory(sampleCategory); + break; + case maturity: + setMaturityCategory(sampleCategory); + break; + case age: + setAgeCategory(sampleCategory); + } } - public void setSampleCategory(SampleCategory<?> sampleCategory) { - Object oldValue = getSampleCategory(); - this.sampleCategory = sampleCategory; - firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); - } - public SampleCategory<?> getSampleCategory(SampleCategoryEnum sampleCategoryEnum) { + SampleCategory<?> sampleCategory = null; switch (sampleCategoryEnum) { case sortedUnsorted: sampleCategory = getSortedUnsortedCategory(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -110,7 +110,6 @@ LogFactory.getLog(SpeciesBatchUIHandler.class); public static final Set<String> SAMPLING_PROPERTIES = Sets.newHashSet( - SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY, SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_SIZE_CATEGORY, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -262,7 +262,7 @@ if (batch != null) { //TODO Use the samplingOrder (+ the one from the table model) - SampleCategory<?> lastCategory = batch.getSampleCategory(); + SampleCategory<?> lastCategory = batch.getFinestCategory(); Preconditions.checkNotNull( lastCategory, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,7 +122,7 @@ } public Float getBatchWeight() { - return batch == null ? null : batch.getSampleCategory().getCategoryWeight(); + return batch == null ? null : batch.getFinestCategory().getCategoryWeight(); } public Float getSampleWeight() {

1 0

r1007 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 17:06:36 +0200 (Fri, 24 May 2013) New Revision: 1007 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1007 Log: fixes #2477 [MENSURATIONS] Perte des lots saisis + erreur ?\195?\169l?\195?\169vation Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:05:48 UTC (rev 1006) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) @@ -874,7 +874,7 @@ Preconditions.checkNotNull(fishingOperation); Preconditions.checkNotNull(row.getSpecies()); - SampleCategory<?> sampleCategory = row.getSampleCategory(); + SampleCategory<?> sampleCategory = row.getFinestCategory(); Preconditions.checkNotNull(sampleCategory); Preconditions.checkNotNull(sampleCategory.getCategoryType()); Preconditions.checkNotNull(sampleCategory.getCategoryValue());

1 0

r1006 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 17:05:48 +0200 (Fri, 24 May 2013) New Revision: 1006 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1006 Log: fixes #2477 [MENSURATIONS] Perte des lots saisis + erreur ?\195?\169l?\195?\169vation Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-24 13:20:36 UTC (rev 1005) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-24 15:05:48 UTC (rev 1006) @@ -880,7 +880,7 @@ Preconditions.checkNotNull(fishingOperation); Preconditions.checkNotNull(row.getSpecies()); - SampleCategory<?> sampleCategory = row.getSampleCategory(); + SampleCategory<?> sampleCategory = row.getFinestCategory(); Preconditions.checkNotNull(sampleCategory); Preconditions.checkNotNull(sampleCategory.getCategoryType()); Preconditions.checkNotNull(sampleCategory.getCategoryValue());

1 0

r1005 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home resources/i18n
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 15:20:36 +0200 (Fri, 24 May 2013) New Revision: 1005 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1005 Log: fixes #2453 [RAPPORT] erreur ?\195?\160 la g?\195?\169n?\195?\169ration du rapport pour le mail Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.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/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-05-24 12:54:22 UTC (rev 1004) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-05-24 13:20:36 UTC (rev 1005) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.catches.ExportCatchesReportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -33,6 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.io.File; import static org.nuiton.i18n.I18n._; @@ -104,9 +106,18 @@ getContext().getGeneratePDFService(); service.generatePDFFile(file, cruise.getId(), getConfig().getI18nLocale()); - TuttiUIUtil.mail(_("tutti.sendCruiseReport.mail.subject", cruise.getName()), - _("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath())); + try { + throw new TuttiTechnicalException(); +// TuttiUIUtil.mail(_("tutti.sendCruiseReport.mail.subject", cruise.getName()), +// _("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath())); + } catch (TuttiTechnicalException e) { + JOptionPane.showMessageDialog(getContext().getMainUI(), + _("tutti.sendCruiseReport.action.error.mail.message", file), + _("tutti.sendCruiseReport.action.error.mail.title"), + JOptionPane.WARNING_MESSAGE); + } + } @Override 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-05-24 12:54:22 UTC (rev 1004) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-24 13:20:36 UTC (rev 1005) @@ -1256,6 +1256,8 @@ tutti.selectSpecies.action.validate.tip= tutti.selectSpecies.title= tutti.sendCruiseReport.action.chooseFile= +tutti.sendCruiseReport.action.error.mail.message= +tutti.sendCruiseReport.action.error.mail.title= tutti.sendCruiseReport.action.success= tutti.sendCruiseReport.mail.body= tutti.sendCruiseReport.mail.subject= 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-05-24 12:54:22 UTC (rev 1004) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-24 13:20:36 UTC (rev 1005) @@ -1211,6 +1211,8 @@ tutti.selectSpecies.action.validate.tip=Valider la sélection de l'espèce tutti.selectSpecies.title=Choisissez une espèce tutti.sendCruiseReport.action.chooseFile=Choisir le fichier de rapport +tutti.sendCruiseReport.action.error.mail.message=<html>Le client email n'a pas pu être ouvert.<hr/>Vous pouvez ouvrir manuellement votre client email et ajouter le fichier<br/><em>%s</em><br/>en pièce-jointe.</html> +tutti.sendCruiseReport.action.error.mail.title=Impossible d'ouvrir le client d'email tutti.sendCruiseReport.action.success=Les captures ont correctement été exporté dans le fichier %s tutti.sendCruiseReport.mail.body=Bonjour,\n\nVeuillez trouver ci-joint le rapport des captures de la campagne %1s.\n*Pensez à joindre le fichier %2s*\n\nCordialement,\n\n*Votre nom* tutti.sendCruiseReport.mail.subject=Captures de la campagne %s

1 0

r1004 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/m
by tchemit＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: tchemit Date: 2013-05-24 14:54:22 +0200 (Fri, 24 May 2013) New Revision: 1004 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1004 Log: reformat + add missing svn properties + license header Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 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/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.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/ValidateSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.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/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -436,6 +436,8 @@ //-- FishingOperation methods --// //------------------------------------------------------------------------// + int getFishingOperationCount(String cruiseId); + List<FishingOperation> getAllFishingOperation(String cruiseId); FishingOperation getFishingOperation(String id); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -568,6 +568,11 @@ //------------------------------------------------------------------------// @Override + public int getFishingOperationCount(String cruiseId) { + return fishingOperationService.getFishingOperationCount(cruiseId); + } + + @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { return fishingOperationService.getAllFishingOperation(cruiseId); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -377,6 +377,11 @@ } @Override + public int getFishingOperationCount(String cruiseId) { + throw notImplemented(); + } + + @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { throw notImplemented(); } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -32,7 +32,11 @@ import com.google.common.io.Files; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; -import fr.ifremer.tutti.persistence.entities.data.*; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -98,8 +102,9 @@ /** * Is the species batch respecting the protocol recommendations? - * @param protocol the current protocol - * @param batch the batch to check (it should be a leaf) + * + * @param protocol the current protocol + * @param batch the batch to check (it should be a leaf) * @param frequencies the frequencies of the batch * @return true if the batch respects the protocol, false otherwise */ @@ -122,9 +127,9 @@ browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() - || CollectionUtils.isNotEmpty(frequencies) - || batch.getNumber() != null); + (!speciesProtocol.isCountIfNoFrequencyEnabled() + || CollectionUtils.isNotEmpty(frequencies) + || batch.getNumber() != null); } } return result; @@ -132,8 +137,9 @@ /** * Is the benthos batch respecting the protocol recommendations? - * @param protocol the current protocol - * @param batch the batch to check (it should be a leaf) + * + * @param protocol the current protocol + * @param batch the batch to check (it should be a leaf) * @param frequencies the frequencies of the batch * @return true if the batch respects the protocol, false otherwise */ @@ -157,9 +163,9 @@ browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() - || CollectionUtils.isNotEmpty(frequencies) - || batch.getNumber() != null); + (!speciesProtocol.isCountIfNoFrequencyEnabled() + || CollectionUtils.isNotEmpty(frequencies) + || batch.getNumber() != null); } } return result; @@ -167,6 +173,7 @@ /** * Retrieve the speciesprotocol corresponding to the species of the batch + * * @param species * @param speciesProtocols * @return @@ -183,6 +190,7 @@ /** * Gets the mandatory categories accroding to the protocol + * * @param speciesProtocol * @return */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -38,7 +38,12 @@ import java.io.Serializable; import java.sql.Timestamp; -import java.util.*; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.List; /** * TODO @@ -148,7 +153,7 @@ Object paramValue = params[3 * i + 2]; if (paramValue != null && Collection.class.isAssignableFrom(paramValue.getClass())) { - query.setParameterList(paramName, (Collection)paramValue, paramType); + query.setParameterList(paramName, (Collection) paramValue, paramType); } else { query.setParameter(paramName, paramValue, paramType); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -174,7 +174,7 @@ if (log.isDebugEnabled()) { log.debug("Created attachment: " + attachment.getId() + - ", path: " + filePath); + ", path: " + filePath); } // update measurementFile with correct path Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -25,7 +25,6 @@ */ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; -import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.referential.Gear; import org.springframework.transaction.annotation.Transactional; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -60,12 +60,10 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.TuttiBusinessException; -import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -78,8 +76,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; -import org.hibernate.type.ListType; -import org.hibernate.type.ObjectType; import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; @@ -441,15 +437,15 @@ if (fishingTrip.getGearPhysicalFeatures() != null && notChangedGearPhysicalFeatures.size() > 0) { List<Integer> gearIds = Lists.transform(Lists.newArrayList(notChangedGearPhysicalFeatures), new Function<GearPhysicalFeatures, Integer>() { - @Override - public Integer apply(GearPhysicalFeatures input) { - Integer result = null; - if (input != null && input.getGear() != null) { - result = input.getGear().getId(); - } - return result; - } - }); + @Override + public Integer apply(GearPhysicalFeatures input) { + Integer result = null; + if (input != null && input.getGear() != null) { + result = input.getGear().getId(); + } + return result; + } + }); Iterator<Object[]> list = queryList( "allFishingOperationsWithGear", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(target.getId()), Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -40,6 +40,8 @@ @Transactional(readOnly = true) public interface FishingOperationPersistenceService extends TuttiPersistenceServiceImplementor { + int getFishingOperationCount(String cruiseId); + List<FishingOperation> getAllFishingOperation(String cruiseId); FishingOperation getFishingOperation(String id); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -156,6 +156,23 @@ protected static Float DEFAULT_EMPTY_LONGITUDE = 0.0001f; @Override + public int getFishingOperationCount(String cruiseId) { + Preconditions.checkNotNull(cruiseId); + Iterator<Object[]> list = queryList( + "allFishingOperations", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), + "pmfmIdStationNumber", IntegerType.INSTANCE, enumeration.PMFM_ID_STATION_NUMBER, + "pmfmIdMultirigAggregation", IntegerType.INSTANCE, enumeration.PMFM_ID_MULTIRIG_AGGREGATION + ); + int result = 0; + while (list.hasNext()) { + list.next(); + result++; + } + return result; + } + + @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { Preconditions.checkNotNull(cruiseId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -185,7 +185,7 @@ if (log.isDebugEnabled()) { log.debug("Will delete individual observation batch: " + - batchId); + batchId); } samplePersistenceHelper.deleteSample(batchId); } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -111,9 +111,9 @@ if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch Hors Vrac > MarineLetter > " + - target.getMarineLitterCategory().getName() + " / " + - target.getMarineLitterSizeCategory().getName() + ": " + - target.getId()); + target.getMarineLitterCategory().getName() + " / " + + target.getMarineLitterSizeCategory().getName() + ": " + + target.getId()); } } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -282,9 +282,9 @@ List<Caracteristic> allEnvironmentCaracteristics = referentialService.getAllCaracteristic(); CaracteristicMap environmentCaracteristics = new CaracteristicMap(); CaracteristicMap environmentValuesOneEntry = new CaracteristicMap(); - int count=0; + int count = 0; for (Caracteristic caracteristic : allEnvironmentCaracteristics) { - if (count==3) { + if (count == 3) { break; } Serializable value = null; @@ -312,9 +312,9 @@ List<Caracteristic> allGearShootingCaracteristics = referentialService.getAllCaracteristic(); CaracteristicMap gearShootingCaracteristics = new CaracteristicMap(); CaracteristicMap gearShootingCaracteristicsOneEntry = new CaracteristicMap(); - count=0; + count = 0; for (Caracteristic caracteristic : allGearShootingCaracteristics) { - if (count==3) { + if (count == 3) { break; } Serializable value = null; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -648,7 +648,13 @@ //-- FishingOperation methods --// //------------------------------------------------------------------------// + @Override + public int getFishingOperationCount(String cruiseId) { + return driver.getFishingOperationCount(cruiseId); + } + + @Override public List<FishingOperation> getAllFishingOperation(String cruiseId) { return driver.getAllFishingOperation(cruiseId); } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,10 +24,8 @@ * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -3,8 +3,8 @@ /* * #%L * Tutti :: Service - * $Id: IndividualObservationExportModel.java 897 2013-04-30 14:28:59Z tchemit $ - * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/tutti-service/src/main/java/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer * %% @@ -33,7 +33,6 @@ import fr.ifremer.tutti.service.TuttiCsvUtil; import org.nuiton.util.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; import java.util.Map; @@ -58,15 +57,15 @@ ValueFormatter<CaracteristicQualitativeValue> cqvFormatter = new ValueFormatter<CaracteristicQualitativeValue>() { - @Override - public String format(CaracteristicQualitativeValue value) { - String result = ""; - if (value != null) { - result = value.getId(); - } - return result; - } - }; + @Override + public String format(CaracteristicQualitativeValue value) { + String result = ""; + if (value != null) { + result = value.getId(); + } + return result; + } + }; newColumnForImportExport(AccidentalCatchRow.BATCH_ID); Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,7 +1,28 @@ package fr.ifremer.tutti.service.catches.multipost; -import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; -import fr.ifremer.tutti.persistence.entities.data.Attachment; +/* + * #%L + * Tutti :: Service + * $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 java.io.File; import java.io.Serializable; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.service.TuttiCsvUtil; import org.nuiton.util.csv.ValueFormatter; import org.nuiton.util.csv.ValueParser; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import java.io.Serializable; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $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 com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -28,12 +28,9 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; import org.nuiton.util.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; import java.util.Map; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,17 +24,9 @@ * #L% */ -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.data.*; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.export.ExportSampleCategory; import java.io.Serializable; -import java.util.Date; -import java.util.Map; /** * A row in a catch export. Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -26,12 +26,9 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.*; -import fr.ifremer.tutti.persistence.entities.referential.*; -import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; -import fr.ifremer.tutti.service.export.ExportSampleCategory; -import org.apache.commons.collections.CollectionUtils; import org.nuiton.util.csv.ValueFormatter; import java.io.Serializable; @@ -123,18 +120,18 @@ TuttiCsvUtil.STRING); newColumnForImportExport(CatchRow.CATEGORY_WEIGHT, - TuttiCsvUtil.FLOAT); + TuttiCsvUtil.FLOAT); newColumnForImportExport(CatchRow.WEIGHT, - TuttiCsvUtil.FLOAT); + TuttiCsvUtil.FLOAT); newColumnForImportExport(CatchRow.NUMBER, - TuttiCsvUtil.INTEGER); + TuttiCsvUtil.INTEGER); newColumnForImportExport(CatchRow.COMMENT); newColumnForImportExport(CatchRow.TO_CONFIRM, - TuttiCsvUtil.PRIMITIVE_BOOLEAN); + TuttiCsvUtil.PRIMITIVE_BOOLEAN); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,16 +1,33 @@ package fr.ifremer.tutti.service.catches.multipost; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; -import fr.ifremer.tutti.persistence.entities.data.Program; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; -import java.util.Date; /** * @author kmorin <morin(a)codelutin.com> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -26,23 +26,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; -import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; import org.nuiton.util.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; import java.util.Map; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,15 +1,32 @@ package fr.ifremer.tutti.service.catches.multipost; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.Program; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; -import java.util.Date; /** * @author kmorin <morin(a)codelutin.com> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,18 +1,36 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $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 com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.*; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; import org.nuiton.util.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; import java.util.Map; @@ -45,15 +63,15 @@ ValueFormatter<CaracteristicQualitativeValue> caracteristicQualitativeValueFormatter = new ValueFormatter<CaracteristicQualitativeValue>() { - @Override - public String format(CaracteristicQualitativeValue value) { - String result = ""; - if (value != null) { - result = value.getId(); - } - return result; - } - }; + @Override + public String format(CaracteristicQualitativeValue value) { + String result = ""; + if (value != null) { + result = value.getId(); + } + return result; + } + }; newColumnForImportExport(MarineLitterRow.BATCH_ID); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -36,12 +36,26 @@ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.*; +import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; +import fr.ifremer.tutti.persistence.entities.data.Attachment; +import fr.ifremer.tutti.persistence.entities.data.BatchContainer; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; +import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.*; +import fr.ifremer.tutti.service.AbstractTuttiService; +import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiDataContext; +import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -52,7 +66,13 @@ import org.nuiton.util.csv.Export; import org.nuiton.util.csv.Import; -import java.io.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Reader; +import java.io.Serializable; +import java.io.Writer; import java.util.Collection; import java.util.List; import java.util.Map; @@ -123,7 +143,7 @@ /** * Export species batches. * - * @param file the file to export the batches into + * @param file the file to export the batches into * @param operation the operation to export */ public void exportSpecies(File file, FishingOperation operation) { @@ -145,7 +165,7 @@ /** * Export benthos batches. * - * @param file the file to export the batches into + * @param file the file to export the batches into * @param operation the operation to export */ public void exportBenthos(File file, FishingOperation operation) { @@ -166,7 +186,7 @@ /** * Export marine litter batches. * - * @param file the file to export the batches into + * @param file the file to export the batches into * @param operation the operation to export */ public void exportMarineLitter(File file, FishingOperation operation) { @@ -229,7 +249,7 @@ /** * Export individual observation batches. * - * @param file the file to export the batches into + * @param file the file to export the batches into * @param operation the operation to export */ public void exportIndividualObservation(File file, FishingOperation operation) { @@ -317,7 +337,7 @@ /** * Export accidental catch batches. * - * @param file the file to export the batches into + * @param file the file to export the batches into * @param operation the operation to export */ public void exportAccidentalCatch(File file, FishingOperation operation) { @@ -405,7 +425,7 @@ /** * Import species batches from a satellite post * - * @param file the file to import the batches from + * @param file the file to import the batches from * @param operation the operation in which to add the batches * @return the list of the species which have not been imported, because there were concurrent batches */ @@ -492,8 +512,8 @@ if (batchesToBrowse != null) { for (SpeciesBatch sb : batchesToBrowse) { if (sb.getSpecies().equals(species) - && (!sb.getSampleCategoryType().equals(batch.getSampleCategoryType()) - || sb.getSampleCategoryValue().equals(value))) { + && (!sb.getSampleCategoryType().equals(batch.getSampleCategoryType()) + || sb.getSampleCategoryValue().equals(value))) { existingBatch = sb; batches.put(row.getId(), sb); @@ -567,7 +587,7 @@ /** * Import benthos batches from a satellite post * - * @param file the file to import the batches from + * @param file the file to import the batches from * @param operation the operation in which to add the batches * @return the list of the benthos which have not been imported, because there were concurrent batches */ @@ -654,7 +674,7 @@ if (batchesToBrowse != null) { for (BenthosBatch bb : batchesToBrowse) { if (bb.getSpecies().equals(species) - && (!bb.getSampleCategoryType().equals(batch.getSampleCategoryType()) + && (!bb.getSampleCategoryType().equals(batch.getSampleCategoryType()) || bb.getSampleCategoryValue().equals(value))) { existingBatch = bb; @@ -729,7 +749,7 @@ /** * Import marine litter batches from a satellite post * - * @param file the file to import the batches from + * @param file the file to import the batches from * @param operation the operation in which to add the batches * @return the list of the marine litter which have not been imported, because there were concurrent batches */ @@ -795,7 +815,7 @@ if (batchesToBrowse != null) { for (MarineLitterBatch mlb : batchesToBrowse) { if (mlb.getMarineLitterCategory().equals(batch.getMarineLitterCategory()) - && mlb.getMarineLitterSizeCategory().equals(batch.getMarineLitterSizeCategory())) { + && mlb.getMarineLitterSizeCategory().equals(batch.getMarineLitterSizeCategory())) { existingBatch = mlb; batches.put(row.getBatchId(), mlb); @@ -833,7 +853,7 @@ /** * Import individual observation batches from a satellite post * - * @param file the file to import the batches from + * @param file the file to import the batches from * @param operation the operation in which to add the batches */ public void importIndividualObservation(File file, FishingOperation operation) { @@ -945,7 +965,7 @@ /** * Import accidental catches batches from a satellite post * - * @param file the file to import the batches from + * @param file the file to import the batches from * @param operation the operation in which to add the batches */ public void importAccidentalCatches(File file, FishingOperation operation) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -102,9 +102,8 @@ newNullableColumnForExport("Precision_Mesure", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_PRECISION, TuttiCsvUtil.FLOAT); newNullableColumnForExport("Nbr", CatchExportRow.FREQUENCY_NUMBER, TuttiCsvUtil.INTEGER); - //TODO -// newColumnForExport("Poids_Reference", Cruise.PROPERTY_HEAD_OF_SORT_ROOM); -// newColumnForExport("Coef_Final_Elevation", Cruise.PROPERTY_COMMENT); + newColumnForExport("Poids_Reference", CatchExportRow.REFERENCE_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT); + newColumnForExport("Coef_Final_Elevation", CatchExportRow.RAISING_FACTOR, TuttiCsvUtil.PRIMITIVE_FLOAT); } public void prepareRows(PersistenceService persistenceService, @@ -112,7 +111,8 @@ Cruise cruise, FishingOperation operation, BatchContainer<SpeciesBatch> rootSpeciesBatch, - BatchContainer<BenthosBatch> rootBenthosBatch) { + BatchContainer<BenthosBatch> rootBenthosBatch, + Float catchRaisingFactor) { for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { CatchExportRow row = new CatchExportRow(); @@ -120,7 +120,9 @@ row.setFishingOperation(operation); row.setSpecies(speciesBatch.getSpecies()); - prepareRows(persistenceService, row, rows, speciesBatch); + prepareRows(persistenceService, row, rows, + speciesBatch, + catchRaisingFactor); } for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) { CatchExportRow row = new CatchExportRow(); @@ -128,14 +130,17 @@ row.setFishingOperation(operation); row.setSpecies(benthosBatch.getSpecies()); - prepareRows(persistenceService, row, rows, benthosBatch); + prepareRows(persistenceService, row, rows, + benthosBatch, + catchRaisingFactor); } } public void prepareRows(PersistenceService persistenceService, CatchExportRow currentRow, List<CatchExportRow> rows, - SpeciesBatch speciesBatch) { + SpeciesBatch speciesBatch, + Float catchRaisingFactor) { ExportSampleCategory<Serializable> sampleCategory = new ExportSampleCategory<Serializable>(); @@ -162,31 +167,72 @@ List<SpeciesBatchFrequency> speciesBatchFrequency = persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getId()); - if (CollectionUtils.isEmpty(speciesBatchFrequency)) { - // no frequency + if (CollectionUtils.isEmpty(speciesBatchFrequency) || + speciesBatchFrequency.get(0).getWeight()==null) { + + // no frequency or frequencies with no weight // simple denombrement - rows.add(currentRow.copy()); + CatchExportRow row = currentRow.copy(); + + Float batchWeight = speciesBatch.getSampleCategoryWeight(); + + if (batchWeight == null) { + batchWeight = speciesBatch.getSampleCategoryComputedWeight(); + } + + Float referenceWeight = speciesBatch.getWeight(); + + if (referenceWeight == null) { + referenceWeight = batchWeight; + } + + computeRaisingFactor(row, + catchRaisingFactor, + batchWeight, + referenceWeight); + rows.add(row); } else { for (SpeciesBatchFrequency batchFrequency : speciesBatchFrequency) { CatchExportRow row = currentRow.copy(); row.setSpeciesFrequency(batchFrequency); rows.add(row); + + Float batchWeight = speciesBatch.getComputedWeight(); + + Float referenceWeight = batchFrequency.getWeight(); + + computeRaisingFactor(row, + catchRaisingFactor, + batchWeight, + referenceWeight); } } + } else { for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { - prepareRows(persistenceService, currentRow, rows, childBatch); + prepareRows(persistenceService, currentRow, rows, childBatch, catchRaisingFactor); } } } + protected void computeRaisingFactor(CatchExportRow row, + float catchRaisingFactor, + float batchWeight, + float referenceWeight) { + float raisingFactor = catchRaisingFactor * (batchWeight / referenceWeight); + + row.setReferenceWeight(referenceWeight); + row.setRaisingFactor(raisingFactor); + } + public void prepareRows(PersistenceService persistenceService, CatchExportRow currentRow, List<CatchExportRow> rows, - BenthosBatch benthosBatch) { + BenthosBatch benthosBatch, + Float catchRaisingFactor) { ExportSampleCategory<Serializable> sampleCategory = new ExportSampleCategory<Serializable>(); @@ -229,7 +275,7 @@ } else { for (BenthosBatch childBatch : benthosBatch.getChildBatchs()) { - prepareRows(persistenceService, currentRow, rows, childBatch); + prepareRows(persistenceService, currentRow, rows, childBatch, catchRaisingFactor); } } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -69,6 +69,10 @@ public static final String AGE_SAMPLE_CATEGORY = "ageSampleCategory"; + public static final String REFERENCE_WEIGHT = "referenceWeight"; + + public static final String RAISING_FACTOR = "raisingFactor"; + protected Cruise cruise; protected FishingOperation fishingOperation; @@ -83,6 +87,9 @@ protected Species species; + protected float referenceWeight; + protected float raisingFactor; + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -95,6 +102,14 @@ this.speciesCategory = sampleCategory; } + public void setReferenceWeight(float referenceWeight) { + this.referenceWeight = referenceWeight; + } + + public void setRaisingFactor(float raisingFactor) { + this.raisingFactor = raisingFactor; + } + public void addCategory(ExportSampleCategory sampleCategory) { categories.put(sampleCategory.getCategoryType(), sampleCategory); } @@ -175,6 +190,14 @@ this.species = species; } + public float getReferenceWeight() { + return referenceWeight; + } + + public float getRaisingFactor() { + return raisingFactor; + } + public CatchExportRow copy() { CatchExportRow result = new CatchExportRow(); result.setCruise(cruise); @@ -184,6 +207,8 @@ result.setBenthosFrequency(benthosFrequency); result.setSpeciesFrequency(speciesFrequency); result.setSpecies(species); + result.setRaisingFactor(raisingFactor); + result.setReferenceWeight(referenceWeight); return result; } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLitterExportRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -45,7 +45,7 @@ public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; - public static final String PROPERTY_BATCH= "batch"; + public static final String PROPERTY_BATCH = "batch"; private static final long serialVersionUID = 1L; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ParameterExportModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -76,7 +76,7 @@ } } CaracteristicMap vesselUseFeatures = operation.getVesselUseFeatures(); - if (vesselUseFeatures!=null) { + if (vesselUseFeatures != null) { for (Map.Entry<Caracteristic, Serializable> entry : vesselUseFeatures.entrySet()) { Caracteristic caracteristic = entry.getKey(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; @@ -25,8 +49,8 @@ } public void prepareBatchRows(TuttiExportService.ExportContext exportContext, - BatchContainer<SpeciesBatch> rootSpeciesBatch, - BatchContainer<BenthosBatch> rootBenthosBatch) { + BatchContainer<SpeciesBatch> rootSpeciesBatch, + BatchContainer<BenthosBatch> rootBenthosBatch) { for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { @@ -45,7 +69,7 @@ } public void prepareAccidentalRows(TuttiExportService.ExportContext exportContext, - List<AccidentalCatchExportRow> rows) { + List<AccidentalCatchExportRow> rows) { for (AccidentalCatchExportRow row : rows) { exportContext.addSpecies(row.getSpecies()); } Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportRow.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportRow.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Species; import java.io.Serializable; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportRow.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -511,13 +511,28 @@ rootSpeciesBatch, rootBenthosBatch); + Float catchRaisingFactor; + + Float totalWeight = catchBatch.getCatchTotalWeight(); + + if (totalWeight == null) { + totalWeight = catchBatch.getCatchTotalComputedWeight(); + } + + Float totalSortedWeight = catchBatch.getCatchTotalSortedComputedWeight(); + + Float totalUnsortedWeight = catchBatch.getCatchTotalUnsortedComputedWeight(); + + catchRaisingFactor = totalWeight / (totalSortedWeight + totalUnsortedWeight); + List<CatchExportRow> rows = Lists.newArrayList(); exportContext.catchModel.prepareRows(persistenceService, rows, cruise, operation, rootSpeciesBatch, - rootBenthosBatch); + rootBenthosBatch, + catchRaisingFactor); exportContext.catchExport.write(rows, exportContext.catchWriter); } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -28,9 +28,10 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; -import com.google.common.collect.*; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -52,7 +53,8 @@ import java.io.File; import java.io.IOException; import java.io.Reader; -import java.util.*; +import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -29,8 +29,6 @@ import fr.ifremer.tutti.service.TuttiCsvUtil; import org.nuiton.util.csv.Common; -import java.util.Set; - /** * Model to import / export {@link Vessel} in csv format. * Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -30,7 +30,11 @@ import com.google.common.collect.Maps; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiTechnicalException; -import fr.ifremer.tutti.persistence.entities.data.*; +import fr.ifremer.tutti.persistence.entities.data.BatchContainer; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches; +/* + * #%L + * Tutti :: Service + * $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% + */ + /** * @author kmorin <kmorin(a)codelutin.com> * @since x.x Property changes on: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Thu May 23 15:38:00 CEST 2013 tutti.config.help=config.html Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Thu May 23 15:38:00 CEST 2013 tutti.config.help=config.html Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -104,7 +104,7 @@ result = super.findHelpId(comp); } - if (result==null) { + if (result == null) { result = "tutti.index.help"; } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -347,7 +347,7 @@ } TuttiIOUtil.forceMkdir(i18nDirectory, - _("tutti.i18n.mkDir.error", i18nDirectory)); + _("tutti.i18n.mkDir.error", i18nDirectory)); if (log.isDebugEnabled()) { log.debug("I18N directory: " + i18nDirectory); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -44,7 +44,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.List; import java.util.Locale; import java.util.Set; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -315,7 +314,7 @@ public boolean quitCurrentScreen() { boolean canClose; - if (context.getScreen() == null || currentBody==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/ValidateSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -25,10 +25,8 @@ */ import com.google.common.base.Preconditions; -import com.sun.org.apache.xerces.internal.impl.dv.ValidationContext; import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -78,8 +78,8 @@ EditFishingOperationUIModel model = (EditFishingOperationUIModel) evt.getSource(); if (!model.isLoadingData() - && model.getFishingOperation() != null - && !propertiesToIgnore.contains(evt.getPropertyName())) { + && model.getFishingOperation() != null + && !propertiesToIgnore.contains(evt.getPropertyName())) { if (model.getCoordinateEditorType() != CoordinateEditorType.DD) { model.convertGearShootingCoordinatesDMSToDD(); @@ -124,8 +124,8 @@ EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource(); if (!model.isLoadingData() - && model.getFishingOperation() != null - && !propertiesToIgnore.contains(evt.getPropertyName())) { + && model.getFishingOperation() != null + && !propertiesToIgnore.contains(evt.getPropertyName())) { CatchBatch catchBatch = model.toBean(); NuitonValidatorResult validationResult = validationService.validateCruiseOperation(catchBatch); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-05-24 12:54:22 UTC (rev 1004) @@ -113,7 +113,8 @@ <JLabel id='programLabel'/> </cell> <cell weightx='0.3'> - <BeanFilterableComboBox id='programComboBox' constructorParams='this' + <BeanFilterableComboBox id='programComboBox' + constructorParams='this' genericType='Program'/> </cell> <cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,13 +24,10 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import java.util.List; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.1 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; @@ -37,7 +36,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.0.1 */ -public class ExportCruiseValidationMessagesAction extends AbstractTuttiAction <ValidateCruiseUIModel, ValidateCruiseUI, ValidateCruiseUIHandler> { +public class ExportCruiseValidationMessagesAction extends AbstractTuttiAction<ValidateCruiseUIModel, ValidateCruiseUI, ValidateCruiseUIHandler> { protected File file; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -38,7 +38,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.0.1 */ -public class ExportOperationValidationMessagesAction extends AbstractTuttiAction <ValidateCruiseUIModel, ValidateCruiseUI, ValidateCruiseUIHandler> { +public class ExportOperationValidationMessagesAction extends AbstractTuttiAction<ValidateCruiseUIModel, ValidateCruiseUI, ValidateCruiseUIHandler> { protected File file; @@ -57,7 +57,7 @@ // choose file to export file = TuttiUIUtil.saveFile( _("tutti.validateCruise.action.export.operation.chooseFile.defaultFile", - decorate(getModel().getSelectedFishingOperation(), DecoratorService.FILE_NAME_COMPATIBLE)), + decorate(getModel().getSelectedFishingOperation(), DecoratorService.FILE_NAME_COMPATIBLE)), getContext().getMainUI(), _("tutti.validateCruise.action.export.operation.chooseFile.title"), _("tutti.validateCruise.action.export.operation.chooseFile.label") Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-05-24 12:54:22 UTC (rev 1004) @@ -33,10 +33,10 @@ </import> <GearCaracteristicsEditorUIHandler id='handler' - initializer='getContextValue(GearCaracteristicsEditorUIHandler.class)'/> + initializer='getContextValue(GearCaracteristicsEditorUIHandler.class)'/> <GearCaracteristicsEditorUIModel id='model' - initializer='getContextValue(GearCaracteristicsEditorUIModel.class)'/> + initializer='getContextValue(GearCaracteristicsEditorUIModel.class)'/> <JPopupMenu id='tablePopup'> <JMenuItem id='removeCaracteristicMenu' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -32,8 +32,6 @@ import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapColumnRowModel; -import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueRenderer; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -44,13 +42,11 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.*; +import javax.swing.JComponent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import static fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapCellComponent.CaracteristicMapCellEditor; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.1 @@ -227,9 +223,7 @@ //-- Public methods --// //------------------------------------------------------------------------// - /** - * Adds a row with the parameter selected in the combo box - **/ + /** Adds a row with the parameter selected in the combo box */ public void addRow() { BeanFilterableComboBox<Caracteristic> keyCombo = getKeyCombo(); Caracteristic selectedItem = (Caracteristic) keyCombo.getSelectedItem(); @@ -328,7 +322,7 @@ BeanFilterableComboBox<Caracteristic> keyCombo = getKeyCombo(); keyCombo.setData(caracteristicList); - // selectFirstInCombo(keyCombo); + // selectFirstInCombo(keyCombo); keyCombo.getHandler().reset(); model.setModify(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -53,9 +53,7 @@ protected CaracteristicMap caracteristicMap = new CaracteristicMap(); - /** - * Can user remove a selected caracteristic? - */ + /** Can user remove a selected caracteristic? */ protected boolean removeCaracteristicEnabled; public GearCaracteristicsEditorUIModel() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import javax.swing.*; +import javax.swing.JOptionPane; import static org.nuiton.i18n.I18n._; @@ -64,10 +64,10 @@ _("tutti.editCruise.action.save.vesselChanged.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - htmlMessage, - _("tutti.editCruise.action.save.vesselChanged.title"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.WARNING_MESSAGE); + htmlMessage, + _("tutti.editCruise.action.save.vesselChanged.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); result = answer == JOptionPane.OK_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,25 +24,12 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.CaracteristicMap; -import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; -import fr.ifremer.tutti.persistence.entities.data.Attachment; -import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Person; -import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.validator.NuitonValidatorResult; -import java.util.Collection; -import java.util.Date; -import java.util.List; import java.util.Map; /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.service.catches.ExportCatchesReportService; import fr.ifremer.tutti.service.sumatra.TuttiCatchesSumatraExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -27,9 +27,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.AbstractChangeScreenAction; -import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -36,7 +36,6 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -172,7 +172,7 @@ Object oldValue = getSelectedFishingOperation(); this.selectedFishingOperation = selectedFishingOperation; if ((oldValue != null || selectedFishingOperation != null) - && !isSelectionAdjusting()) { + && !isSelectionAdjusting()) { // only fires when authorize to firePropertyChange(PROPERTY_SELECTED_FISHING_OPERATION, oldValue, selectedFishingOperation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -32,7 +32,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUIModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -3,8 +3,8 @@ /* * #%L * Tutti :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer * %% @@ -27,9 +27,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; -import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -38,8 +35,6 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.2 @@ -92,8 +87,11 @@ } protected abstract String getFileExtension(); + protected abstract String getFileExtensionDescription(); + protected abstract String getFileChooserTitle(); + protected abstract String getFileChooserButton(); @Override Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -25,8 +25,6 @@ */ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationAction; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; @@ -37,18 +35,13 @@ import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.jdesktop.beans.AbstractBean; -import javax.swing.*; -import java.awt.*; import java.io.File; -import java.util.Collection; -import static org.nuiton.i18n.I18n._; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.2 */ -public abstract class AbstractImportMultiPostAction <M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> +public abstract class AbstractImportMultiPostAction<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> extends AbstractTuttiAction<M, UI, H> { protected File file; @@ -92,8 +85,11 @@ } protected abstract String getFileExtension(); + protected abstract String getFileExtensionDescription(); + protected abstract String getFileChooserTitle(); + protected abstract String getFileChooserButton(); @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,8 +1,8 @@ /* * #%L * Tutti :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2013-05-24 12:54:22 UTC (rev 1004) @@ -1,8 +1,8 @@  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; @@ -91,19 +90,19 @@ BenthosFrequencyRowModel result = new BenthosFrequencyRowModel(); result.addPropertyChangeListener(BenthosFrequencyRowModel.PROPERTY_LENGTH_STEP, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Float oldValue = (Float) evt.getOldValue(); - if (oldValue != null) { - rowCache.remove(oldValue); - } - BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); - Float lengthStep = row.getLengthStep(); - if (lengthStep != null) { - rowCache.put(lengthStep, row); - } - } - }); + @Override + public void propertyChange(PropertyChangeEvent evt) { + Float oldValue = (Float) evt.getOldValue(); + if (oldValue != null) { + rowCache.remove(oldValue); + } + BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); + Float lengthStep = row.getLengthStep(); + if (lengthStep != null) { + rowCache.put(lengthStep, row); + } + } + }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); result.setValid(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -123,12 +123,14 @@ /** * Sum of the number of each valid row + * * @since 2.3 */ protected Integer totalNumber; /** * Sum of the weight of each valid row + * * @since 2.3 */ protected Float totalWeight; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -3,8 +3,8 @@ /* * #%L * Tutti :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer * %% @@ -25,9 +25,6 @@ */ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; import static org.nuiton.i18n.I18n._; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -3,8 +3,8 @@ /* * #%L * Tutti :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer * %% @@ -25,17 +25,8 @@ */ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; -import javax.swing.*; -import java.awt.*; -import java.util.Collection; - import static org.nuiton.i18n.I18n._; /** Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.JOptionPane; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -25,9 +25,6 @@ */ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -26,12 +26,11 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; -import javax.swing.*; -import java.awt.*; +import javax.swing.JTextArea; +import java.awt.Dialog; import java.util.Collection; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.JOptionPane; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,16 +24,8 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import java.io.File; - import static org.nuiton.i18n.I18n._; /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -26,25 +26,12 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationAction; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; -import jaxx.runtime.SwingUtil; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; +import javax.swing.JTextArea; +import java.awt.Dialog; import java.util.Collection; -import java.util.List; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -29,13 +29,12 @@ import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.JOptionPane; import java.util.Set; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.JOptionPane; import java.util.Set; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-24 12:54:22 UTC (rev 1004) @@ -110,7 +110,7 @@ genericType='CaracteristicQualitativeValue'/> </cell> </row> - + </Table>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; @@ -90,20 +89,20 @@ } SpeciesFrequencyRowModel result = new SpeciesFrequencyRowModel(); result.addPropertyChangeListener(SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Float oldValue = (Float) evt.getOldValue(); - if (oldValue != null) { - rowCache.remove(oldValue); - } - SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); - Float lengthStep = row.getLengthStep(); - if (lengthStep != null) { - rowCache.put(lengthStep, row); - } - } - }); + new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + Float oldValue = (Float) evt.getOldValue(); + if (oldValue != null) { + rowCache.remove(oldValue); + } + SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); + Float lengthStep = row.getLengthStep(); + if (lengthStep != null) { + rowCache.put(lengthStep, row); + } + } + }); result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic()); result.setLengthStep(defaultStep); result.setValid(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -26,11 +26,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; -import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; -import java.util.List; - /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 @@ -118,12 +115,14 @@ /** * Sum of the number of each valid row + * * @since 2.3 */ protected Integer totalNumber; /** * Sum of the weight of each valid row + * * @since 2.3 */ protected Float totalWeight; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -46,7 +46,6 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import org.nuiton.util.decorator.Decorator; import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; @@ -57,8 +56,6 @@ import java.beans.PropertyChangeListener; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Handler of {@link SplitSpeciesBatchUI}. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -526,7 +526,7 @@ if (log.isDebugEnabled()) { log.debug("entity comboBox list [" + beanType.getName() + "] : " + - (data == null ? 0 : data.size())); + (data == null ? 0 : data.size())); } // add data list to combo box @@ -564,7 +564,7 @@ if (log.isDebugEnabled()) { log.debug("entity list [" + beanType.getName() + "] : " + - (data == null ? 0 : data.size())); + (data == null ? 0 : data.size())); } // add data list to combo box Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -57,11 +57,11 @@ public void showErrorDialog(String message, Throwable cause) { if (cause == null) { - JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+message+"</body></html>", + JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else if (cause instanceof TuttiBusinessException) { - JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+cause.getMessage()+"</body></html>", + JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + cause.getMessage() + "</body></html>", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { @@ -99,9 +99,9 @@ */ public void showWarningDialog(String message) { - JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+message+"</body></html>", - _("tutti.error.ui.business.warning"), - JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", + _("tutti.error.ui.business.warning"), + JOptionPane.WARNING_MESSAGE); } 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -46,7 +46,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListenerProxy; import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; 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-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -288,7 +288,7 @@ boolean checkOverwrite = askOverwriteFile(file); if (checkOverwrite) { TuttiIOUtil.copyFile(attachmentFile, file, - _("tutti.attachmentEditor.saveAttachment.error.message", attachmentFile, file.getName())); + _("tutti.attachmentEditor.saveAttachment.error.message", attachmentFile, file.getName())); context.showInformationMessage( _("tutti.attachmentEditor.saveAttachment.success.message", file.getName())); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -51,7 +51,6 @@ import java.awt.event.MouseEvent; import java.io.Serializable; import java.util.HashSet; -import java.util.List; import java.util.Set; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -24,11 +24,8 @@ * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import java.util.Set; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 2.0 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -22,7 +22,6 @@ * #L% */ -import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -242,9 +241,9 @@ * Edit the batch caracteristics * * @param caracteristicMapColumnRowModel the row to edit - * @param caracteristicMapCellEditor the editor - * @param caracteristicsUsed the set of the caracteristics used in the other rows. - * If no caracteristic is set on this row, add automatically these caracteristics with a null value + * @param caracteristicMapCellEditor the editor + * @param caracteristicsUsed the set of the caracteristics used in the other rows. + * If no caracteristic is set on this row, add automatically these caracteristics with a null value */ public void editBatch(CaracteristicMapColumnRowModel caracteristicMapColumnRowModel, CaracteristicMapCellEditor caracteristicMapCellEditor, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-24 12:54:22 UTC (rev 1004) @@ -176,8 +176,8 @@ if (log.isDebugEnabled()) { log.debug("row [" + rowIndex + "] property " + - propertyName + " changed from " + oldValue + - " to " + newValue); + propertyName + " changed from " + oldValue + + " to " + newValue); } onRowModified(rowIndex, row, propertyName, @@ -193,7 +193,7 @@ R newValue = (R) evt.getNewValue(); if (log.isDebugEnabled()) { log.debug("Monitor row changed from " + - oldValue + " to " + newValue); + oldValue + " to " + newValue); } if (oldValue != null) { oldValue.removePropertyChangeListener(l); @@ -216,7 +216,7 @@ protected void onModelRowsChanged(List<R> rows) { if (log.isDebugEnabled()) { log.debug("Will set " + (rows == null ? 0 : rows.size()) + - " rows on model."); + " rows on model."); } if (CollectionUtils.isNotEmpty(rows)) { @@ -234,7 +234,7 @@ Boolean newValue) { if (log.isDebugEnabled()) { log.debug("row [" + rowIndex + "] modify state changed from " + - oldValue + " to " + newValue); + oldValue + " to " + newValue); } } @@ -245,7 +245,7 @@ if (log.isDebugEnabled()) { log.debug("row [" + rowIndex + "] valid state changed from " + - oldValue + " to " + newValue); + oldValue + " to " + newValue); } if (rowIndex > -1) { @@ -259,7 +259,7 @@ R newRow) { if (log.isDebugEnabled()) { log.debug("Selected row changed from [" + oldRowIndex + "] to [" + - newRowIndex + "]"); + newRowIndex + "]"); } } @@ -435,7 +435,7 @@ previousCellAction.actionPerformed(null); } else if (keyCode == KeyEvent.VK_RIGHT || - keyCode == KeyEvent.VK_TAB) { + keyCode == KeyEvent.VK_TAB) { e.consume(); if (editor != null) { editor.stopCellEditing(); @@ -450,7 +450,7 @@ previousRowAction.actionPerformed(null); } else if (e.getKeyCode() == KeyEvent.VK_ENTER || - keyCode == KeyEvent.VK_DOWN) { + keyCode == KeyEvent.VK_DOWN) { e.consume(); if (editor != null) { editor.stopCellEditing();

1 0

r1003 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 14:48:12 +0200 (Fri, 24 May 2013) New Revision: 1003 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1003 Log: fixes #2504 [CAPTURE] pr?\195?\169ciser sur quel fraction porte le message en pi?\195?\168ce jointe : benthos ou esp?\195?\168ces 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/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.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/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-05-24 12:48:12 UTC (rev 1003) @@ -110,9 +110,12 @@ // du "Poids total Vrac trié", demander confirmation que // le "Poids total VRAC" est bien une valeur observée // sinon la remplacer par le "Poids total Vrac trié" + + getUI().getTabPane().setSelectedIndex(1); + String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species", rate), _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), @@ -135,9 +138,12 @@ // du "Poids total Vrac trié", demander confirmation que // le "Poids total VRAC" est bien une valeur observée // sinon la remplacer par le "Poids total Vrac trié" + + getUI().getTabPane().setSelectedIndex(2); + String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos", rate), _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) @@ -187,7 +187,7 @@ </JPanel> <Table fill='both' constraints='BorderLayout.SOUTH'> <row> - <cell columns='2'> + <cell columns='6'> <JSeparator/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-24 12:48:12 UTC (rev 1003) @@ -187,7 +187,7 @@ </JPanel> <Table fill='both' constraints='BorderLayout.SOUTH'> <row> - <cell columns='2'> + <cell columns='6'> <JSeparator/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-24 12:48:12 UTC (rev 1003) @@ -450,7 +450,11 @@ tableModel.addNewRow(rowIndex, row); } - model.setTotalNumber(model.getTotalNumber() + 1); + Integer totalNumber = model.getTotalNumber(); + if (totalNumber == null) { + totalNumber = 0; + } + model.setTotalNumber(totalNumber + 1); getTable().scrollRowToVisible(rowIndex); } 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-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-24 12:48:12 UTC (rev 1003) @@ -436,6 +436,8 @@ tutti.editCatchBatch.action.computeWeights.mnemonic= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos= +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= tutti.editCatchBatch.action.computeWeights.tip= tutti.editCatchBatch.action.saveCatchBatch= 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-05-24 12:39:52 UTC (rev 1002) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-24 12:48:12 UTC (rev 1003) @@ -422,7 +422,8 @@ tutti.editCatchBatch.action.computeWeights=Élever les poids tutti.editCatchBatch.action.computeWeights.mnemonic=p tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li><strong>Non</strong> pour remplacer la valeur saisie par le poids calculé</li><li><strong>Oui</strong> pour garder la valeur saisie</li></ul>. -tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos=Le Poids total VRAC saisi sur le benthos est supérieur de moins de %s%% au Poids total Vrac trié. +tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species=Le Poids total VRAC saisi sur les espèces est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Élever les poids tutti.editCatchBatch.action.saveCatchBatch=Enregistrer

1 0

r1002 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com May 24, 2013

May 24, 2013

Author: kmorin Date: 2013-05-24 14:39:52 +0200 (Fri, 24 May 2013) New Revision: 1002 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1002 Log: fix bug on ratio computing Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-05-23 17:21:24 UTC (rev 1001) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-05-24 12:39:52 UTC (rev 1002) @@ -153,7 +153,8 @@ } op.put("totalWeight", totalWeight); - Float totalSortedWeight = catchBatch.getCatchTotalSortedComputedWeight(); + Float totalSortedWeight = catchBatch.getCatchTotalSortedComputedWeight() + + catchBatch.getCatchTotalUnsortedComputedWeight(); op.put("totalSortedWeight", totalSortedWeight); // create catches data model

1 0

r1001 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 19:21:24 +0200 (Thu, 23 May 2013) New Revision: 1001 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1001 Log: fixes #2482: [MENSURATIONS] tri du tableau selon les classes de taille Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -149,13 +149,10 @@ public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); - - // open frequency dialog - Preconditions.checkNotNull(editRow, "No editRow found."); - if (log.isInfoEnabled()) { - log.info("Will edit frequencies for row: " + rowIndex); + if (log.isDebugEnabled()) { + log.debug("Will edit frequencies for row: " + rowIndex); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -186,20 +183,20 @@ frequency.add(row); } } - if (log.isInfoEnabled()) { - log.info("Push back " + frequency.size() + - " frequency to batch " + frequencyModel.getBatch()); + if (log.isDebugEnabled()) { + log.debug("Push back " + frequency.size() + + " frequency to batch " + frequencyModel.getBatch()); } // push back to batch editRow.setNumber(null); - } + // set frequencies to the incoming batch editRow.setFrequency(frequency); + // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); - } int r = rowIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -566,6 +566,10 @@ // connect model to validator ui.getValidator().setBean(model); + // always sort row by their length + // see http://forge.codelutin.com/issues/2482 + Collections.sort(editFrequency); + model.setRows(editFrequency); model.setLengthStepCaracteristic(lengthStepCaracteristic); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -35,7 +35,6 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,7 +50,6 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Collections; import java.util.List; /** @@ -151,13 +149,10 @@ public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); - - // open frequency dialog - Preconditions.checkNotNull(editRow, "No editRow found."); - if (log.isInfoEnabled()) { - log.info("Will edit frequencies for row: " + rowIndex); + if (log.isDebugEnabled()) { + log.debug("Will edit frequencies for row: " + rowIndex); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -188,22 +183,20 @@ frequency.add(row); } } - if (log.isInfoEnabled()) { - log.info("Push back " + frequency.size() + - " frequency to batch " + frequencyModel.getBatch()); + if (log.isDebugEnabled()) { + log.debug("Push back " + frequency.size() + + " frequency to batch " + frequencyModel.getBatch()); } // push back to batch editRow.setNumber(null); } - // sort frequency by length - Collections.sort(frequency); - + // set frequencies to the incoming batch editRow.setFrequency(frequency); + // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); - } int r = rowIndex; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 17:02:06 UTC (rev 1000) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 17:21:24 UTC (rev 1001) @@ -567,6 +567,10 @@ // connect model to validator ui.getValidator().setBean(model); + // always sort row by their length + // see http://forge.codelutin.com/issues/2482 + Collections.sort(editFrequency); + model.setRows(editFrequency); model.setLengthStepCaracteristic(lengthStepCaracteristic);

1 0

r1000 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 19:02:06 +0200 (Thu, 23 May 2013) New Revision: 1000 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1000 Log: fixes #2503: [ERGO] etat du bouton ?\195?\169diter Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 16:55:31 UTC (rev 999) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 17:02:06 UTC (rev 1000) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,6 +51,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.Collections; import java.util.List; /** @@ -193,9 +195,11 @@ // push back to batch editRow.setNumber(null); - } + // sort frequency by length + Collections.sort(frequency); + editRow.setFrequency(frequency); // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow);

1 0