Author: glandais Date: 2008-03-08 00:27:21 +0000 (Sat, 08 Mar 2008) New Revision: 1306 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java Log: Using composite types Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-08 00:27:01 UTC (rev 1305) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-03-08 00:27:21 UTC (rev 1306) @@ -17,12 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; +import fr.cemagref.simexplorer.is.entities.composite.Codes; +import fr.cemagref.simexplorer.is.entities.composite.Constants; +import fr.cemagref.simexplorer.is.entities.composite.Libraries; +import fr.cemagref.simexplorer.is.entities.composite.Structures; /** * The Class Component. @@ -33,23 +35,23 @@ private static final long serialVersionUID = -1759921918565071510L; /** The constants. */ - List<Constant> constants; + Constants constants; /** The structures. */ - List<Structure> structures; + Structures structures; /** The codes. */ - List<Code> codes; + Codes codes; /** The libraries. */ - List<Library> libraries; + Libraries libraries; /** * Gets the constants. * * @return the constants */ - public List<Constant> getConstants() { + public Constants getConstants() { return constants; } @@ -58,7 +60,7 @@ * * @param constants the new constants */ - public void setConstants(List<Constant> constants) { + public void setConstants(Constants constants) { this.constants = constants; } @@ -67,7 +69,7 @@ * * @return the structures */ - public List<Structure> getStructures() { + public Structures getStructures() { return structures; } @@ -76,7 +78,7 @@ * * @param structures the new structures */ - public void setStructures(List<Structure> structures) { + public void setStructures(Structures structures) { this.structures = structures; } @@ -85,7 +87,7 @@ * * @return the codes */ - public List<Code> getCodes() { + public Codes getCodes() { return codes; } @@ -94,7 +96,7 @@ * * @param codes the new codes */ - public void setCodes(List<Code> codes) { + public void setCodes(Codes codes) { this.codes = codes; } @@ -103,7 +105,7 @@ * * @return the libraries */ - public List<Library> getLibraries() { + public Libraries getLibraries() { return libraries; } @@ -112,7 +114,7 @@ * * @param libraries the new libraries */ - public void setLibraries(List<Library> libraries) { + public void setLibraries(Libraries libraries) { this.libraries = libraries; } @@ -122,7 +124,10 @@ @Override public List<Entity> getChildren() { List<Entity> directChildren = new ArrayList<Entity>(); - directChildren.addAll(libraries); + directChildren.add(constants); + directChildren.add(structures); + directChildren.add(codes); + directChildren.add(libraries); return directChildren; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-08 00:27:01 UTC (rev 1305) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-03-08 00:27:21 UTC (rev 1306) @@ -22,7 +22,9 @@ import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.SimpleComposite; +import fr.cemagref.simexplorer.is.entities.composite.Components; +import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; +import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; /** * The Class ExplorationApplication. @@ -33,17 +35,17 @@ private static final long serialVersionUID = 122049347724394193L; /** The explorations. */ - private SimpleComposite<ExplorationData> explorations; + private ExplorationDatas explorations; /** The components. */ - private SimpleComposite<Component> components; + private Components components; /** * Gets the explorations. * * @return the explorations */ - public SimpleComposite<ExplorationData> getExplorations() { + public ExplorationDatas getExplorations() { return explorations; } @@ -52,7 +54,7 @@ * * @param explorations the new explorations */ - public void setExplorations(SimpleComposite<ExplorationData> explorations) { + public void setExplorations(ExplorationDatas explorations) { this.explorations = explorations; } @@ -61,7 +63,7 @@ * * @return the components */ - public SimpleComposite<Component> getComponents() { + public Components getComponents() { return components; } @@ -70,7 +72,7 @@ * * @param components the new components */ - public void setComponents(SimpleComposite<Component> components) { + public void setComponents(Components components) { this.components = components; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-08 00:27:01 UTC (rev 1305) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-03-08 00:27:21 UTC (rev 1306) @@ -22,7 +22,7 @@ import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.SimpleComposite; +import fr.cemagref.simexplorer.is.entities.composite.ConstantValues; /** * The Class ExplorationData. @@ -33,7 +33,7 @@ private static final long serialVersionUID = -6439801837608358754L; /** The values map. */ - private SimpleComposite<ConstantValue> constantValues; + private ConstantValues constantValues; /** The result. */ private Result result; @@ -46,7 +46,7 @@ * @return the constant value */ private ConstantValue findConstantValue(Constant c) { - for (ConstantValue constantValue : constantValues.getElements()) { + for (ConstantValue constantValue : constantValues) { if (c.equals(constantValue.getConstant())) { return constantValue; } @@ -65,7 +65,7 @@ if (constantValue == null) { constantValue = new ConstantValue(); constantValue.setConstant(c); - constantValues.getElements().add(constantValue); + constantValues.add(constantValue); } constantValue.setValue(value); } @@ -108,7 +108,7 @@ * * @return the values map */ - public SimpleComposite<ConstantValue> getConstantValues() { + public ConstantValues getConstantValues() { return constantValues; } @@ -117,7 +117,7 @@ * * @param constantValues the new values map */ - public void setConstantValues(SimpleComposite<ConstantValue> constantValues) { + public void setConstantValues(ConstantValues constantValues) { this.constantValues = constantValues; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-08 00:27:01 UTC (rev 1305) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-03-08 00:27:21 UTC (rev 1306) @@ -21,7 +21,6 @@ import java.util.List; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; /** The Class Library. */ public class Library extends LoggableElement { @@ -59,7 +58,7 @@ @Override public List<Entity> getChildren() { List<Entity> children = new ArrayList<Entity>(); - children.addAll(getAttachments()); + children.add(getAttachments()); return children; } Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-08 00:27:01 UTC (rev 1305) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-03-08 00:27:21 UTC (rev 1306) @@ -22,8 +22,10 @@ import fr.cemagref.simexplorer.is.entities.Composite; import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.composite.Attachments; +import fr.cemagref.simexplorer.is.entities.composite.Descriptors; +import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** @@ -38,10 +40,10 @@ private String description; /** The descriptors. */ - private List<Descriptor> descriptors; + private Descriptors descriptors; /** The attachments. */ - private List<Attachment> attachments; + private Attachments attachments; /** The metadata IS, managed only by SimExplorer-IS. */ private MetaData metadataIS; @@ -57,7 +59,6 @@ return getName(); } - /** * Gets all children of LoggableElement type. * @@ -74,7 +75,7 @@ getLEChildren(child, list); } } - + /** * Gets all children of LoggableElement type. * @@ -127,7 +128,7 @@ * * @return the descriptors */ - public List<Descriptor> getDescriptors() { + public Descriptors getDescriptors() { return descriptors; } @@ -136,7 +137,7 @@ * * @param descriptors the descriptors to set */ - public void setDescriptors(List<Descriptor> descriptors) { + public void setDescriptors(Descriptors descriptors) { this.descriptors = descriptors; } @@ -145,9 +146,9 @@ * * @return the attachments */ - public List<Attachment> getAttachments() { + public Attachments getAttachments() { if (attachments == null) { - attachments = new ArrayList<Attachment>(); + attachments = new Attachments(); } return attachments; } @@ -190,7 +191,7 @@ * * @param attachments the attachments to set */ - public void setAttachments(List<Attachment> attachments) { + public void setAttachments(Attachments attachments) { this.attachments = attachments; }