Author: fdesbois Date: 2009-10-29 20:02:32 +0100 (Thu, 29 Oct 2009) New Revision: 672 Removed: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaBuilder.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaClassFile.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaFile.java Modified: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestReader.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Generator.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Transformer.java branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderHelper.java Log: - Clean imports - Add svn:keywords - Delete old version of JavaBuilder Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Revision Date Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Generator.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Generator.java 2009-10-29 19:02:32 UTC (rev 672) @@ -19,10 +19,6 @@ package org.nuiton.eugene; import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; import java.util.List; import java.util.Properties; Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-10-29 19:02:32 UTC (rev 672) @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java 2009-10-29 19:02:32 UTC (rev 672) @@ -12,7 +12,6 @@ import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2009-10-29 19:02:32 UTC (rev 672) @@ -1,7 +1,6 @@ package org.nuiton.eugene; -import org.nuiton.eugene.*; import java.io.File; import java.util.List; import java.util.Properties; Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/Transformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Deleted: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaBuilder.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaBuilder.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaBuilder.java 2009-10-29 19:02:32 UTC (rev 672) @@ -1,111 +0,0 @@ - -package org.nuiton.eugene.models.object.builder; - -import org.nuiton.eugene.*; -import java.util.Collection; -import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.xml.ObjectModelBuilderHelper; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelElement; -import org.nuiton.eugene.models.object.ObjectModelEnumeration; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelImpl; - -/** - * - * @author fdesbois - * @deprecated use org.nuiton.eugene.java.JavaBuilder - */ -@Deprecated -public abstract class JavaBuilder { - - private static final Log log = LogFactory.getLog(JavaBuilder.class); - - protected ObjectModelImpl objectModel; - - private static ObjectModelBuilderHelper helper = new ObjectModelBuilderHelper(); - - public JavaBuilder(String modelName) { - this.objectModel = new ObjectModelImpl(); - this.objectModel.setName(modelName); - } - - public ObjectModel getModel() { - return objectModel; - } - - public ObjectModelBuilderHelper getHelper() { - return helper; - } - - protected ImportsManager getImportsManager(ObjectModelClassifier classifier) { - ImportsManager manager = objectModel.getExtension(classifier.getQualifiedName(), ImportsManager.class); - if (manager == null) { - manager = new ImportsManager(); - objectModel.addExtension(classifier.getQualifiedName(), manager); - } - return manager; - } - - public void addImportForClassifier(ObjectModelClassifier classifier, String imports) { - ImportsManager manager = getImportsManager(classifier); - manager.addImport(imports); - } - - public void addImportForClassifier(ObjectModelClassifier classifier, Class<?> imports) { - ImportsManager manager = getImportsManager(classifier); - manager.addImport(imports); - } - - public void addClassToModel(ObjectModelClass clazz) { - objectModel.addClass((ObjectModelClassImpl)clazz); - ImportsManager manager = setImports(clazz); - - // extension for superclass - Iterator<ObjectModelClass> it = clazz.getSuperclasses().iterator(); - if (it.hasNext()) { - ObjectModelClass superclass = it.next(); - manager.addImport(superclass.getQualifiedName()); - } - } - - private ImportsManager setImports(ObjectModelClassifier classifier) { - ImportsManager manager = getImportsManager(classifier); - // attributes - for (ObjectModelAttribute attribute : classifier.getAttributes()) { - if (log.isInfoEnabled()) { - log.info("attribute add import for : " + attribute.getType()); - } - setImportsForType(manager, attribute.getType()); - setImportsForType(manager, attribute.getDefaultValue()); - } - // implemented interfaces - for (ObjectModelInterface interfacez : classifier.getInterfaces()) { - manager.addImport(interfacez.getQualifiedName()); - } - // operations - for (ObjectModelOperation operation : classifier.getOperations()) { - setImportsForType(manager, operation.getReturnType()); - for (ObjectModelParameter parameter : operation.getParameters()) { - setImportsForType(manager, parameter.getType()); - } - } - return manager; - } - - private void setImportsForType(ImportsManager manager, String type) { - for (String oneType : GeneratorUtil.getTypesList(type)) { - manager.addImport(oneType); - } - } - - public abstract void build(); -} Deleted: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaClassFile.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaClassFile.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaClassFile.java 2009-10-29 19:02:32 UTC (rev 672) @@ -1,21 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.nuiton.eugene.models.object.builder; - -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; - -/** - * - * @author fdesbois - */ -public class JavaClassFile extends JavaFile<ObjectModelClassImpl, ObjectModelClass> { - - public JavaClassFile(ObjectModelClass clazz) { - super(clazz); - } - -} Deleted: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaFile.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaFile.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/builder/JavaFile.java 2009-10-29 19:02:32 UTC (rev 672) @@ -1,40 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.nuiton.eugene.models.object.builder; - -import java.io.File; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; - -/** - * - * @author fdesbois - */ -public abstract class JavaFile<O extends ObjectModelClassifierImpl, I extends ObjectModelClassifier> { - - protected O classifier; - - protected ImportsManager importsManager; - - public JavaFile(I classifier) { - this.classifier = (O) classifier; - this.importsManager = new ImportsManager(); - } - - public I getClassifier() { - return (I) this.classifier; - } - - public void addImport(String imports) { - importsManager.addImport(imports); - } - - public void addImport(Class<?> imports) { - importsManager.addImport(imports); - } - -} Modified: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderHelper.java =================================================================== --- branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderHelper.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderHelper.java 2009-10-29 19:02:32 UTC (rev 672) @@ -21,13 +21,6 @@ import org.nuiton.eugene.models.object.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; -import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; -import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; /** * class that help to build java class or interface object. Property changes on: branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderHelper.java ___________________________________________________________________ Added: svn:keywords + Author Revision Date Property changes on: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Modified: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java =================================================================== --- branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2009-10-29 19:02:32 UTC (rev 672) @@ -8,8 +8,15 @@ /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ /** + * TestBuilder * + * Created: 25 oct. 2009 + * * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ */ public class TestBuilder extends JavaBuilder { Property changes on: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Revision Date Modified: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestReader.java =================================================================== --- branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2009-10-29 18:53:26 UTC (rev 671) +++ branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2009-10-29 19:02:32 UTC (rev 672) @@ -2,7 +2,6 @@ package org.nuiton.eugene.test.generator; import java.io.File; -import org.nuiton.eugene.models.object.builder.JavaBuilder; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.object.ObjectModel; Property changes on: branches/1.1.0-Javabuilder/eugene-test/src/main/java/org/nuiton/eugene/test/generator/TestReader.java ___________________________________________________________________ Added: svn:keywords + Author Revision Date