Author: tchemit Date: 2011-12-20 15:22:50 +0100 (Tue, 20 Dec 2011) New Revision: 209 Url: http://forge.codelutin.com/repositories/revision/echobase/209 Log: fix some decorators Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 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-20 09:21:01 UTC (rev 208) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-20 14:22:50 UTC (rev 209) @@ -133,7 +133,7 @@ registerJXPathDecorator(locale, CellType.class, "${name}$s"); // DataMetadata decorator - registerJXPathDecorator(locale, DataMetadata.class, "${name}$s"); + registerJXPathDecorator(locale, DataMetadata.class, "${name}$s - ${standardname}$s"); // DataProtocol decorator registerJXPathDecorator(locale, DataProtocol.class, "${description}$s [ ${validSince}$td/%2$tm/%2$tY - ${invalidSince}$td/%3$tm/%3$tY ]"); @@ -160,7 +160,7 @@ registerJXPathDecorator(locale, GearCharacteristic.class, "${name}$s"); // GearMetadata decorator - registerJXPathDecorator(locale, GearMetadata.class, "${name}$s"); + registerJXPathDecorator(locale, GearMetadata.class, "${type}$s (${operationEvent/name}$s)"); // GearCharacteristicValue decorator registerJXPathDecorator(locale, GearCharacteristicValue.class, "${dataValue}$s"); @@ -169,7 +169,7 @@ registerJXPathDecorator(locale, GearMetadataValue.class, "${dataValue}$s"); // Impacte decorator - registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s - ${species.genusSpecies}"); + registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s - ${species/genusSpecies}"); // LengthAgeKey decorator registerJXPathDecorator(locale, LengthAgeKey.class, "Age ${age}$s - Length ${length}"); @@ -218,7 +218,7 @@ //TODO // SpeciesCategory decorator - registerJXPathDecorator(locale, SpeciesCategory.class, "${species.genusSpecies}$s - ..."); + registerJXPathDecorator(locale, SpeciesCategory.class, "${species/genusSpecies}$s - ..."); // Strata decorator registerJXPathDecorator(locale, Strata.class, "Latitude <${minLatitude}$s - ${maxLatitude}$s>, Longitude <${minLongitude}$s - ${maxLongitude}$s>"); @@ -234,7 +234,7 @@ registerJXPathDecorator(locale, VesselType.class, "${name}$s"); // LengthWeightKey decorator - registerJXPathDecorator(locale, LengthWeightKey.class, "Species ${species.genusSpecies}$s - a=${aParameter}$s, b=${bParameter}$s"); + registerJXPathDecorator(locale, LengthWeightKey.class, "Species ${species/genusSpecies}$s - a=${aParameter}$s, b=${bParameter}$s"); // Cell decorator registerJXPathDecorator(locale, Cell.class, "${name}$s"); @@ -254,7 +254,7 @@ registerJXPathDecorator(locale, Operation.class, "${startDate}$td/%1$tm/%1$tY - ${endDate}$td/%2$tm/%2$tY"); // OperationMetadataValue decorator - registerJXPathDecorator(locale, OperationMetadataValue.class, "${dataValue}$s - moment ${moment.name}"); + registerJXPathDecorator(locale, OperationMetadataValue.class, "${operationMetadata/name} - ${dataValue}$s"); // Result decorator registerJXPathDecorator(locale, Result.class, "${resultvalue}$s");