Author: tchemit Date: 2008-02-02 17:05:05 +0000 (Sat, 02 Feb 2008) New Revision: 606 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO finir la derni?\195?\168re m?\195?\169thode Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 17:04:35 UTC (rev 605) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 17:05:05 UTC (rev 606) @@ -17,20 +17,20 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.Random; import java.util.UUID; +import java.util.List; -import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; - public class MetaDataGenerator { - Random r = new Random(); + java.util.Random r = new java.util.Random(); /* * private static boolean descriptorFieldsInit = false; private static @@ -42,7 +42,7 @@ */ public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion, MetaData parentData) { + MetaData parentVersion, MetaData parentData) { MetaData me = generateMetaDataEntity(uuid, version, parentVersion); if (parentData != null) { me.setParentDataUuid(parentData.getUuid()); @@ -52,7 +52,7 @@ } public MetaData generateMetaDataEntity(String uuid, Version version, - MetaData parentVersion) { + MetaData parentVersion) { MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { @@ -95,19 +95,58 @@ public MetaData generateMetaDataEntity() { return generateMetaDataEntity(UUID.randomUUID().toString(), - new Version("1.0")); + Version.valueOf("1.0")); } public MetaData[] generateVersionnedMetaDataEntity() { + + Version[] versions = VersionGenerator.getInstance().generateVersions(); String uuid = UUID.randomUUID().toString(); - MetaData[] mes = new MetaData[4]; - mes[0] = generateMetaDataEntity(uuid, new Version("1.0")); - mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]); - mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]); - mes[3] = generateMetaDataEntity(uuid, new Version("2.0"), mes[2]); + int nb = versions.length; + MetaData[] mes = new MetaData[nb]; + mes[0] = generateMetaDataEntity(uuid, versions[0]); + for (int i = 1; i < nb; i++) { + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); + } return mes; } + public MetaData[] generateVersionnedMetaDataEntity(int nbMax) { + + Version[] versions = VersionGenerator.getInstance().generateVersions(nbMax); + String uuid = UUID.randomUUID().toString(); + + int nb = versions.length; + MetaData[] mes = new MetaData[nb]; + + mes[0] = generateMetaDataEntity(uuid, versions[0]); + for (int i = 1; i < nb; i++) { + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); + } + return mes; + } + + public MetaData[] generateVersionnedMetaData(Version mandatory) { + + Version[] versions = VersionGenerator.getInstance().generateVersions(); + String uuid = UUID.randomUUID().toString(); + + int nb = versions.length; + + List<MetaData> mes = new ArrayList<MetaData>(); + + MetaData current = generateMetaDataEntity(uuid, versions[0]); + mes.add(current); + + for (int i = 1; i < nb; i++) { + + MetaData newMeta = generateMetaDataEntity(uuid, versions[i], current); + mes.add(newMeta); + current = newMeta; + } + return mes.toArray(new MetaData[mes.size()]); + } + }