Author: tchemit Date: 2011-12-15 12:01:21 +0100 (Thu, 15 Dec 2011) New Revision: 186 Url: http://forge.codelutin.com/repositories/revision/echobase/186 Log: modify catches model + add decoratorProvider Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-15 11:01:21 UTC (rev 186) @@ -0,0 +1,281 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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; + +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.data.GearMetadataValue; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.OperationMetadataValue; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +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.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; +import fr.ifremer.echobase.entities.references.CellMethod; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DataProtocol; +import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.DataType; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.Echotype; +import fr.ifremer.echobase.entities.references.EchotypeCategory; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearCharacteristic; +import fr.ifremer.echobase.entities.references.GearCharacteristicValue; +import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.GearType; +import fr.ifremer.echobase.entities.references.Impacte; +import fr.ifremer.echobase.entities.references.LengthAgeKey; +import fr.ifremer.echobase.entities.references.MeasureType; +import fr.ifremer.echobase.entities.references.MeasurementMetadata; +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.OperationType; +import fr.ifremer.echobase.entities.references.ReferenceDatum; +import fr.ifremer.echobase.entities.references.ReferenceDatumType; +import fr.ifremer.echobase.entities.references.ReferencingMethod; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.SampleType; +import fr.ifremer.echobase.entities.references.SexeCategory; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.entities.references.Strata; +import fr.ifremer.echobase.entities.references.TSParameters; +import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.entities.references.VesselType; +import fr.ifremer.echobase.entities.references.WeightLengthKey; +import org.nuiton.util.decorator.DecoratorMulti18nProvider; + +import java.util.Locale; + +/** + * Decorator provider. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class EchoBaseDecoratorProvider extends DecoratorMulti18nProvider { + + @Override + protected void loadDecorators(Locale locale) { + + // EchoBaseUser decorator + registerJXPathDecorator(locale, EchoBaseUser.class, "${email}$s"); + + // ExportQuery decorator + registerJXPathDecorator(locale, ExportQuery.class, "${name}$s - ${description}$s"); + + // AcousticInstrument decorator + registerJXPathDecorator(locale, AcousticInstrument.class, "${id}$s"); + + // AgeCategory decorator + registerJXPathDecorator(locale, AgeCategory.class, "${name}$s"); + + // AreaOfOperation decorator + registerJXPathDecorator(locale, AreaOfOperation.class, "${name}$s"); + + // Calibration decorator + registerJXPathDecorator(locale, Calibration.class, "${date}$s - acquisition ${aquisitionMethod}$s"); + + // Category decorator + registerJXPathDecorator(locale, Category.class, "${classCode}$s ${categoryValue}$s"); + + // CategoryMeaning decorator + registerJXPathDecorator(locale, CategoryMeaning.class, "${name}$s"); + + // CategoryRef decorator + registerJXPathDecorator(locale, CategoryRef.class, "${genusSpecies}$s"); + + // CategoryType decorator + registerJXPathDecorator(locale, CategoryType.class, "${name}$s"); + + // CellMethod decorator + registerJXPathDecorator(locale, CellMethod.class, "${name}$s"); + + // CellType decorator + registerJXPathDecorator(locale, CellType.class, "${name}$s"); + + // DataMetadata decorator + 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"); + + // DataType decorator + registerJXPathDecorator(locale, DataType.class, "${name}$s"); + + // DepthStratum decorator + registerJXPathDecorator(locale, DepthStratum.class, "${id}$s - ${meaning}$s"); + + // Echotype decorator + registerJXPathDecorator(locale, Echotype.class, "${id}$s - ${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 ]"); + + // GearCaracteristic decorator + registerJXPathDecorator(locale, GearCharacteristic.class, "${name}$s"); + + // GearMetadata decorator + registerJXPathDecorator(locale, GearMetadata.class, "${name}$s"); + + // GearCharacteristicValue decorator + registerJXPathDecorator(locale, GearCharacteristicValue.class, "${dataValue}$s"); + + // GearMetadataValue decorator + registerJXPathDecorator(locale, GearMetadataValue.class, "${dataValue}$s"); + + // GearType decorator + registerJXPathDecorator(locale, GearType.class, "${name}$s"); + + // Impacte decorator + registerJXPathDecorator(locale, Impacte.class, "${measurementUnit}$s - ${species.genusSpecies}"); + + // LengthAgeKey decorator + registerJXPathDecorator(locale, LengthAgeKey.class, "Age ${age}$s - Length ${length}"); + + // MeasurementMetadata decorator + registerJXPathDecorator(locale, MeasurementMetadata.class, "${name}$s"); + + // MeasureType decorator + registerJXPathDecorator(locale, MeasureType.class, "${name}$s"); + + // Mission decorator + registerJXPathDecorator(locale, Mission.class, "${name}$s"); + + // OperationEvent decorator + registerJXPathDecorator(locale, OperationEvent.class, "${name}$s"); + + // OperationMetadata decorator + registerJXPathDecorator(locale, OperationMetadata.class, "${name}$s"); + + // OperationType decorator + registerJXPathDecorator(locale, OperationType.class, "${name}$s"); + + // ReferenceDatum decorator + registerJXPathDecorator(locale, ReferenceDatum.class, "${id}$s"); + + // ReferenceDatumType decorator + registerJXPathDecorator(locale, ReferenceDatumType.class, "${name}$s"); + + // ReferencingMethod decorator + registerJXPathDecorator(locale, ReferencingMethod.class, "${name}$s"); + + // SampleDataType decorator + registerJXPathDecorator(locale, SampleDataType.class, "${name}$s"); + + // SampleType decorator + registerJXPathDecorator(locale, SampleType.class, "${name}$s - level ${level}$s"); + + // SexeCategory decorator + registerJXPathDecorator(locale, SexeCategory.class, "${name}$s"); + + // SizeCategory decorator + registerJXPathDecorator(locale, SizeCategory.class, "${name}$s"); + + // Species decorator + registerJXPathDecorator(locale, Species.class, "${genusSpecies}$s"); + + //TODO + // SpeciesCategory decorator + registerJXPathDecorator(locale, SpeciesCategory.class, "${species.genusSpecies}$s - ..."); + + // Strata decorator + registerJXPathDecorator(locale, Strata.class, "Latitude <${minLatitude}$s - ${maxLatitude}$s>, Longitude <${minLongitude}$s - ${maxLongitude}$s>"); + + //TODO + // TSParameters decorator + registerJXPathDecorator(locale, TSParameters.class, "${}$s"); + + // Vessel decorator + registerJXPathDecorator(locale, Vessel.class, "${name}$s"); + + // VesselType decorator + registerJXPathDecorator(locale, VesselType.class, "${name}$s"); + + // WeightLengthKey decorator + registerJXPathDecorator(locale, WeightLengthKey.class, "Species ${species.genusSpecies}$s - a=${aParameter}$s, b=${bParameter}$s"); + + // Cell decorator + registerJXPathDecorator(locale, Cell.class, "${name}$s"); + + // Data decorator + registerJXPathDecorator(locale, Data.class, "${dataValue}$s"); + + //TODO + // DataAcquisition decorator + registerJXPathDecorator(locale, DataAcquisition.class, ""); + + //TODO + // DataProcessing decorator + registerJXPathDecorator(locale, DataProcessing.class, ""); + + // Operation decorator + registerJXPathDecorator(locale, Operation.class, "${startDate}$td/%1$tm/%1$tY - ${endDate}$td/%2$tm/%2$tY"); + + // OperationMetadataValue decorator + registerJXPathDecorator(locale, OperationMetadataValue.class, "${dataValue}$s - moment ${moment.name}"); + + // Result decorator + registerJXPathDecorator(locale, Result.class, "${resultvalue}$s"); + + // Sample decorator + registerJXPathDecorator(locale, Sample.class, "${resultvalue}$s"); + + // SampleData decorator + registerJXPathDecorator(locale, SampleData.class, "${resultvalue}$s"); + + // Transect decorator + registerJXPathDecorator(locale, Transect.class, "${title}$s - Vessel ${vessel}$s"); + + // Transit decorator + registerJXPathDecorator(locale, Transit.class, "${startTime}$td/%1$tm/%1$tY - ${endTime}$td/%2$tm/%2$tY"); + + // Voyage decorator + registerJXPathDecorator(locale, Voyage.class, "${name}$s [ ${startDate}$td/%2$tm/%2$tY - ${endDate}$td/%3$tm/%3$tY ]"); + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2011-12-14 07:14:58 UTC (rev 185) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-12-15 11:01:21 UTC (rev 186) @@ -53,7 +53,7 @@ result.add(EchoBaseEntityEnum.Result); result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.OperationMetadataValue); - result.add(EchoBaseEntityEnum.OperationGearMetadataValue); + result.add(EchoBaseEntityEnum.GearMetadataValue); result.add(EchoBaseEntityEnum.Sample); result.add(EchoBaseEntityEnum.SampleData); @@ -72,7 +72,7 @@ result.add(EchoBaseEntityEnum.Sample); result.add(EchoBaseEntityEnum.OperationMetadataValue); - result.add(EchoBaseEntityEnum.OperationGearMetadataValue); + result.add(EchoBaseEntityEnum.GearMetadataValue); result.add(EchoBaseEntityEnum.Operation); result.add(EchoBaseEntityEnum.Data); @@ -101,19 +101,19 @@ result.add(EchoBaseEntityEnum.ReferenceDatumType); result.add(EchoBaseEntityEnum.VesselType); result.add(EchoBaseEntityEnum.EchotypeCategory); - result.add(EchoBaseEntityEnum.Localisation); + result.add(EchoBaseEntityEnum.Strata); result.add(EchoBaseEntityEnum.CellMethod); result.add(EchoBaseEntityEnum.AcousticInstrument); result.add(EchoBaseEntityEnum.CategoryType); result.add(EchoBaseEntityEnum.GearType); result.add(EchoBaseEntityEnum.CategoryMeaning); result.add(EchoBaseEntityEnum.Species); - result.add(EchoBaseEntityEnum.GearCaracteristic); + result.add(EchoBaseEntityEnum.GearCharacteristic); result.add(EchoBaseEntityEnum.ReferenceDatum); result.add(EchoBaseEntityEnum.DepthStratum); result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.ReferencingMethod); - result.add(EchoBaseEntityEnum.GearMetadataValue); + result.add(EchoBaseEntityEnum.GearCharacteristicValue); result.add(EchoBaseEntityEnum.GearMetadata); result.add(EchoBaseEntityEnum.Calibration); result.add(EchoBaseEntityEnum.OperationType); @@ -123,18 +123,19 @@ result.add(EchoBaseEntityEnum.Vessel); result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); + result.add(EchoBaseEntityEnum.LengthAgeKey); + result.add(EchoBaseEntityEnum.WeightLengthKey); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.Impacte); result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.OperationEvent); result.add(EchoBaseEntityEnum.OperationMetadata); - result.add(EchoBaseEntityEnum.Station); result.add(EchoBaseEntityEnum.AreaOfOperation); result.add(EchoBaseEntityEnum.CategoryRef); result.add(EchoBaseEntityEnum.DataQuality); result.add(EchoBaseEntityEnum.TSParameters); result.add(EchoBaseEntityEnum.Gear); result.add(EchoBaseEntityEnum.DataProtocol); - result.add(EchoBaseEntityEnum.Moment); result.add(EchoBaseEntityEnum.SpeciesCategory); return result.toArray(new EchoBaseEntityEnum[result.size()]); } @@ -146,7 +147,7 @@ public static EchoBaseEntityEnum[] getReferenceTypesForCopy() { List<EchoBaseEntityEnum> result = Lists.newLinkedList(); - result.add(EchoBaseEntityEnum.Localisation); + result.add(EchoBaseEntityEnum.Strata); result.add(EchoBaseEntityEnum.SexeCategory); result.add(EchoBaseEntityEnum.AgeCategory); result.add(EchoBaseEntityEnum.SizeCategory); 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 2011-12-14 07:14:58 UTC (rev 185) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-12-15 11:01:21 UTC (rev 186) @@ -1,4 +1,5 @@ echobase.common.TSParameters= +echobase.common.aParameter= echobase.common.accuracyEstimate= echobase.common.acknowledgement= echobase.common.acousticDensityUnit= @@ -6,6 +7,7 @@ echobase.common.acquisitionSoftwareVersion= echobase.common.addOffset= echobase.common.admin=Administrateur +echobase.common.age= echobase.common.ageCategory= echobase.common.altCallsign= echobase.common.aquisitionMethod= @@ -15,8 +17,8 @@ echobase.common.authorReference= echobase.common.axis= echobase.common.b= +echobase.common.bParameter= echobase.common.baracoudaCode= -echobase.common.bathymetry= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= @@ -41,7 +43,7 @@ echobase.common.dataAcquisition=dataAcquisition echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données -echobase.common.dataClass= +echobase.common.dataLabel= echobase.common.dataMetadata= echobase.common.dataProcessing=dataProcessing echobase.common.dataProtocol= @@ -67,8 +69,6 @@ echobase.common.endLocality= echobase.common.endPort= echobase.common.endTime= -echobase.common.endTimeFillageEngin= -echobase.common.endValidityDate= echobase.common.enginePower= echobase.common.entityId=Identifiant de l'entité echobase.common.entityModificationLog=Journal des modifications @@ -80,13 +80,16 @@ echobase.common.flagMeanings= echobase.common.frequency= echobase.common.gear= -echobase.common.gearCaracteristic= +echobase.common.gearCharacteristic= +echobase.common.gearCharacteristicValue= echobase.common.gearMetadata= echobase.common.gearMetadataValue= echobase.common.gearShootingEndLatitude= echobase.common.gearShootingEndLongitude= +echobase.common.gearShootingEndTime= echobase.common.gearShootingStartLatitude= echobase.common.gearShootingStartLongitude= +echobase.common.gearShootingStartTime= echobase.common.gearType= echobase.common.genusSpecies= echobase.common.geospatialLatMax= @@ -96,22 +99,23 @@ echobase.common.geospatialVerticalMax= echobase.common.geospatialVerticalMin= echobase.common.geospatialVerticalPositive= +echobase.common.group= echobase.common.history= echobase.common.id=Identifiant echobase.common.imo= echobase.common.impacte= echobase.common.institution=Institution +echobase.common.invalidSince= echobase.common.keywords=Môts clefs -echobase.common.label= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification echobase.common.length= +echobase.common.lengthAgeKey= echobase.common.level= echobase.common.licence= echobase.common.linestring= echobase.common.litteratureReference= echobase.common.litteratureReferences=Références -echobase.common.localisation= echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= @@ -131,14 +135,13 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.moment= echobase.common.mz= echobase.common.name=Nom echobase.common.noiseDesign= echobase.common.notes= echobase.common.numberSampled= echobase.common.operation= -echobase.common.operationGearMetadataValue= +echobase.common.operationEvent= echobase.common.operationMetadata= echobase.common.operationMetadataValue= echobase.common.operationType= @@ -146,6 +149,7 @@ echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= echobase.common.password=Mot de passe +echobase.common.percentAtAge= echobase.common.pingDutyCycle= echobase.common.platform= echobase.common.positive= @@ -169,6 +173,7 @@ echobase.common.sampleDataType= echobase.common.sampleType= echobase.common.sampleWeight= +echobase.common.sampling= echobase.common.scaleFactor= echobase.common.seafloorSubstrate= echobase.common.sexeCategory= @@ -181,14 +186,10 @@ echobase.common.sqlQuery=requête SQL echobase.common.standardName= echobase.common.startDate= -echobase.common.startLatitude= echobase.common.startLocality= -echobase.common.startLongitude= echobase.common.startPort= echobase.common.startTime= -echobase.common.startTimeFillageEngin= -echobase.common.startValidityDate= -echobase.common.station=station +echobase.common.strata= echobase.common.taxonCode= echobase.common.taxonFatherMemocode= echobase.common.taxonSystematicLevel= @@ -230,10 +231,13 @@ echobase.common.transectAbstract= echobase.common.transit=transit echobase.common.type= +echobase.common.unit= echobase.common.units= echobase.common.validMax= echobase.common.validMin= +echobase.common.validSince= echobase.common.vessel=Navire echobase.common.vesselType= echobase.common.voyage=Campagne +echobase.common.weightLengthKey= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)