Author: tchemit Date: 2011-11-11 03:10:13 +0100 (Fri, 11 Nov 2011) New Revision: 33 Url: http://forge.codelutin.com/repositories/revision/echobase/33 Log: - Begin of model - improve database meta api Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 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/entities/meta/ColumnMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java 2011-11-09 19:41:58 UTC (rev 32) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java 2011-11-11 02:10:13 UTC (rev 33) @@ -30,17 +30,17 @@ import java.util.Date; /** -* Define the meta data. -* -* @author tchemit <chemit@codelutin.com> -* @since 0.1 -*/ + * Define the meta data. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ public class ColumnMeta implements Serializable { protected static ColumnMeta newMeta(String name, String label, Class<?> type) { return new ColumnMeta(name, label, type); } - + private static final long serialVersionUID = 1L; protected String name; @@ -73,6 +73,10 @@ return type; } + public String getTypeSimpleName() { + return type.getSimpleName(); + } + public String getColumnType() { String result = "string"; if (boolean.class.equals(type)) { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-09 19:41:58 UTC (rev 32) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-11 02:10:13 UTC (rev 33) @@ -78,6 +78,18 @@ return result; } + public TableMeta getTable(EchoBaseEntityEnum tableName) { + Preconditions.checkNotNull(tableName); + TableMeta result = null; + for (TableMeta tableMeta : getTables()) { + if (tableName.equals(tableMeta.getEntityEnum())) { + result = tableMeta; + break; + } + } + return result; + } + @Override public Iterator<TableMeta> iterator() { return getTables().iterator(); 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-11-09 19:41:58 UTC (rev 32) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-11 02:10:13 UTC (rev 33) @@ -1,22 +1,188 @@ +echobase.common.acknowledgement= +echobase.common.acousticDensityUnit= +echobase.common.acousticInstrument= +echobase.common.acquisitionSoftwareVersion= +echobase.common.addOffset= echobase.common.admin=Administrateur +echobase.common.ageClass=ageClass +echobase.common.altCallsign= +echobase.common.areaOfOperation=areaOfOperation +echobase.common.areaOfOperationName= +echobase.common.author= +echobase.common.authorEmail= +echobase.common.axis= +echobase.common.binSizePingAxis= +echobase.common.binSizeRangeAxis= +echobase.common.binUnitsPingAxis= +echobase.common.calendar= +echobase.common.calibration=calibration +echobase.common.calibrationAccuracyEstimate= +echobase.common.calibrationAquisitionMethod= +echobase.common.calibrationDate= +echobase.common.calibrationProcessingMethod= +echobase.common.calibrationReport= +echobase.common.callsign= +echobase.common.cell=cell +echobase.common.cellMethods= +echobase.common.cellName= +echobase.common.cellType= +echobase.common.citation= +echobase.common.classCode= +echobase.common.classGroupId= +echobase.common.classMeaning= +echobase.common.comment= +echobase.common.data=data +echobase.common.dataAcquisition=dataAcquisition +echobase.common.dataCentre= +echobase.common.dataCentreEmail= +echobase.common.dataMetadata= +echobase.common.dataName= +echobase.common.dataProcessing=dataProcessing +echobase.common.dataQuality=dataQuality +echobase.common.dataQualityFlagMeaning= +echobase.common.dataQualityFlagNote= +echobase.common.dataQualityFlagValue= +echobase.common.dataValue= +echobase.common.dateCreated= +echobase.common.datum= +echobase.common.depthStratum=depthStratum +echobase.common.depthStratumId= +echobase.common.depthStratumMeaning= echobase.common.description=Description +echobase.common.digitThreshold= +echobase.common.distributionStatement= +echobase.common.eIThreshold= echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= +echobase.common.echosounderSoundSpeed= echobase.common.email=Courriel +echobase.common.endPort= echobase.common.entityId=Identifiant de l'entité echobase.common.entityModificationLog=Journal des modifications echobase.common.entityModificationLogDTO= echobase.common.entityType=Type de l'entité echobase.common.exportQuery=Requête d'export echobase.common.exportQueryDTO= +echobase.common.fillValue= +echobase.common.frequency= +echobase.common.genusSpecies= +echobase.common.geospatialLatMax= +echobase.common.geospatialLatMin= +echobase.common.geospatialLonMax= +echobase.common.geospatialLonMin= +echobase.common.geospatialVerticalMax= +echobase.common.geospatialVerticalMin= +echobase.common.geospatialVerticalPositive= +echobase.common.history= +echobase.common.iMO= echobase.common.id=Identifiant +echobase.common.institution= +echobase.common.keywords= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification +echobase.common.lengthClass=lengthClass +echobase.common.licence= +echobase.common.linestring= +echobase.common.loggedDataDatatype= +echobase.common.loggedDataFormat= +echobase.common.longName= +echobase.common.metadata=metadata +echobase.common.metadataClass=metadataClass +echobase.common.mission=mission +echobase.common.missionAbstract= +echobase.common.missionName= echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.name=Nom +echobase.common.notes= +echobase.common.operator= +echobase.common.organisationLevelAcknowledgements= +echobase.common.organisationReferences= +echobase.common.parentCell= echobase.common.password=Mot de passe +echobase.common.pingDutyCycle= +echobase.common.platform= +echobase.common.positive= +echobase.common.principalInvestigator= +echobase.common.principalInvestigatorEmail= +echobase.common.processingDescription= +echobase.common.processingSoftwareVersion= +echobase.common.processingTemplate= +echobase.common.project= +echobase.common.referenceDatum=referenceDatum +echobase.common.referenceMeaning= +echobase.common.referenceType= +echobase.common.referenceValue= +echobase.common.references= +echobase.common.referencingMethod= +echobase.common.region=region +echobase.common.regionName= +echobase.common.relatedActivity= +echobase.common.scaleFactor= +echobase.common.soundSpeedCalculations= +echobase.common.sounderConstant= +echobase.common.source= +echobase.common.speciesClass=speciesClass echobase.common.sqlQuery=Requête SQL -echobase.common.survey=Campagne +echobase.common.standardName= +echobase.common.startPort= +echobase.common.station=station +echobase.common.surface= +echobase.common.timeCoverageEnd= +echobase.common.timeCoverageStart= +echobase.common.title= +echobase.common.transceiverAcquisitionAbsorption= +echobase.common.transceiverAcquisitionAbsorptionDescription= +echobase.common.transceiverAcquisitionGain= +echobase.common.transceiverAcquisitionPower= +echobase.common.transceiverAcquisitionPulseLength= +echobase.common.transceiverAcquisitionSacorrection= +echobase.common.transceiverAperture= +echobase.common.transceiverBeams= +echobase.common.transceiverFirmware= +echobase.common.transceiverManufacturer= +echobase.common.transceiverModel= +echobase.common.transceiverProcessingAbsorption= +echobase.common.transceiverProcessingAbsorptionDescription= +echobase.common.transceiverProcessingGain= +echobase.common.transceiverProcessingSacorrection= +echobase.common.transceiverSerial= +echobase.common.transducerAcquisitionBeamAngleAlongship= +echobase.common.transducerAcquisitionBeamAngleAthwartship= +echobase.common.transducerAcquisitionPsi= +echobase.common.transducerAperture= +echobase.common.transducerBeams= +echobase.common.transducerDepth= +echobase.common.transducerLocation= +echobase.common.transducerModel= +echobase.common.transducerOrientation= +echobase.common.transducerProcessingBeamAngleAlongship= +echobase.common.transducerProcessingBeamAngleAthwartship= +echobase.common.transducerProcessingPsi= +echobase.common.transducerSerial= +echobase.common.transect=transect +echobase.common.transectAbstract= +echobase.common.transit=transit +echobase.common.transitDescription= +echobase.common.transitEndLocatlity= +echobase.common.transitEndTime= +echobase.common.transitStartLocality= +echobase.common.transitStartTime= +echobase.common.units= echobase.common.user=Utilisateur +echobase.common.validMax= +echobase.common.validMin= +echobase.common.vessel=Navire +echobase.common.vesselCode= +echobase.common.vesselEnginePower= +echobase.common.vesselLength= +echobase.common.vesselName= +echobase.common.vesselNoiseDesign= +echobase.common.vesselTonnage= +echobase.common.vesselType= +echobase.common.voyage=Campagne +echobase.common.voyageDescription= +echobase.common.voyageEndDate= +echobase.common.voyageName= +echobase.common.voyageStartDate= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)