Author: tchemit Date: 2010-08-12 16:51:27 +0200 (Thu, 12 Aug 2010) New Revision: 951 Url: http://nuiton.org/repositories/revision/eugene/951 Log: do NOT expose method to modify model from contract Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 14:51:27 UTC (rev 951) @@ -160,10 +160,23 @@ builder.addImport(classifier, imports.getName()); } + /** + * Adds a tag value to the model. + * + * @param name name of the tag value + * @param value value of the tag value + */ public void addTagValue(String name, String value) { builder.addTagValue(name, value); } + /** + * Adds a tag value to the given {@code element}. + * + * @param element the element on which the tag value is attached. + * @param name the name of the tag value + * @param value the value of the tag value + */ public void addTagValue(ObjectModelElement element, String name, String value) { builder.addTagValue(element, name, value); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-12 14:51:27 UTC (rev 951) @@ -116,16 +116,16 @@ */ boolean hasTagValue(String tagValue); - /** - * Adds the given {@code value} associated to the {@code tagValue}. - * - * Note: If a previous tag value was definied, then it will be replaced. - * - * @param tagValue the name of the tag value - * @param value the value to associate - * @since 2.1.2 - */ - void addTagValue(String tagValue, String value); +// /** +// * Adds the given {@code value} associated to the {@code tagValue}. +// * +// * Note: If a previous tag value was definied, then it will be replaced. +// * +// * @param tagValue the name of the tag value +// * @param value the value to associate +// * @since 2.1.2 +// */ +// void addTagValue(String tagValue, String value); /** * Return if this element has static declaration, only valid when Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-12 14:51:27 UTC (rev 951) @@ -45,6 +45,7 @@ /** * Le model associé au transformer est le model d'entree. Le modele de sortie * peut etre initialiser via la methode {@link Transformer#initOutputModel()}. + * * Il est également possible de surcharger la methode {@link #debugOutputModel()} * pour verifier le resultat de la transformation. * Par defaut la methode appelle la methode @@ -57,22 +58,24 @@ * {@link #transformFromEnumeration(ObjectModelEnumeration)} */ @Override - public void transform() { + public void transform() { + ObjectModel model = getModel(); + // transformFromModel - transformFromElement(getModel(), ObjectModelType.OBJECT_MODEL); + transformFromElement(model, ObjectModelType.OBJECT_MODEL); // transformFromClassifier - transformFromElements(getModel().getClassifiers(), ObjectModelType.OBJECT_MODEL_CLASSIFIER); + transformFromElements(model.getClassifiers(), ObjectModelType.OBJECT_MODEL_CLASSIFIER); // transformFromInterface - transformFromElements(getModel().getInterfaces(), ObjectModelType.OBJECT_MODEL_INTERFACE); + transformFromElements(model.getInterfaces(), ObjectModelType.OBJECT_MODEL_INTERFACE); // transformFromClass - transformFromElements(getModel().getClasses(), ObjectModelType.OBJECT_MODEL_CLASS); + transformFromElements(model.getClasses(), ObjectModelType.OBJECT_MODEL_CLASS); // transformFromEnumeration - transformFromElements(getModel().getEnumerations(), ObjectModelType.OBJECT_MODEL_ENUMERATION); + transformFromElements(model.getEnumerations(), ObjectModelType.OBJECT_MODEL_ENUMERATION); debugOutputModel(); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -181,7 +181,15 @@ return tagValues.containsKey(tagValue); } - @Override + /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ public void addTagValue(String tagValue, String value) { String oldValue = getTagValue(tagValue); if (StringUtils.isNotEmpty(oldValue)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -479,7 +479,15 @@ return tagValue == null ? null : tagValues.get(tagValue); } - @Override + /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ public void addTagValue(String tagValue, String value) { String oldValue = getTagValue(tagValue); if (StringUtils.isNotEmpty(oldValue)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -121,7 +121,14 @@ return modelTagValues; } - @Override + /** + * Adds the given {@code value} associated to the {@code key}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param key the name of the tag value + * @param value the value to associate + */ public void addTagValue(String key, String value) { modelTagValues.put(key, value); }
participants (1)
-
tchemit@users.nuiton.org