Author: tchemit Date: 2008-02-02 18:49:02 +0000 (Sat, 02 Feb 2008) New Revision: 608 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/VersionGenerator.java Log: utilisation g?\195?\169n?\195?\169rateur de versions TODO il faut synchroniser les g?\195?\169n?\195?\169rateurs! 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 18:48:12 UTC (rev 607) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-02 18:49:02 UTC (rev 608) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import java.util.List; public class MetaDataGenerator { @@ -130,23 +129,17 @@ public MetaData[] generateVersionnedMetaData(Version mandatory) { - Version[] versions = VersionGenerator.getInstance().generateVersions(); + Version[] versions = VersionGenerator.getInstance().generateVersions(mandatory); String uuid = UUID.randomUUID().toString(); int nb = versions.length; + MetaData[] mes = new MetaData[nb]; - List<MetaData> mes = new ArrayList<MetaData>(); - - MetaData current = generateMetaDataEntity(uuid, versions[0]); - mes.add(current); - + mes[0] = generateMetaDataEntity(uuid, versions[0]); for (int i = 1; i < nb; i++) { - - MetaData newMeta = generateMetaDataEntity(uuid, versions[i], current); - mes.add(newMeta); - current = newMeta; + mes[i] = generateMetaDataEntity(uuid, versions[i], mes[i - 1]); } - return mes.toArray(new MetaData[mes.size()]); + return mes; } } Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-02 18:48:12 UTC (rev 607) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-02 18:49:02 UTC (rev 608) @@ -20,6 +20,10 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import java.util.Random; +import java.util.List; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; /** @@ -63,6 +67,17 @@ return generateVersions(nb); } + public Version[] generateVersions(Version mandatory) { + int nb = generateNotNullAbsInt(MAX_NB_VERSIONS); + Version[] versions = generateVersions(nb); + List<Version> list = new ArrayList<Version>(Arrays.asList(versions)); + if (!list.contains(mandatory)) { + list.add(mandatory); + Collections.sort(list); + } + return list.toArray(new Version[list.size()]); + } + public Version[] generateVersions(int nb) { Version[] result = new Version[nb]; result[0] = generateVersion();