Author: tchemit Date: 2013-04-04 13:02:34 +0200 (Thu, 04 Apr 2013) New Revision: 732 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/732 Log: refs #1865: [MACRODECHET] - Gestion de la saisie des Macrod?\195?\169chets Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-04 11:00:48 UTC (rev 731) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-04 11:02:34 UTC (rev 732) @@ -207,7 +207,7 @@ // Should have 2 quantification measurements - for (QuantificationMeasurement measurement : source.getQuantificationMeasurements()) { + for (SortingMeasurement measurement : source.getSortingMeasurements()) { Integer pmfmId = measurement.getPmfm().getId(); if (marineLitterCategory.equals(pmfmId)) { QualitativeValue qualitativeValue = measurement.getQualitativeValue(); @@ -266,7 +266,6 @@ // Force subgroup count to '1', as Allegro target.setSubgroupCount(1f); - //FIXME-TC Do we really need this ? // Weight if (source.getWeight() == null) { // Nothing to do : will be removed later, using notChangedSortingMeasurements @@ -284,26 +283,26 @@ if (source.getMarineLitterCategory() == null) { // Nothing to do : will be removed later, using notChangedQuantificationMeasurements } else { - QuantificationMeasurement quantificationMeasurement = catchBatchDao.getQuantificationMeasurement( + SortingMeasurement measurement = catchBatchDao.getSortingMeasurement( target, marineLitterCategory, recorderDepartmentId, true); - quantificationMeasurement.setQualitativeValue(load(QualitativeValueImpl.class, source.getMarineLitterCategory().getIdAsInt())); - notChangedQuantificationMeasurements.remove(quantificationMeasurement); + measurement.setQualitativeValue(load(QualitativeValueImpl.class, source.getMarineLitterCategory().getIdAsInt())); + notChangedSortingMeasurements.remove(measurement); } // MarineLitterSizeCategory if (source.getMarineLitterSizeCategory() == null) { // Nothing to do : will be removed later, using notChangedQuantificationMeasurements } else { - QuantificationMeasurement quantificationMeasurement = catchBatchDao.getQuantificationMeasurement( + SortingMeasurement measurement = catchBatchDao.getSortingMeasurement( target, marineLitterSizeCategory, recorderDepartmentId, true); - quantificationMeasurement.setQualitativeValue(load(QualitativeValueImpl.class, source.getMarineLitterSizeCategory().getIdAsInt())); - notChangedQuantificationMeasurements.remove(quantificationMeasurement); + measurement.setQualitativeValue(load(QualitativeValueImpl.class, source.getMarineLitterSizeCategory().getIdAsInt())); + notChangedSortingMeasurements.remove(measurement); } // Sampling Ratio @@ -313,9 +312,6 @@ // Individual count target.setIndividualCount(source.getNumber()); - // Weight - target.setWeight(source.getWeight()); - // QualityFlag QualityFlagImpl qualityFlag = load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED); target.setQualityFlag(qualityFlag);