Author: fdesbois Date: 2009-11-13 11:19:18 +0100 (Fri, 13 Nov 2009) New Revision: 714 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Transformer.java Log: Change transform method to have init call. Abstract transform method is now without input parameter (must be set before calling). Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java 2009-11-13 08:52:04 UTC (rev 713) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java 2009-11-13 10:19:18 UTC (rev 714) @@ -20,11 +20,9 @@ */ package org.nuiton.eugene; -import java.io.IOException; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.*; -import java.io.File; import java.util.Collection; /** @@ -62,11 +60,9 @@ * {@link #transformFromInterface(ObjectModelInterface)} et enfin sur chaque * enumeration en appelant la methode * {@link #transformFromEnumeration(ObjectModelEnumeration)} - * - * @param model inputModel to transform */ @Override - public void transform(ObjectModel model) { + public void transform() { transformFromElement(getModel(), ObjectModelType.OBJECT_MODEL); Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2009-11-13 08:52:04 UTC (rev 713) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2009-11-13 10:19:18 UTC (rev 714) @@ -146,9 +146,9 @@ /** * Transform an input model and use destination directory to put generated files for output generator. - * This method initialize the transformer with ${@link #init(org.nuiton.eugene.models.Model) } method then - * transform the input model into an other model with ${@link #transform(org.nuiton.eugene.models.Model) method - * and finally generate from the output model, using the output generator and the destination directory. + * This method initialize the transformer then transform the input model into an other model + * with ${@link #transform(org.nuiton.eugene.models.Model) method and finally generate from + * the output model, using the output generator and the destination directory. * @param model input model to transform and generate * @param destDir destination directory to put generated files * @throws IOException @@ -156,17 +156,26 @@ */ @Override public void generate(I model, File destDir) throws IOException { - init(model); transform(model); getOutputGenerator().generate(getOutputModel(), destDir); } /** + * Transformation method from an input Model. This method also initialize input model, output model + * and output generator with ${@link #init(org.nuiton.eugene.models.Model) } method. + * @param model input model + * @since 2.0.0 + */ + public void transform(I model) { + init(model); + transform(); + } + + /** * Method to override for the transformation. Initialization (InputModel, OutputModel, OutputGenerator) - * is made before transformation calling. This method only transform an input model into an output model. + * is made before transformation call. This method only transform an input model into an output model. * No generation is done neither outputGenerator call. - * @param model input model to transform * @since 2.0.0 */ - public abstract void transform(I model); + protected abstract void transform(); }