Author: tchemit Date: 2012-03-27 15:03:51 +0200 (Tue, 27 Mar 2012) New Revision: 413 Url: http://forge.codelutin.com/repositories/revision/echobase/413 Log: fix Category decoration Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 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 2012-03-26 23:28:36 UTC (rev 412) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-27 13:03:51 UTC (rev 413) @@ -114,7 +114,7 @@ registerJXPathDecorator(locale, Calibration.class, "${date}$s - acquisition ${aquisitionMethod}$s"); // Category decorator - registerJXPathDecorator(locale, Category.class, "${echotype/name}$s - (species: ${speciesLabel}$s) - (age: ${processedAgeLabel}$s) - (lenght: ${processedLengthLabel}$s)"); + registerJXPathDecorator(locale, Category.class, "${echotypeLabel}$s ${speciesLabel}$s ${processedAgeLabel}$s ${processedLengthLabel}$s"); // CategoryMeaning decorator registerJXPathDecorator(locale, CategoryMeaning.class, "${name}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-26 23:28:36 UTC (rev 412) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 13:03:51 UTC (rev 413) @@ -28,21 +28,27 @@ private static final long serialVersionUID = 1L; @Override + public String getEchotypeLabel() { + return echotype == null ? "" : (" echotype: " + echotype.getName()); + } + + @Override public String getSpeciesLabel() { return speciesCategory == null || speciesCategory.getSpecies() == null - ? "" : speciesCategory.getSpecies().getBaracoudaCode(); + ? "" : + (" species: " + speciesCategory.getSpecies().getBaracoudaCode()); } @Override public String getProcessedAgeLabel() { - return speciesCategory == null ? "" : - speciesCategory.getAgeCategoryName(); + return speciesCategory == null || speciesCategory.getAgeCategory() == null ? "" : + (" ageCategory: " + speciesCategory.getAgeCategoryName()); } @Override public String getProcessedLengthLabel() { - return speciesCategory == null ? "" : - speciesCategory.getSizeCategoryName(); + return speciesCategory == null || speciesCategory.getSizeCategory() == null ? "" : + (" sizeCategory: " + speciesCategory.getSizeCategoryName()); } } //CategoryImpl Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)