Author: tchemit Date: 2012-03-11 18:09:51 +0100 (Sun, 11 Mar 2012) New Revision: 351 Url: http://forge.codelutin.com/repositories/revision/echobase/351 Log: add some functions and usefull method on Cell modify model for result Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.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/resources/i18n/echobase-entities_en_GB.properties trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.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-10 09:27:20 UTC (rev 350) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-11 17:09:51 UTC (rev 351) @@ -25,6 +25,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataAcquisition; @@ -45,7 +46,6 @@ import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Calibration; -import fr.ifremer.echobase.entities.references.Category; import fr.ifremer.echobase.entities.references.CategoryMeaning; import fr.ifremer.echobase.entities.references.CategoryRef; import fr.ifremer.echobase.entities.references.CategoryType; @@ -67,6 +67,8 @@ 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; @@ -188,6 +190,14 @@ // 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"); 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-10 09:27:20 UTC (rev 350) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-11 17:09:51 UTC (rev 351) @@ -25,6 +25,7 @@ import com.google.common.base.Function; import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Voyage; @@ -54,6 +55,7 @@ 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; @@ -286,6 +288,13 @@ } }; + public static final Function<Echotype, String> ECHOTYPE_NAME = new Function<Echotype, String>() { + @Override + public String apply(Echotype 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-10 09:27:20 UTC (rev 350) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-11 17:09:51 UTC (rev 351) @@ -53,7 +53,7 @@ result.add(EchoBaseEntityEnum.DataProcessing); result.add(EchoBaseEntityEnum.Cell); result.add(EchoBaseEntityEnum.Data); - result.add(EchoBaseEntityEnum.Result); + result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.OperationMetadataValue); result.add(EchoBaseEntityEnum.GearMetadataValue); @@ -63,7 +63,10 @@ result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.LengthAgeKey); result.add(EchoBaseEntityEnum.LengthWeightKey); + result.add(EchoBaseEntityEnum.Category); + result.add(EchoBaseEntityEnum.Result); + return result.toArray(new EchoBaseEntityEnum[result.size()]); } @@ -83,14 +86,18 @@ result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.Data); + + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.Result); + result.add(EchoBaseEntityEnum.Cell); result.add(EchoBaseEntityEnum.DataProcessing); result.add(EchoBaseEntityEnum.DataAcquisition); result.add(EchoBaseEntityEnum.Transect); result.add(EchoBaseEntityEnum.Transit); - result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.LengthAgeKey); result.add(EchoBaseEntityEnum.LengthWeightKey); @@ -122,7 +129,6 @@ result.add(EchoBaseEntityEnum.Species); result.add(EchoBaseEntityEnum.GearCharacteristic); result.add(EchoBaseEntityEnum.ReferenceDatum); - result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.ReferencingMethod); result.add(EchoBaseEntityEnum.GearCharacteristicValue); result.add(EchoBaseEntityEnum.GearMetadata); @@ -144,6 +150,8 @@ 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()]); } @@ -179,6 +187,8 @@ 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); @@ -193,7 +203,6 @@ result.add(EchoBaseEntityEnum.SpeciesCategory); result.add(EchoBaseEntityEnum.TSParameters); result.add(EchoBaseEntityEnum.DataMetadata); - result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.CategoryRef); result.add(EchoBaseEntityEnum.Impacte); result.add(EchoBaseEntityEnum.DataProtocol); Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java 2012-03-11 17:09:51 UTC (rev 351) @@ -0,0 +1,47 @@ +/* + * #%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; + +import com.google.common.base.Preconditions; + +public class CellImpl extends CellAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public Cell getChildByName(String name) { + Preconditions.checkNotNull(name); + + Cell cell = null; + if (!isChildsEmpty()) { + for (Cell child : childs) { + if (name.equals(child.getName())) { + cell = child; + break; + } + } + } + return cell; + } +} //CellImpl Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-10 09:27:20 UTC (rev 350) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-11 17:09:51 UTC (rev 351) @@ -174,6 +174,8 @@ echobase.common.precision= echobase.common.principalInvestigator= echobase.common.principalInvestigatorEmail= +echobase.common.processedAge= +echobase.common.processedLength= echobase.common.processingDescription= echobase.common.processingMethod= echobase.common.processingSoftwareVersion= @@ -189,7 +191,8 @@ echobase.common.relatedActivity= echobase.common.report= echobase.common.result= -echobase.common.resultvalue= +echobase.common.resultLabel= +echobase.common.resultValue= echobase.common.sample= echobase.common.sampleData= echobase.common.sampleDataType= Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-10 09:27:20 UTC (rev 350) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-11 17:09:51 UTC (rev 351) @@ -174,6 +174,8 @@ echobase.common.precision= echobase.common.principalInvestigator=Chercheur echobase.common.principalInvestigatorEmail=Courriel du chercheur +echobase.common.processedAge= +echobase.common.processedLength= echobase.common.processingDescription= echobase.common.processingMethod= echobase.common.processingSoftwareVersion= @@ -189,7 +191,8 @@ echobase.common.relatedActivity= echobase.common.report= echobase.common.result= -echobase.common.resultvalue= +echobase.common.resultLabel= +echobase.common.resultValue= echobase.common.sample= echobase.common.sampleData= echobase.common.sampleDataType= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)