Author: glandais Date: 2008-03-08 00:37:54 +0000 (Sat, 08 Mar 2008) New Revision: 1310 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java Log: "Simplified" Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-08 00:28:59 UTC (rev 1309) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-08 00:37:54 UTC (rev 1310) @@ -29,8 +29,16 @@ import org.codelutin.util.MD5; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.SimpleComposite; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.composite.Codes; +import fr.cemagref.simexplorer.is.entities.composite.Components; +import fr.cemagref.simexplorer.is.entities.composite.ConstantValues; +import fr.cemagref.simexplorer.is.entities.composite.Constants; +import fr.cemagref.simexplorer.is.entities.composite.Descriptors; +import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; +import fr.cemagref.simexplorer.is.entities.composite.Libraries; +import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; +import fr.cemagref.simexplorer.is.entities.composite.Structures; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.Constant; @@ -101,7 +109,7 @@ /** The cs. */ private static int cs; - + private static int counter = 0; /** The randomstrings. */ @@ -186,7 +194,7 @@ metaData.setHash(shortString()); metaData.setLatest(true); - List<Descriptor> descriptors = new ArrayList<Descriptor>(); + Descriptors descriptors = new Descriptors(); for (int i = 0, max = 1 + r.nextInt(12); i < max; i++) { descriptors.add(new Descriptor(shortString(), shortString())); } @@ -202,22 +210,12 @@ element.setMetaData(metaData); } - /** - * Generate array. - * - * @param <T> Class in array - * - * @param clazz the clazz - * - * @return the set< t> - * - * @throws Exception the exception - */ - public <T extends Entity> List<T> generateArray(Class<T> clazz) throws Exception { - List<T> elements = new ArrayList<T>(); + public <SC extends SimpleComposite<T>, T extends Entity> SC generateComposite(Class<SC> compositeClass, + Class<T> elementClass) throws Exception { + SC elements = compositeClass.newInstance(); int i = 3 + r.nextInt(2); for (int j = 0; j < i; j++) { - T element = clazz.newInstance(); + T element = elementClass.newInstance(); if (element instanceof LoggableElement) { update((LoggableElement) element); } @@ -236,16 +234,18 @@ public ExplorationApplication generateRandomEA() throws Exception { ExplorationApplication ea = new ExplorationApplication(); update(ea); - List<ExplorationData> datas = generateArray(ExplorationData.class); - for (ExplorationData object : datas) { + + ExplorationDatas explorationDatas = generateComposite(ExplorationDatas.class, ExplorationData.class); + for (ExplorationData object : explorationDatas) { processExplorationData(object); } - ea.setExplorations(SimpleComposite.castList(datas)); - List<Component> components = generateArray(Component.class); + ea.setExplorations(explorationDatas); + + Components components = generateComposite(Components.class, Component.class); for (Component object : components) { processComponent(object); } - ea.setComponents(SimpleComposite.castList(components)); + ea.setComponents(components); return ea; } @@ -257,21 +257,21 @@ * @throws Exception the exception */ private void processComponent(Component component) throws Exception { - List<Constant> constants = generateArray(Constant.class); + Constants constants = generateComposite(Constants.class, Constant.class); for (Constant constant : constants) { processConstant(constant); } component.setConstants(constants); - component.setStructures(new ArrayList<Structure>()); + component.setStructures(new Structures()); - List<Code> codes = generateArray(Code.class); + Codes codes = generateComposite(Codes.class, Code.class); for (Code code : codes) { processCode(code); } component.setCodes(codes); - List<Library> libraries = generateArray(Library.class); + Libraries libraries = generateComposite(Libraries.class, Library.class); for (Library library : libraries) { processLibrary(library); } @@ -337,11 +337,11 @@ explorationData.setResult(result); // explorationData.getMetaData().getAttachments().add(generateAttachment()); - List<ConstantValue> constantValues = generateArray(ConstantValue.class); + ConstantValues constantValues = generateComposite(ConstantValues.class, ConstantValue.class); for (ConstantValue constantValue : constantValues) { processConstantValue(constantValue); } - explorationData.setConstantValues(SimpleComposite.castList(constantValues)); + explorationData.setConstantValues(constantValues); }