Author: tchemit Date: 2012-03-08 19:31:24 +0100 (Thu, 08 Mar 2012) New Revision: 337 Url: http://forge.codelutin.com/repositories/revision/echobase/337 Log: ajout method pour decoration sur SpeciesCategory + fix tests (suite au deplacement d'entiti?\195?\169s) Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 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-08 17:07:22 UTC (rev 336) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-08 18:31:24 UTC (rev 337) @@ -212,9 +212,8 @@ // Species decorator registerJXPathDecorator(locale, Species.class, "${genusSpecies}$s"); - //TODO // SpeciesCategory decorator - registerJXPathDecorator(locale, SpeciesCategory.class, "${species/genusSpecies}$s - ..."); + registerJXPathDecorator(locale, SpeciesCategory.class, "${species/genusSpecies}$s - (size:: ${sizeCategoryName}$s) - (age: ${ageCategoryLabel}$s) - (sex: ${sexCategoryLabel}$s)"); // Strata decorator registerJXPathDecorator(locale, Strata.class, "Latitude <${minLatitude}$s - ${maxLatitude}$s>, Longitude <${minLongitude}$s - ${maxLongitude}$s>"); Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java 2012-03-08 18:31:24 UTC (rev 337) @@ -0,0 +1,62 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.entities.references; + +public class SpeciesCategoryImpl extends SpeciesCategoryAbstract { + + private static final long serialVersionUID = 4063203856528794213L; + + @Override + public String getSizeCategoryName() { + String result; + if (sizeCategory == null) { + result = ""; + } else { + result = sizeCategory.getName(); + } + return result; + } + + @Override + public String getAgeCategoryName() { + String result; + if (ageCategory == null) { + result = ""; + } else { + result = ageCategory.getName(); + } + return result; + } + + @Override + public String getSexCategoryName() { + String result; + if (sexCategory == null) { + result = ""; + } else { + result = sexCategory.getName(); + } + return result; + } +} //SpeciesCategoryImpl Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategoryImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2012-03-08 17:07:22 UTC (rev 336) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2012-03-08 18:31:24 UTC (rev 337) @@ -63,9 +63,6 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Mission.class.getPackage())); - expectedTypes.remove(EchoBaseEntityEnum.Echotype); - expectedTypes.remove(EchoBaseEntityEnum.LengthAgeKey); - expectedTypes.remove(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); @@ -83,9 +80,6 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Mission.class.getPackage())); - expectedTypes.remove(EchoBaseEntityEnum.Echotype); - expectedTypes.remove(EchoBaseEntityEnum.LengthAgeKey); - expectedTypes.remove(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); @@ -103,9 +97,6 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); - expectedTypes.add(EchoBaseEntityEnum.Echotype); - expectedTypes.add(EchoBaseEntityEnum.LengthAgeKey); - expectedTypes.add(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); for (EchoBaseEntityEnum type : expectedTypes) { @@ -123,10 +114,7 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); - expectedTypes.add(EchoBaseEntityEnum.Echotype); - expectedTypes.add(EchoBaseEntityEnum.LengthAgeKey); - expectedTypes.add(EchoBaseEntityEnum.LengthWeightKey); - + Assert.assertNotNull(types); for (EchoBaseEntityEnum type : expectedTypes) {