Author: tchemit Date: 2013-09-21 16:45:35 +0200 (Sat, 21 Sep 2013) New Revision: 1197 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1197 Log: - improve i18n keys - refs #3297: [DONNEES INDIVIDUELLES] g?\195?\169rer les colonnes du tableau dans le protocole (ne plus utiliser PMFM_ID_SAMPLE_ID et PMFM_ID_OTOLITHE_ID) 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/config/SampleCategoryModelConverter.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/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo 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-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -280,10 +280,10 @@ Caracteristic getDeadOrAliveCaracteristic(); - Caracteristic getSampleIdCaracteristic(); +// Caracteristic getSampleIdCaracteristic(); +// +// Caracteristic getOtolitheIdCaracteristic(); - Caracteristic getOtolitheIdCaracteristic(); - Caracteristic getPmfmIdCaracteristic(); Caracteristic getWeightMeasuredCaracteristic(); 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-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -429,17 +429,17 @@ return referentialService.getDeadOrAliveCaracteristic(); } - @Override - public Caracteristic getSampleIdCaracteristic() { - return referentialService.getSampleIdCaracteristic(); - } +// @Override +// public Caracteristic getSampleIdCaracteristic() { +// return referentialService.getSampleIdCaracteristic(); +// } +// +// @Override +// public Caracteristic getOtolitheIdCaracteristic() { +// return referentialService.getOtolitheIdCaracteristic(); +// } @Override - public Caracteristic getOtolitheIdCaracteristic() { - return referentialService.getOtolitheIdCaracteristic(); - } - - @Override public Caracteristic getPmfmIdCaracteristic() { return referentialService.getPmfmIdCaracteristic(); } 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-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -249,17 +249,17 @@ throw notImplemented(); } - @Override - public Caracteristic getSampleIdCaracteristic() { - throw notImplemented(); - } +// @Override +// public Caracteristic getSampleIdCaracteristic() { +// throw notImplemented(); +// } +// +// @Override +// public Caracteristic getOtolitheIdCaracteristic() { +// throw notImplemented(); +// } @Override - public Caracteristic getOtolitheIdCaracteristic() { - throw notImplemented(); - } - - @Override public Caracteristic getPmfmIdCaracteristic() { throw notImplemented(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/SampleCategoryModelConverter.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/SampleCategoryModelConverter.java 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/SampleCategoryModelConverter.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -81,7 +81,7 @@ } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + _("tutti.persistence.error.no.convertor", aClass.getName(), value)); } protected boolean isEnabled(Class<?> aClass) { 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-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -210,11 +210,11 @@ if (log.isWarnEnabled()) { log.warn("Could not find caracteristic with id: " + id); } - caracteristicStr = _("tutti.common.caracteristic.notFound"); + caracteristicStr = _("tutti.persistence.error.caracteristic.notFound"); } badCategoriesStr.add("<li>" + id + " : " + caracteristicStr + "</li>"); } - String message = _("tutti.common.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); + String message = _("tutti.persistence.error.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); return message; } 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-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -284,20 +284,20 @@ CaracteristicMap caracteristics = CaracteristicMap.copy(source.getCaracteristics()); - if (source.getSamplingCode() != null) { +// if (source.getSamplingCode() != null) { +// +// Caracteristic caracteristic = +// referentialService.getSampleIdCaracteristic(); +// caracteristics.put(caracteristic, source.getSamplingCode()); +// } +// +// if (source.getCalcifiedPieceSamplingCode() != null) { +// +// Caracteristic caracteristic = +// referentialService.getOtolitheIdCaracteristic(); +// caracteristics.put(caracteristic, source.getCalcifiedPieceSamplingCode()); +// } - Caracteristic caracteristic = - referentialService.getSampleIdCaracteristic(); - caracteristics.put(caracteristic, source.getSamplingCode()); - } - - if (source.getCalcifiedPieceSamplingCode() != null) { - - Caracteristic caracteristic = - referentialService.getOtolitheIdCaracteristic(); - caracteristics.put(caracteristic, source.getCalcifiedPieceSamplingCode()); - } - if (source.getWeight() != null) { Caracteristic caracteristic = referentialService.getWeightMeasuredCaracteristic(); @@ -332,16 +332,16 @@ samplePersistenceHelper.fillSampleMeasurements( result, batch.getIdAsInt()); - String sampleCode = (String) result.remove(referentialService.getSampleIdCaracteristic()); - if (sampleCode != null) { - batch.setSamplingCode(sampleCode); - } +// String sampleCode = (String) result.remove(referentialService.getSampleIdCaracteristic()); +// if (sampleCode != null) { +// batch.setSamplingCode(sampleCode); +// } +// +// String calcifiedPieceSampleCode = (String) result.remove(referentialService.getOtolitheIdCaracteristic()); +// if (sampleCode != null) { +// batch.setCalcifiedPieceSamplingCode(calcifiedPieceSampleCode); +// } - String calcifiedPieceSampleCode = (String) result.remove(referentialService.getOtolitheIdCaracteristic()); - if (sampleCode != null) { - batch.setCalcifiedPieceSamplingCode(calcifiedPieceSampleCode); - } - Float weight = (Float) result.remove(referentialService.getWeightMeasuredCaracteristic()); if (weight != null) { batch.setWeight(weight); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -245,10 +245,10 @@ Caracteristic getDeadOrAliveCaracteristic(); - Caracteristic getSampleIdCaracteristic(); +// Caracteristic getSampleIdCaracteristic(); +// +// Caracteristic getOtolitheIdCaracteristic(); - Caracteristic getOtolitheIdCaracteristic(); - Caracteristic getPmfmIdCaracteristic(); Caracteristic getWeightMeasuredCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -626,21 +626,21 @@ return result; } - @Override - public Caracteristic getSampleIdCaracteristic() { - Integer pmfmId = enumeration.PMFM_ID_SAMPLE_ID; - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; - } +// @Override +// public Caracteristic getSampleIdCaracteristic() { +// Integer pmfmId = enumeration.PMFM_ID_SAMPLE_ID; +// Caracteristic result = thisService.getCaracteristic(pmfmId); +// return result; +// } +// +// @Override +// public Caracteristic getOtolitheIdCaracteristic() { +// Integer pmfmId = enumeration.PMFM_ID_OTOLITHE_ID; +// Caracteristic result = thisService.getCaracteristic(pmfmId); +// return result; +// } @Override - public Caracteristic getOtolitheIdCaracteristic() { - Integer pmfmId = enumeration.PMFM_ID_OTOLITHE_ID; - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; - } - - @Override public Caracteristic getPmfmIdCaracteristic() { Integer pmfmId = enumeration.PMFM_ID_ID_PSFM; Caracteristic result = thisService.getCaracteristic(pmfmId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-09-21 14:45:35 UTC (rev 1197) @@ -284,12 +284,12 @@ @Value("${PmfmId.ID_PSFM}") public final Integer PMFM_ID_ID_PSFM = null; - @Value("${PmfmId.SAMPLE_ID}") - public final Integer PMFM_ID_SAMPLE_ID = null; +// @Value("${PmfmId.SAMPLE_ID}") +// public final Integer PMFM_ID_SAMPLE_ID = null; +// +// @Value("${PmfmId.OTOLITHE_ID}") +// public final Integer PMFM_ID_OTOLITHE_ID = null; - @Value("${PmfmId.OTOLITHE_ID}") - public final Integer PMFM_ID_OTOLITHE_ID = null; - protected Set<Integer> propertedPmfmIds; public void init() { Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-09-21 14:45:35 UTC (rev 1197) @@ -1,6 +1,3 @@ -nuitonutil.error.no.convertor= -tutti.common.caracteristic.notFound= -tutti.common.protocol.categories.not.compatible= tutti.config.option.persistence.SampleCategoryModel.description= tutti.config.option.persistence.db.attachment.directory.description= tutti.config.option.persistence.db.backup.directory.description= @@ -45,6 +42,9 @@ tutti.persistence.config.generateFile.error= tutti.persistence.cruise.gearUsedInOperations.error= tutti.persistence.dbMetadata.instanciation.error= +tutti.persistence.error.caracteristic.notFound= +tutti.persistence.error.no.convertor= +tutti.persistence.error.protocol.categories.not.compatible= tutti.persistence.loader.error= tutti.persistence.mkDir.error= tutti.persistence.protocol.delete.error= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-09-21 14:42:34 UTC (rev 1196) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-09-21 14:45:35 UTC (rev 1197) @@ -1,6 +1,3 @@ -nuitonutil.error.no.convertor= -tutti.common.caracteristic.notFound=Caractéristique inconnue -tutti.common.protocol.categories.not.compatible=Le protocole utilise des catégories non connues par la configuration des catégorisations \: <ul>%s</ul> tutti.config.option.persistence.SampleCategoryModel.description=Configuration des catégories d'échantillonnage tutti.config.option.persistence.db.attachment.directory.description=Répertoire où sont stockées les pièces-jointes tutti.config.option.persistence.db.backup.directory.description=Répertoire où sont enregistrées les sauvegardes de la base @@ -45,6 +42,9 @@ tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<hr/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne. tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s +tutti.persistence.error.caracteristic.notFound=Caractéristique inconnue +tutti.persistence.error.no.convertor=Impossible de convertir en modeèle de catégorie le type %s avec la valeur %s +tutti.persistence.error.protocol.categories.not.compatible=Le protocole utilise des catégories non connues par la configuration des catégorisations \: <ul>%s</ul> tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL tutti.persistence.mkDir.error=Erreur lors de la création du dossier %s tutti.persistence.protocol.delete.error=Erreur lors de la suppression du protocole %1s (fichier %2s) Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ)