Author: tchemit Date: 2012-03-16 11:07:43 +0100 (Fri, 16 Mar 2012) New Revision: 365 Url: http://forge.codelutin.com/repositories/revision/echobase/365 Log: remaniement de l'entit?\195?\169 Category + ajout type text sur Exportquery.sqlQuery Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 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/xmi/echobase.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 2012-03-16 10:02:28 UTC (rev 364) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-16 10:07:43 UTC (rev 365) @@ -67,8 +67,6 @@ import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.OperationEvent; import fr.ifremer.echobase.entities.references.OperationMetadata; -import fr.ifremer.echobase.entities.references.ProcessedAge; -import fr.ifremer.echobase.entities.references.ProcessedLength; import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; import fr.ifremer.echobase.entities.references.ReferencingMethod; @@ -116,7 +114,7 @@ registerJXPathDecorator(locale, Calibration.class, "${date}$s - acquisition ${aquisitionMethod}$s"); // Category decorator - registerJXPathDecorator(locale, Category.class, "${classCode}$s ${categoryValue}$s"); + registerJXPathDecorator(locale, Category.class, "${echotype/name}$s - (species: ${speciesLabel}$s) - (age: ${processedAgeLabel}$s) - (lenght: ${processedLengthLabel}$s)"); // CategoryMeaning decorator registerJXPathDecorator(locale, CategoryMeaning.class, "${name}$s"); @@ -190,14 +188,6 @@ // OperationMetadata decorator registerJXPathDecorator(locale, OperationMetadata.class, "${name}$s"); - //TODO - // ProcessedAge decorator - registerJXPathDecorator(locale, ProcessedAge.class, "${}$s"); - - //TODO - // ProcessedLength decorator - registerJXPathDecorator(locale, ProcessedLength.class, "${}$s"); - // ReferenceDatum decorator registerJXPathDecorator(locale, ReferenceDatum.class, "${id}$s"); @@ -251,9 +241,8 @@ // DataAcquisition decorator registerJXPathDecorator(locale, DataAcquisition.class, ""); - //TODO // DataProcessing decorator - registerJXPathDecorator(locale, DataProcessing.class, ""); + registerJXPathDecorator(locale, DataProcessing.class, "${id} "); // Operation decorator registerJXPathDecorator(locale, Operation.class, "${startDate}$td/%1$tm/%1$tY - ${endDate}$td/%2$tm/%2$tY"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-16 10:02:28 UTC (rev 364) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-16 10:07:43 UTC (rev 365) @@ -30,6 +30,7 @@ import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AcousticInstrument; +import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.CellMethod; import fr.ifremer.echobase.entities.references.CellType; @@ -55,7 +56,6 @@ import fr.ifremer.echobase.entities.references.VesselType; import org.nuiton.topia.persistence.TopiaEntity; -import javax.annotation.Nullable; import java.io.File; import java.util.Map; @@ -208,6 +208,7 @@ return String.valueOf(input.getName()); } }; + public static final Function<OperationEvent, String> OPERATION_EVENT_NAME = new Function<OperationEvent, String>() { @Override public String apply(OperationEvent input) { @@ -295,6 +296,13 @@ } }; + public static final Function<AgeCategory, String> AGE_CATEGORY_NAME = new Function<AgeCategory, String>() { + @Override + public String apply(AgeCategory input) { + return input.getName(); + } + }; + public static String getSpeciesCategoryKey(Species species, SizeCategory sizeCategory, SexCategory sexCategory) { String key = species.getBaracoudaCode(); if (sizeCategory != null) { 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 2012-03-16 10:02:28 UTC (rev 364) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-16 10:07:43 UTC (rev 365) @@ -150,8 +150,6 @@ result.add(EchoBaseEntityEnum.Gear); result.add(EchoBaseEntityEnum.DataProtocol); result.add(EchoBaseEntityEnum.SpeciesCategory); - result.add(EchoBaseEntityEnum.ProcessedAge); - result.add(EchoBaseEntityEnum.ProcessedLength); return result.toArray(new EchoBaseEntityEnum[result.size()]); } @@ -187,8 +185,6 @@ result.add(EchoBaseEntityEnum.MeasureType); result.add(EchoBaseEntityEnum.MeasurementMetadata); result.add(EchoBaseEntityEnum.ReferencingMethod); - result.add(EchoBaseEntityEnum.ProcessedAge); - result.add(EchoBaseEntityEnum.ProcessedLength); // with deps result.add(EchoBaseEntityEnum.Strata); Added: 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 (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-16 10:07:43 UTC (rev 365) @@ -0,0 +1,48 @@ +/* + * #%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.data; + +public class CategoryImpl extends CategoryAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String getSpeciesLabel() { + return speciesCategory == null ? "" : + speciesCategory.getSpecies().getBaracoudaCode(); + } + + @Override + public String getProcessedAgeLabel() { + return speciesCategory == null ? "" : + speciesCategory.getAgeCategoryName(); + } + + @Override + public String getProcessedLengthLabel() { + return speciesCategory == null ? "" : + speciesCategory.getSizeCategoryName(); + } + +} //CategoryImpl Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-03-16 10:02:28 UTC (rev 364) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-03-16 10:07:43 UTC (rev 365) @@ -42,4 +42,5 @@ # big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text +fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)