Author: tchemit Date: 2012-10-30 12:46:11 +0100 (Tue, 30 Oct 2012) New Revision: 767 Url: http://forge.codelutin.com/repositories/revision/echobase/767 Log: fixes #1660: Revoir les d?\195?\169coration des entit?\195?\169s du r?\195?\169f?\195?\169rentiel pour une recherche efficace Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2012-10-30 11:45:36 UTC (rev 766) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2012-10-30 11:46:11 UTC (rev 767) @@ -224,33 +224,39 @@ // DataMetadata decorator registerJXPathDecorator(locale, DataMetadata.class, "${name}$s - ${standardName}$s"); + //registerJXPathDecorator(locale, DataMetadata.class, "${name}$s"); // DataProtocol decorator registerJXPathDecorator(locale, DataProtocol.class, "${description}$s [ ${validSince}$td/%2$tm/%2$tY - ${invalidSince}$td/%3$tm/%3$tY ]"); // DataQuality decorator - registerJXPathDecorator(locale, DataQuality.class, "${qualityDataFlagValues}$s - ${flagMeanings}$s"); + //registerJXPathDecorator(locale, DataQuality.class, "${qualityDataFlagValues}$s - ${flagMeanings}$s"); + registerJXPathDecorator(locale, DataQuality.class, "${flagMeanings}$s"); // DataType decorator registerJXPathDecorator(locale, DataType.class, "${name}$s"); // DepthStratum decorator - registerJXPathDecorator(locale, DepthStratum.class, "${id}$s - ${meaning}$s"); + //registerJXPathDecorator(locale, DepthStratum.class, "${id}$s - ${meaning}$s"); + registerJXPathDecorator(locale, DepthStratum.class, "${meaning}$s"); // Echotype decorator - registerJXPathDecorator(locale, Echotype.class, "${id}$s - ${name}$s"); + //registerJXPathDecorator(locale, Echotype.class, "${id}$s - ${name}$s"); + registerJXPathDecorator(locale, Echotype.class, "${name}$s"); // EchotypeCategory decorator registerJXPathDecorator(locale, EchotypeCategory.class, "${name}$s"); // Gear decorator - registerJXPathDecorator(locale, Gear.class, "${name}$s [ ${validSince}$td/%2$tm/%2$tY - ${invalidSince}$td/%3$tm/%3$tY ]"); + //registerJXPathDecorator(locale, Gear.class, "${name}$s [ ${validSince}$td/%2$tm/%2$tY - ${invalidSince}$td/%3$tm/%3$tY ]"); + registerJXPathDecorator(locale, Gear.class, "${name}$s"); // GearCaracteristic decorator registerJXPathDecorator(locale, GearCharacteristic.class, "${name}$s"); // GearMetadata decorator - registerJXPathDecorator(locale, GearMetadata.class, "${name}$s (${operationEvent/name}$s)"); + //registerJXPathDecorator(locale, GearMetadata.class, "${name}$s (${operationEvent/name}$s)"); + registerJXPathDecorator(locale, GearMetadata.class, "${name}$s"); // GearCharacteristicValue decorator registerJXPathDecorator(locale, GearCharacteristicValue.class, "${dataValue}$s"); @@ -259,7 +265,8 @@ registerJXPathDecorator(locale, GearMetadataValue.class, "${dataValue}$s"); // Impacte decorator - registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s - ${species/genusSpecies}"); + //registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s - ${species/genusSpecies}"); + registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s"); // LengthAgeKey decorator registerJXPathDecorator(locale, LengthAgeKey.class, "Age ${age}$s - Length ${length}"); @@ -292,7 +299,8 @@ registerJXPathDecorator(locale, SampleDataType.class, "${name}$s"); // SampleType decorator - registerJXPathDecorator(locale, SampleType.class, "${name}$s - level ${level}$s"); + //registerJXPathDecorator(locale, SampleType.class, "${name}$s - level ${level}$s"); + registerJXPathDecorator(locale, SampleType.class, "${name}$s"); // SexCategory decorator registerJXPathDecorator(locale, SexCategory.class, "${name}$s"); @@ -301,7 +309,8 @@ registerJXPathDecorator(locale, SizeCategory.class, "${name}$s"); // Species decorator - registerJXPathDecorator(locale, Species.class, "${genusSpecies}$s (${baracoudaCode}$s)"); + //registerJXPathDecorator(locale, Species.class, "${genusSpecies}$s (${baracoudaCode}$s)"); + registerJXPathDecorator(locale, Species.class, "${genusSpecies}$s"); // SpeciesCategory decorator registerJXPathDecorator(locale, SpeciesCategory.class, "${species/genusSpecies}$s ${sizeCategoryLabel}$s ${ageCategoryLabel}$s ${sexCategoryLabel}$s");