This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 781a7549635405d50da9a913cc207d59c3db6041 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 1 19:29:57 2015 +0100 utilisation d'un entier pour la distance d'un trait --- .../FishingOperationPersistenceServiceImpl.java | 4 ++-- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 57983 -> 57987 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57983 -> 0 bytes .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 22 +++++++++++++++++++++ .../export/generic/OperationExportModel.java | 2 +- .../service/export/generic/OperationExportRow.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 4 ++-- .../operation/EditFishingOperationUIModel.java | 6 +++--- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java index 0242677..b5ed378 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java @@ -654,7 +654,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Trawl distance if (PmfmId.TRAWL_DISTANCE.getValue().equals(pmfmId)) { - result.setTrawlDistance(numericalValue); + result.setTrawlDistance(numericalValue==null?null:numericalValue.intValue()); } // Rectilinear operation ? @@ -942,7 +942,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Trawl distance if (source.getTrawlDistance() != null) { - VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.TRAWL_DISTANCE.getValue(), source.getTrawlDistance(), null, null); + VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.TRAWL_DISTANCE.getValue(), source.getTrawlDistance().floatValue(), null, null); notChangedVesselUseMeasurements.remove(vum); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java index 27aebc2..954515d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java @@ -397,7 +397,7 @@ public class DatabaseFixtures { fishingOperation.setGearShootingEndLatitude(47.9854f); fishingOperation.setGearShootingEndLongitude(-5.597f); - fishingOperation.setTrawlDistance(100.12345f); + fishingOperation.setTrawlDistance(100); fishingOperation.setFishingOperationRectiligne(true); fishingOperation.setFishingOperationValid(Boolean.TRUE); fishingOperation.setComment("Unit test createFishingOperation() - Part n°2 : All properties set"); diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 86f4fb3..ea0d4d8 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ b/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ deleted file mode 100644 index 69721e7..0000000 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo~ and /dev/null differ diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java index 672cd55..d36a45b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java @@ -124,6 +124,28 @@ public class TuttiCsvUtil extends Common { } }; + public static final ValueParserFormatter<Integer> INTEGER_NULL_TO_9 = + new IntegerParserFormatter(-9, true) { + @Override + public String format(Integer value) { + if (value == null) { + // if value is null then use the default value + value = defaultValue; + } + return super.format(value); + } + + @Override + protected Integer parseNoneEmptyValue(String value) { + Integer aFloat = super.parseNoneEmptyValue(value); + if (defaultValue.equals(aFloat)) { + // if having -9, then value is null + aFloat = null; + } + return aFloat; + } + }; + public static final ValueFormatter<String> COMMENT_FORMATTER = new ValueFormatter<String>() { @Override public String format(String value) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java index 8d16afe..74d5e2c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java @@ -65,7 +65,7 @@ public class OperationExportModel extends TuttiCsvUtil.AbstractTuttiExportModel< newColumnForExport("Localite", FishingOperation.PROPERTY_LOCATION, TuttiLocation.PROPERTY_NAME, "NA"); newColumnForExport("Validite_OP", FishingOperation.PROPERTY_FISHING_OPERATION_VALID, TuttiCsvUtil.BOOLEAN); newColumnForExport("Rectiligne", FishingOperation.PROPERTY_FISHING_OPERATION_RECTILIGNE, TuttiCsvUtil.BOOLEAN); - newColumnForExport("Distance", FishingOperation.PROPERTY_TRAWL_DISTANCE, TuttiCsvUtil.FLOAT_NULL_TO_9); + newColumnForExport("Distance", FishingOperation.PROPERTY_TRAWL_DISTANCE, TuttiCsvUtil.INTEGER_NULL_TO_9); newColumnForExport("Saisisseur", FishingOperation.PROPERTY_RECORDER_PERSON, TuttiCsvUtil.LIST_PERSON_FORMATTER); newColumnForExport("Navire_Associe", FishingOperation.PROPERTY_SECONDARY_VESSEL, TuttiCsvUtil.newListVesselFormatter(vesselDecorator)); newColumnForExport("Commentaire", FishingOperation.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java index 161c97c..8396cc6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java @@ -222,7 +222,7 @@ public class OperationExportRow implements Serializable { return fishingOperation.isFishingOperationRectiligne(); } - public Float getTrawlDistance() { + public Integer getTrawlDistance() { return fishingOperation.getTrawlDistance(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index 3a2ec3c..244460b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -745,10 +745,10 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa return result; } - public String getTrawlDistanceTooltipText(Float trawlDistance) { + public String getTrawlDistanceTooltipText(Integer trawlDistance) { String result = trawlDistance == null ? null : - t("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", Distances.getDistanceInMilles(trawlDistance)); + t("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", Distances.getDistanceInMilles(Float.valueOf(trawlDistance))); return result; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java index b0911d2..79ceb1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java @@ -934,7 +934,7 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin getGearShootingStartLongitude(), getGearShootingEndLatitude(), getGearShootingEndLongitude()); - setTrawlDistance(distance.floatValue()); + setTrawlDistance(distance); } } @@ -1170,12 +1170,12 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin } @Override - public Float getTrawlDistance() { + public Integer getTrawlDistance() { return editObject.getTrawlDistance(); } @Override - public void setTrawlDistance(Float trawlDistance) { + public void setTrawlDistance(Integer trawlDistance) { Object oldValue = getTrawlDistance(); editObject.setTrawlDistance(trawlDistance); firePropertyChange(PROPERTY_TRAWL_DISTANCE, oldValue, trawlDistance); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.