Author: fdesbois Date: 2009-05-04 14:18:51 +0000 (Mon, 04 May 2009) New Revision: 496 Modified: eugene/trunk/changelog.txt eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: Refactor de la methode generate Modified: eugene/trunk/changelog.txt =================================================================== --- eugene/trunk/changelog.txt 2009-05-04 13:56:41 UTC (rev 495) +++ eugene/trunk/changelog.txt 2009-05-04 14:18:51 UTC (rev 496) @@ -1,4 +1,6 @@ 1.0.0 xxx xxx + * Add Enumeration support + * Add Dependency support * Add ImportsManager * Add useful methods in 'GeneratorUtil' * Improve ant task @@ -93,4 +95,4 @@ 0.26 - * Ajout du support des stereotypes sur les attributs \ No newline at end of file + * Ajout du support des stereotypes sur les attributs Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 13:56:41 UTC (rev 495) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 14:18:51 UTC (rev 496) @@ -301,118 +301,18 @@ this.model = model; String filename = getFilenameForModel(model); - File outputFile = getDestinationFile(destDir, filename); - if (!getOverwrite() && isNewerThanSource(outputFile)) { - if (log.isDebugEnabled()) { - log.debug("file " + outputFile + " is up-to-date"); - } - } else { - if (!outputFile.exists() && log.isDebugEnabled()) { - log.debug("not up-to-date " + outputFile.lastModified() - + " <" + outputFile + ">"); - } - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - generateFromModel(monitorOut, model); - 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); - } - } + generateFromElement(model, destDir, filename); } // generateFromClassifier - for (ObjectModelClassifier clazz : model.getClassifiers()) { + generateFromElements(model.getClassifiers(), destDir); - String filename = getFilenameForClassifier(clazz); - File outputFile = getDestinationFile(destDir, filename); - if (!getOverwrite() && isNewerThanSource(outputFile)) { - if (log.isDebugEnabled()) { - log.debug("file " + outputFile + " is up-to-date"); - } - continue; - } - if (!outputFile.exists() && log.isDebugEnabled()) { - log.debug("not up-to-date " + outputFile.lastModified() + " <" - + outputFile + ">"); - } - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - generateFromClassifier(monitorOut, clazz); - 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); - } - } - // generateFromInterface - for (ObjectModelInterface interfacez : model.getInterfaces()) { + generateFromElements(model.getInterfaces(), destDir); - String filename = getFilenameForInterface(interfacez); - File outputFile = getDestinationFile(destDir, filename); - if (!getOverwrite() && isNewerThanSource(outputFile)) { - if (log.isDebugEnabled()) { - log.debug("file " + outputFile + " is up-to-date"); - } - continue; - } - if (!outputFile.exists() && log.isDebugEnabled()) { - log.debug("not up-to-date " + outputFile.lastModified() + " <" - + outputFile + ">"); - } - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - generateFromInterface(monitorOut, interfacez); - 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); - } - } - // generateFromClass - for (ObjectModelClass clazz : model.getClasses()) { + generateFromElements(model.getClasses(), destDir); - String filename = getFilenameForClass(clazz); - File outputFile = getDestinationFile(destDir, filename); - if (!getOverwrite() && isNewerThanSource(outputFile)) { - if (log.isDebugEnabled()) { - log.debug("file " + outputFile + " is up-to-date"); - } - continue; - } - if (!outputFile.exists() && log.isDebugEnabled()) { - log.debug("not up-to-date " + outputFile.lastModified() + " <" - + outputFile + ">"); - } - try { - StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - generateFromClass(monitorOut, clazz); - 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); - } - } - // generateFromEnumeration generateFromElements(model.getEnumerations(), destDir); } @@ -426,8 +326,8 @@ * @param elements Collection d'éléments d'un des types ci-dessus * @param destDir dossier de destination pour le fichier généré */ - private void generateFromElements(Collection elements, File destDir) { - for (Object element : elements) { + private void generateFromElements(Collection<? extends ObjectModelElement> elements, File destDir) { + for (ObjectModelElement element : elements) { String filename = ""; // Filename depends on type of element (Classifier, Class, Interface or Enumeration) @@ -461,6 +361,7 @@ if (log.isDebugEnabled()) { log.debug("file " + outputFile + " is up-to-date"); } + return; } else { if (!outputFile.exists() && log.isDebugEnabled()) { log.debug("not up-to-date " + outputFile.lastModified()