Author: tchemit Date: 2011-12-19 20:16:01 +0100 (Mon, 19 Dec 2011) New Revision: 202 Url: http://forge.codelutin.com/repositories/revision/echobase/202 Log: fix entity name + properties Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-19 08:20:03 UTC (rev 201) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-19 19:16:01 UTC (rev 202) @@ -61,6 +61,7 @@ import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.Impacte; import fr.ifremer.echobase.entities.references.LengthAgeKey; +import fr.ifremer.echobase.entities.references.LengthWeightKey; import fr.ifremer.echobase.entities.references.MeasureType; import fr.ifremer.echobase.entities.references.MeasurementMetadata; import fr.ifremer.echobase.entities.references.Mission; @@ -80,7 +81,6 @@ import fr.ifremer.echobase.entities.references.TSParameters; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.entities.references.VesselType; -import fr.ifremer.echobase.entities.references.WeightLengthKey; import org.nuiton.util.decorator.DecoratorMulti18nProvider; import java.util.Locale; @@ -233,8 +233,8 @@ // VesselType decorator registerJXPathDecorator(locale, VesselType.class, "${name}$s"); - // WeightLengthKey decorator - registerJXPathDecorator(locale, WeightLengthKey.class, "Species ${species.genusSpecies}$s - a=${aParameter}$s, b=${bParameter}$s"); + // LengthWeightKey decorator + registerJXPathDecorator(locale, LengthWeightKey.class, "Species ${species.genusSpecies}$s - a=${aParameter}$s, b=${bParameter}$s"); // Cell decorator registerJXPathDecorator(locale, Cell.class, "${name}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2011-12-19 08:20:03 UTC (rev 201) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2011-12-19 19:16:01 UTC (rev 202) @@ -40,7 +40,10 @@ import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.entities.references.Vessel; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntity; @@ -192,7 +195,38 @@ return input.getId(); } }; + public static final Function<SizeCategory, String> SIZE_CATEGORY_NAME = new Function<SizeCategory, String>() { + @Override + public String apply(SizeCategory input) { + return input.getName(); + } + }; + public static final Function<SpeciesCategory, String> SPECIES_CATEGORY_SPIECIES = new Function<SpeciesCategory, String>() { + @Override + public String apply(SpeciesCategory input) { + return getSpeciesCategoryKey(input.getSpecies(), input.getSizeCategory(), input.getSexCategory()); + } + }; + + public static final Function<SexCategory, String> SEX_CATEGORY_NAME = new Function<SexCategory, String>() { + @Override + public String apply(SexCategory input) { + return input.getName(); + } + }; + + public static String getSpeciesCategoryKey(Species species, SizeCategory sizeCategory,SexCategory sexCategory) { + String key = species.getBaracoudaCode(); + if (sizeCategory != null) { + key += "_" + sizeCategory.getName(); + } + if (sexCategory != null) { + key += "_" + sexCategory.getName(); + } + return key; + } + public static Function<Map<String, Object>, String> newRowFunction(final String key) { return new Function<Map<String, Object>, String>() { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-12-19 08:20:03 UTC (rev 201) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-12-19 19:16:01 UTC (rev 202) @@ -118,13 +118,12 @@ result.add(EchoBaseEntityEnum.OperationType); result.add(EchoBaseEntityEnum.MeasurementMetadata); result.add(EchoBaseEntityEnum.SampleDataType); - result.add(EchoBaseEntityEnum.BiometryScale); result.add(EchoBaseEntityEnum.SampleType); result.add(EchoBaseEntityEnum.Vessel); result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); result.add(EchoBaseEntityEnum.LengthAgeKey); - result.add(EchoBaseEntityEnum.WeightLengthKey); + result.add(EchoBaseEntityEnum.LengthWeightKey); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.Impacte); result.add(EchoBaseEntityEnum.Mission); Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-12-19 08:20:03 UTC (rev 201) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-12-19 19:16:01 UTC (rev 202) @@ -1,5 +1,6 @@ +echobase.common.AParameter= +echobase.common.BParameter= echobase.common.TSParameters= -echobase.common.aParameter= echobase.common.accuracyEstimate= echobase.common.acknowledgement= echobase.common.acousticDensityUnit= @@ -18,12 +19,10 @@ echobase.common.authorReference= echobase.common.axis= echobase.common.b= -echobase.common.bParameter= echobase.common.baracoudaCode= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= -echobase.common.biometryScale= echobase.common.calendar= echobase.common.calibration=calibration echobase.common.callsign= @@ -95,7 +94,6 @@ echobase.common.gearShootingStartLatitude= echobase.common.gearShootingStartLongitude= echobase.common.gearShootingStartTime= -echobase.common.gearType= echobase.common.genusSpecies= echobase.common.geospatialLatMax= echobase.common.geospatialLatMin= @@ -104,7 +102,6 @@ echobase.common.geospatialVerticalMax= echobase.common.geospatialVerticalMin= echobase.common.geospatialVerticalPositive= -echobase.common.group= echobase.common.history= echobase.common.id=Identifiant echobase.common.imo= @@ -117,6 +114,7 @@ echobase.common.lastModifiedUser=Utilisateur de dernière modification echobase.common.length= echobase.common.lengthAgeKey= +echobase.common.lengthWeightKey= echobase.common.level= echobase.common.licence= echobase.common.linestring= @@ -137,7 +135,6 @@ echobase.common.measurementUnit= echobase.common.metadata=metadata echobase.common.metadataGroup= -echobase.common.metadataType= echobase.common.midHauleLatitude= echobase.common.midHauleLongitude= echobase.common.minLatitude= @@ -188,7 +185,6 @@ echobase.common.sampleDataType= echobase.common.sampleType= echobase.common.sampleWeight= -echobase.common.sampling= echobase.common.scaleFactor= echobase.common.seafloorSubstrate= echobase.common.sexCategory= @@ -257,5 +253,4 @@ echobase.common.vessel=Navire echobase.common.vesselType= echobase.common.voyage=Campagne -echobase.common.weightLengthKey= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)