Author: agiraudet Date: 2013-04-18 15:28:56 +0200 (Thu, 18 Apr 2013) New Revision: 590 Url: http://nuiton.org/projects/sandbox/repository/revisions/590 Log: suppression du code-commentaire et utilisation de File.separator Modified: testEugeneUML-YAML/ testEugeneUML-YAML/testeugene/testgenerator/src/main/java/org/nuiton/testeugene/generator/PlantumlGenerator.java Property changes on: testEugeneUML-YAML ___________________________________________________________________ Added: svn:ignore + *.iml *.ipr .idea *~ Modified: testEugeneUML-YAML/testeugene/testgenerator/src/main/java/org/nuiton/testeugene/generator/PlantumlGenerator.java =================================================================== --- testEugeneUML-YAML/testeugene/testgenerator/src/main/java/org/nuiton/testeugene/generator/PlantumlGenerator.java 2013-04-18 12:18:10 UTC (rev 589) +++ testEugeneUML-YAML/testeugene/testgenerator/src/main/java/org/nuiton/testeugene/generator/PlantumlGenerator.java 2013-04-18 13:28:56 UTC (rev 590) @@ -20,70 +20,6 @@ @Override public void generateFromModel(Writer output, ObjectModel input) throws IOException { - /*//log - FileWriter log = new FileWriter("/tmp/generateFromModel.PlantumlGenerator.log.txt"); - log.write("\n### Classes\n"); - for(ObjectModelElement OME : input.getClasses()) - { - log.write(OME.getStereotypes()+" : "+OME.getName()+"\n"); - } - log.write("\n### Interfaces\n"); - for(ObjectModelElement OME : input.getInterfaces()) - { - log.write(OME.getStereotypes()+" : "+OME.getName()+"\n"); - } - log.write("\n### Enumerations\n"); - for(ObjectModelElement OME : input.getEnumerations()) - { - log.write(OME.getStereotypes()+" : "+OME.getName()+"\n"); - } - log.write("\n### Classifiers\n"); - for(ObjectModelElement OME : input.getClassifiers()) - { - log.write(OME.getStereotypes()+" : "+OME.getName()+"\n"); - } - log.write("\n### Attributes\n"); - for(ObjectModelClassifier classifer : input.getClassifiers()) - { - log.write("\n--- "+classifer.getName()+" ---\n"); - for(ObjectModelAttribute attribute : classifer.getAttributes()) - { - //log.write("getComments : "+attribute.getComments()+"\n");//NullPointerException - //log.write("getDeclaringElement : "+attribute.getDeclaringElement()+"\n");//NullPointerException - //log.write("getDescription : "+attribute.getDescription()+"\n");//NullPointerException - log.write("getDocumentation : "+attribute.getDocumentation()+"\n"); - log.write("getName : "+attribute.getName()+"\n"); - //log.write("getSourceDocumentation : "+attribute.getSourceDocumentation()+"\//NullPointerException - log.write("getStereotypes : "+attribute.getStereotypes()+"\n"); - log.write("getTagValues : "+attribute.getTagValues()+"\n"); - log.write("isStatic : "+attribute.isStatic()+"\n"); - log.write("getDefaultValue : "+attribute.getDefaultValue()+"\n"); - log.write("getMaxMultiplicity : "+attribute.getMaxMultiplicity()+"\n"); - log.write("getMinMultiplicity : "+attribute.getMinMultiplicity()+"\n"); - log.write("getType : "+attribute.getType()+"\n"); - log.write("isOrdered : "+attribute.isOrdered()+"\n"); - log.write("isUnique : "+attribute.isUnique()+"\n"); - log.write("getAssociationClass : "+attribute.getAssociationClass()+"\n"); - log.write("attribute.getClassifier : "+attribute.getClassifier()+"\n"); - log.write("getReverseAttribute : "+attribute.getReverseAttribute()+"\n"); - log.write("getReverseMaxMultiplicity : "+attribute.getReverseMaxMultiplicity()+"\n"); - log.write("getType : "+attribute.getType()+"\n"); - log.write("getVisibility : "+attribute.getVisibility()+"\n"); - log.write("hasAssociationClass : "+attribute.hasAssociationClass()+"\n"); - log.write("isAggregate : "+attribute.isAggregate()+"\n"); - log.write("isComposite : "+attribute.isComposite()+"\n"); - log.write("isFinal : "+attribute.isFinal()+"\n"); - log.write("isNavigable : "+attribute.isNavigable()+"\n"); - log.write("isStatic : "+attribute.isStatic()+"\n"); - log.write("referenceClassifier : "+attribute.referenceClassifier()+"\n"); - log.write("\n\n"); - // isIndexed() not implemented ? - } - } - log.close(); - //log*/ - - List<String> namesEntity = new LinkedList<String>(); Map<String,LinkedList<String>> linksEntity = new HashMap<String,LinkedList<String>>(); @@ -100,7 +36,7 @@ namesEntity.add(OME.getName()); } - // utiliser le systeme de templates + // utiliser le systeme de templates a l'avenir // debut du fichier output.write("@startuml\n\n"); @@ -224,11 +160,11 @@ public void applyTemplate(ObjectModel model, File destDir) throws IOException { super.applyTemplate(model, destDir); try { - File plantuml = new File(destDir+"/"+this.getFilenameForModel(model)); + File plantuml = new File(destDir+File.separator+this.getFilenameForModel(model)); SourceFileReader reader = new SourceFileReader(plantuml); List<GeneratedImage> lst = null; lst = reader.getGeneratedImages(); - File diagram = new File(destDir+"/"+model.getName()+".png"); + File diagram = new File(destDir+File.separator+model.getName()+".png"); diagram = lst.get(0).getPngFile(); } catch (InterruptedException e) { e.printStackTrace();