Author: tchemit Date: 2009-12-14 12:25:13 +0100 (Mon, 14 Dec 2009) New Revision: 751 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Template.java Log: - remove unecessary else after a return :) - add TODO on deprecated Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-12-14 02:53:36 UTC (rev 750) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-12-14 11:25:13 UTC (rev 751) @@ -211,41 +211,40 @@ log.trace("file " + outputFile + " is up-to-date"); } return; - } else { - if (!outputFile.exists() && log.isTraceEnabled()) { - log.trace("not up-to-date " + outputFile.lastModified() - + " <" + outputFile + ">"); + } + if (!outputFile.exists() && log.isTraceEnabled()) { + log.trace("not up-to-date " + outputFile.lastModified() + + " <" + outputFile + ">"); + } + try { + StringWriter out = new StringWriter(); + MonitorWriter monitorOut = new MonitorWriter(out); + + switch (type) { + case OBJECT_MODEL: + generateFromModel(monitorOut,(ObjectModel)element); + break; + case OBJECT_MODEL_CLASSIFIER: + generateFromClassifier(monitorOut, (ObjectModelClassifier)element); + break; + case OBJECT_MODEL_INTERFACE: + generateFromInterface(monitorOut, (ObjectModelInterface)element); + break; + case OBJECT_MODEL_CLASS: + generateFromClass(monitorOut, (ObjectModelClass)element); + break; + case OBJECT_MODEL_ENUMERATION: + generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); + break; } - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - - switch (type) { - case OBJECT_MODEL: - generateFromModel(monitorOut,(ObjectModel)element); - break; - case OBJECT_MODEL_CLASSIFIER: - generateFromClassifier(monitorOut, (ObjectModelClassifier)element); - break; - case OBJECT_MODEL_INTERFACE: - generateFromInterface(monitorOut, (ObjectModelInterface)element); - break; - case OBJECT_MODEL_CLASS: - generateFromClass(monitorOut, (ObjectModelClass)element); - break; - case OBJECT_MODEL_ENUMERATION: - generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); - break; - } - - write(outputFile, monitorOut); - } catch (Exception eee) { - log.warn("Erreur lors de la génération du fichier " - + outputFile); - throw new RuntimeException( - "Erreur lors de la génération du fichier " - + outputFile, eee); - } + + write(outputFile, monitorOut); + } catch (Exception eee) { + log.warn("Erreur lors de la génération du fichier " + + outputFile); + throw new RuntimeException( + "Erreur lors de la génération du fichier " + + outputFile, eee); } } } Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Template.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Template.java 2009-12-14 02:53:36 UTC (rev 750) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/Template.java 2009-12-14 11:25:13 UTC (rev 751) @@ -76,12 +76,13 @@ /** Model */ protected M model; - + //TODO when deprecate methods, says what to use now or why it was deprecated for @Deprecated public abstract void generate(File[] file, File destDir); public abstract void applyTemplate(M model, File destDir) throws IOException; + //TODO when deprecate methods, says what to use now or why it was deprecated for @Deprecated public void setOverwrite(boolean v) { //overwrite = v; @@ -96,6 +97,7 @@ return properties.getProperty(PROP_ENCODING, ""); } + //TODO when deprecate methods, says what to use now or why it was deprecated for @Deprecated public void setEncoding(String encoding) { //this.encoding = encoding;