- Eugene-commits - mailman.cloud.codelutin.com

[Lutingenerator-commits] r501 - in eugene/trunk/src: main/java/org/nuiton/eugene test/java/org/nuiton/eugene
by thimel＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: thimel Date: 2009-05-12 15:56:07 +0000 (Tue, 12 May 2009) New Revision: 501 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ImportsManager.java eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java Log: Add state managment in imports and clearImports to reset ImportManager Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ImportsManager.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ImportsManager.java 2009-05-11 07:24:24 UTC (rev 500) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ImportsManager.java 2009-05-12 15:56:07 UTC (rev 501) @@ -46,11 +46,12 @@ } private Map<String, String> imports = new HashMap<String, String>(); + private State state = State.FILLING; /** * From the given class, add it to the imports list. * @param clazz the class to import - * @return true if there is a conflict adding the import + * @return true if import add was successful * @see ImportsManager#addImport(String) */ public boolean addImport(Class<?> clazz) { @@ -59,25 +60,39 @@ /** * From the given fqn, add it to the imports list. If there is a confilct - * adding this import, will return true + * adding this import, will return false. + * If reading of the imports has started, this method will return false, + * unless type does not need to be imported. * @param fqn the fully qualified name to import - * @return true if there is a conflict adding the import + * @return true if import add was successful */ public boolean addImport(String fqn) { - if (fqn.startsWith("java.lang.") && fqn.lastIndexOf(".") == 9) { - return false; + // Exclude java.lang classes + if (fqn == null || + (fqn.startsWith("java.lang.") && fqn.lastIndexOf(".") == 9)) { + return true; } + // Exclude primitive types if (primitiveTypes.contains(fqn)) { + return true; + } + // Reject generics + if (fqn.indexOf("<") != -1 || fqn.indexOf(">") != -1) { return false; } String name = fqn.substring(fqn.lastIndexOf(".") + 1); String inPlaceFqn = imports.get(name); if (inPlaceFqn == null) { - imports.put(name, fqn); - return false; + // Someone has started to read imports, impossible to add some more + if (state == State.READING) { + return false; + } else { + imports.put(name, fqn); + return true; + } } - // if fqn is not the same, return true. Otherwise, no need to override. - return (!inPlaceFqn.equals(fqn)); + // if fqn is not the same, return false. Otherwise, no need to override. + return inPlaceFqn.equals(fqn); } /** @@ -89,7 +104,7 @@ */ public String getType(String fqn) { boolean importResult = addImport(fqn); - if (importResult) { + if (!importResult) { // There is a conflict, do not use simple name return fqn; } else { @@ -110,6 +125,7 @@ * @return the imports alphabeticaly sorted */ public List<String> getImports(String packageName) { + state = State.READING; List<String> result = new ArrayList<String>(); for (String fqn : imports.values()) { if (!(fqn.lastIndexOf(".") == packageName.length() && fqn @@ -121,4 +137,16 @@ return result; } + /** + * Method to reset imports list. If imports has been listed, it becomes back + * possible to add imports. + */ + public void clearImports() { + imports.clear(); + state = State.FILLING; + } + + private enum State { + FILLING, READING + } } Modified: eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-11 07:24:24 UTC (rev 500) +++ eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-12 15:56:07 UTC (rev 501) @@ -17,19 +17,19 @@ } public void testAddImport() throws Exception { - assertFalse(mgr.addImport("org.nuiton.eugene.Toto")); - assertFalse(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertFalse(mgr.addImport("org.nuiton.eugene.Tutu")); - assertTrue(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs - assertFalse(mgr.addImport("void")); - assertFalse(mgr.addImport("boolean")); - assertFalse(mgr.addImport("Byte")); - assertFalse(mgr.addImport("java.lang.Toto")); - assertTrue(mgr.addImport("java.lang.sub.Toto")); + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Toto")); - assertFalse(mgr.addImport(Serializable.class)); - assertTrue(mgr.addImport("org.nuiton.eugene.Serializable")); + assertTrue(mgr.addImport(Serializable.class)); + assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); } public void testGetType() throws Exception { @@ -46,9 +46,9 @@ } public void testGetImports() throws Exception { - mgr.addImport("org.nuiton.eugene.Toto"); - mgr.addImport("org.nuiton.eugene.Tutu"); - mgr.addImport("org.nuiton.eugene.subpackage.Tata"); + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); List<String> imports = mgr.getImports("org.nuiton.eugene"); assertEquals(1, imports.size()); assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); @@ -68,17 +68,18 @@ assertEquals("org.nuiton.eugene.Toto", imports.get(0)); assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - mgr.addImport("java.lang.String"); + assertTrue(mgr.addImport("java.lang.String")); imports = mgr.getImports("org.nuiton.eugene.subpackage"); assertEquals(2, imports.size()); assertEquals("org.nuiton.eugene.Toto", imports.get(0)); assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - mgr.addImport("void"); - mgr.addImport("boolean"); - mgr.addImport("Byte"); - mgr.addImport("java.lang.Toto"); - mgr.addImport("java.lang.sub.Toto"); + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject imports = mgr.getImports("org.nuiton.eugene.subpackage"); assertEquals(2, imports.size());

1 0

[Lutingenerator-commits] r500 - in maven-eugene-plugin/trunk: . src/site
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 07:24:24 +0000 (Mon, 11 May 2009) New Revision: 500 Modified: maven-eugene-plugin/trunk/pom.xml maven-eugene-plugin/trunk/src/site/site.xml Log: * bump versions (lutinproject, doxia-module-jrst, maven-license-switcher-plugin) * use doxia-modules-jrst instead of maven-jrst-plugin * improve download section on site Modified: maven-eugene-plugin/trunk/pom.xml =================================================================== --- maven-eugene-plugin/trunk/pom.xml 2009-05-11 07:14:19 UTC (rev 499) +++ maven-eugene-plugin/trunk/pom.xml 2009-05-11 07:24:24 UTC (rev 500) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.5</version> + <version>3.5.4</version> </parent> <groupId>org.nuiton</groupId> @@ -86,7 +86,6 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <goals> @@ -96,27 +95,24 @@ </executions> </plugin> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> - </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> </build>  @@ -135,9 +131,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-eugene-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutingenerator/maven-eugene-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-eugene-pl…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>  @@ -173,10 +169,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <version>0.8</version> <executions> <execution> <id>attach-licenses</id> Modified: maven-eugene-plugin/trunk/src/site/site.xml =================================================================== --- maven-eugene-plugin/trunk/src/site/site.xml 2009-05-11 07:14:19 UTC (rev 499) +++ maven-eugene-plugin/trunk/src/site/site.xml 2009-05-11 07:24:24 UTC (rev 500) @@ -44,10 +44,12 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <!--<menu name="Developpeur">

1 0

[Lutingenerator-commits] r499 - in eugene/trunk: . src/main/assembly src/site
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 07:14:19 +0000 (Mon, 11 May 2009) New Revision: 499 Modified: eugene/trunk/pom.xml eugene/trunk/src/main/assembly/deps.xml eugene/trunk/src/main/assembly/full.xml eugene/trunk/src/site/site.xml Log: * bump versions (lutinproject, lutinutil, doxia-module-jrst, maven-license-switcher-plugin) * use doxia-modules-jrst instead of maven-jrst-plugin * improve download section on site Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-04 15:59:00 UTC (rev 498) +++ eugene/trunk/pom.xml 2009-05-11 07:14:19 UTC (rev 499) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.5</version> + <version>3.5.4</version> </parent> <groupId>org.nuiton</groupId> @@ -69,10 +69,10 @@ <version>1.1.1</version> <scope>runtime</scope> <exclusions> - <exclusion> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - </exclusion> + <exclusion> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -95,7 +95,7 @@    - <name>Eugene</name> + <name>EUGene</name> <description>Efficient Universal Generator.</description> <inceptionYear>2004</inceptionYear> @@ -113,14 +113,14 @@  <labs.project>lutingenerator</labs.project> - <lutinutil.version>1.0.4</lutinutil.version> + <lutinutil.version>1.0.6</lutinutil.version> </properties> <build> <defaultGoal>install</defaultGoal> - <resources> + <resources> <resource> <directory>${maven.src.dir}/main/xsl</directory> <includes> @@ -128,43 +128,36 @@ </includes> </resource> </resources> - - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <locales>fr,en</locales> - </configuration> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/deps.xml</descriptor> - <descriptor>src/main/assembly/full.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + </build>  @@ -270,10 +263,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <version>0.8</version> <executions> <execution> <id>attach-licenses</id> @@ -284,6 +274,21 @@ </execution> </executions> </plugin> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>attach-assembly</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </profile> Modified: eugene/trunk/src/main/assembly/deps.xml =================================================================== --- eugene/trunk/src/main/assembly/deps.xml 2009-05-04 15:59:00 UTC (rev 498) +++ eugene/trunk/src/main/assembly/deps.xml 2009-05-11 07:14:19 UTC (rev 499) @@ -14,21 +14,32 @@ <scope>runtime</scope> </dependencySet> </dependencySets> - <files> - <file> -  - <source>target/${project.build.finalName}.jar</source> - </file> -  - </files> <fileSets> <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> <include>README*</include> <include>LICENSE*</include> + <include>pom.xml</include> </includes> </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: eugene/trunk/src/main/assembly/full.xml =================================================================== --- eugene/trunk/src/main/assembly/full.xml 2009-05-04 15:59:00 UTC (rev 498) +++ eugene/trunk/src/main/assembly/full.xml 2009-05-11 07:14:19 UTC (rev 499) @@ -13,26 +13,35 @@ <scope>runtime</scope> </dependencySet> </dependencySets> - <files> - <file> -  - <source>target/${project.build.finalName}.jar</source> - </file> -  - </files> <fileSets> <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> <include>README*</include> <include>LICENSE*</include> <include>pom.xml</include> </includes> </fileSet> <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + <fileSet> <directory>src</directory> - <useDefaultExcludes>true</useDefaultExcludes> +  </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: eugene/trunk/src/site/site.xml =================================================================== --- eugene/trunk/src/site/site.xml 2009-05-04 15:59:00 UTC (rev 498) +++ eugene/trunk/src/site/site.xml 2009-05-11 07:14:19 UTC (rev 499) @@ -1,55 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> + <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.3</version> - </skin> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> + </poweredBy> - <body> - <links> - <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <body> + <links> + <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - </menu> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + </menu> - <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/nuiton/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/nuiton/${project.artifactId}" - name="Voir toutes les versions"/> - </menu> + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" + name="Bundle sans sources (zip)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" + name="Bundle complêt (zip)"/> + </menu> - <menu name="Developpeur"> - <item name="ObjectModel" href="ObjectModel.html"/> - <item name="StateModel" href="StateModel.html"/> - <item name="UIModel" href="DevUIDoc.html"/> - <item name="Todo" href="Todo.html"/> - </menu> + <menu name="Developpeur"> + <item name="ObjectModel" href="ObjectModel.html"/> + <item name="StateModel" href="StateModel.html"/> + <item name="UIModel" href="DevUIDoc.html"/> + <item name="Todo" href="Todo.html"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + </body> </project>

1 0

[Lutingenerator-commits] r498 - eugene/trunk/src/main/java/org/nuiton/eugene
by fdesbois＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: fdesbois Date: 2009-05-04 15:59:00 +0000 (Mon, 04 May 2009) New Revision: 498 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: Correction refactor sur methode generate : ajout d'une enum pour remplacer les instanceof Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 15:57:22 UTC (rev 497) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 15:59:00 UTC (rev 498) @@ -386,37 +386,7 @@ try { StringWriter out = new StringWriter(); MonitorWriter monitorOut = new MonitorWriter(out); - /*if(log.isDebugEnabled()) { - log.debug("Instanceof: "+element.getClass().getName()); - } - System.out.println("## Instanceof: "+element.getClass().getName()); - // Specific generation depends on element type - if (element instanceof ObjectModel) { - if (log.isDebugEnabled()) { - log.debug("Instanceof ObjectModel"); - } - generateFromModel(monitorOut,(ObjectModel)element); - } else if (element instanceof ObjectModelClassifier) { - if (log.isDebugEnabled()) { - log.debug("Instanceof ObjectModelClassifier"); - } - generateFromClassifier(monitorOut, (ObjectModelClassifier)element); - } else if (element instanceof ObjectModelClass) { - if (log.isDebugEnabled()) { - log.debug("Instanceof ObjectModelClass"); - } - generateFromClass(monitorOut, (ObjectModelClass)element); - } else if (element instanceof ObjectModelInterface) { - if (log.isDebugEnabled()) { - log.debug("Instanceof ObjectModelInterface"); - } - generateFromInterface(monitorOut, (ObjectModelInterface)element); - } else if (element instanceof ObjectModelEnumeration) { - if (log.isDebugEnabled()) { - log.debug("Instanceof ObjectModelEnumeration"); - } - generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); - }*/ + switch (type) { case OBJECT_MODEL: generateFromModel(monitorOut,(ObjectModel)element); break;

1 0

[Lutingenerator-commits] r497 - eugene/trunk/src/main/java/org/nuiton/eugene
by fdesbois＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: fdesbois Date: 2009-05-04 15:57:22 +0000 (Mon, 04 May 2009) New Revision: 497 Added: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelType.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: Correction refactor sur methode generate : ajout d'une enum pour remplacer les instanceof Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 14:18:51 UTC (rev 496) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 15:57:22 UTC (rev 497) @@ -301,20 +301,25 @@ this.model = model; String filename = getFilenameForModel(model); - generateFromElement(model, destDir, filename); + generateFromElement(model, destDir, filename, + ObjectModelType.OBJECT_MODEL); } // generateFromClassifier - generateFromElements(model.getClassifiers(), destDir); + generateFromElements(model.getClassifiers(), destDir, + ObjectModelType.OBJECT_MODEL_CLASSIFIER); // generateFromInterface - generateFromElements(model.getInterfaces(), destDir); + generateFromElements(model.getInterfaces(), destDir, + ObjectModelType.OBJECT_MODEL_INTERFACE); // generateFromClass - generateFromElements(model.getClasses(), destDir); + generateFromElements(model.getClasses(), destDir, + ObjectModelType.OBJECT_MODEL_CLASS); // generateFromEnumeration - generateFromElements(model.getEnumerations(), destDir); + generateFromElements(model.getEnumerations(), destDir, + ObjectModelType.OBJECT_MODEL_ENUMERATION); } /** @@ -323,25 +328,31 @@ * ObjectModelEnumeration. * Deux méthodes dépendent du type et peuvent être surchargées : * getFilenameForXXX et generateFromXXX (XXX étant un type prédéfini pour une méthode existante). + * + * @see ObjectModelType + * * @param elements Collection d'éléments d'un des types ci-dessus * @param destDir dossier de destination pour le fichier généré + * @param type type explicite d'ObjectModel */ - private void generateFromElements(Collection<? extends ObjectModelElement> elements, File destDir) { + private void generateFromElements(Collection<? extends ObjectModelElement> elements, File destDir, + ObjectModelType type) { for (ObjectModelElement element : elements) { String filename = ""; // Filename depends on type of element (Classifier, Class, Interface or Enumeration) - if (element instanceof ObjectModelClassifier) { - filename = getFilenameForClassifier((ObjectModelClassifier)element); - } else if (element instanceof ObjectModelClass) { - filename = getFilenameForClass((ObjectModelClass)element); - } else if (element instanceof ObjectModelInterface) { - filename = getFilenameForInterface((ObjectModelInterface)element); - } else if (element instanceof ObjectModelEnumeration) { - filename = getFilenameForEnumeration((ObjectModelEnumeration)element); + switch (type) { + case OBJECT_MODEL_CLASSIFIER: + filename = getFilenameForClassifier((ObjectModelClassifier)element); break; + case OBJECT_MODEL_INTERFACE: + filename = getFilenameForInterface((ObjectModelInterface)element); break; + case OBJECT_MODEL_CLASS: + filename = getFilenameForClass((ObjectModelClass)element); break; + case OBJECT_MODEL_ENUMERATION: + filename = getFilenameForEnumeration((ObjectModelEnumeration)element); } - generateFromElement(element, destDir, filename); + generateFromElement(element, destDir, filename, type); } } @@ -350,11 +361,16 @@ * Types possibles : ObjectModel, ObjectModelClassifier, ObjectModelClass, * ObjectModelInterface et ObjectModelEnumeration. * La méthode generateFromXXX dépend du type d'élément et peut être surchargée. + * + * @see ObjectModelType + * * @param element element à généré * @param destDir dossier de destination * @param filename nom du fichier de sortie + * @param type type d'ObjectModel */ - private void generateFromElement(Object element, File destDir, String filename) { + private void generateFromElement(Object element, File destDir, String filename, + ObjectModelType type) { File outputFile = getDestinationFile(destDir, filename); if (!getOverwrite() && isNewerThanSource(outputFile)) { @@ -370,18 +386,48 @@ try { StringWriter out = new StringWriter(); MonitorWriter monitorOut = new MonitorWriter(out); - + /*if(log.isDebugEnabled()) { + log.debug("Instanceof: "+element.getClass().getName()); + } + System.out.println("## Instanceof: "+element.getClass().getName()); // Specific generation depends on element type if (element instanceof ObjectModel) { + if (log.isDebugEnabled()) { + log.debug("Instanceof ObjectModel"); + } generateFromModel(monitorOut,(ObjectModel)element); } else if (element instanceof ObjectModelClassifier) { + if (log.isDebugEnabled()) { + log.debug("Instanceof ObjectModelClassifier"); + } generateFromClassifier(monitorOut, (ObjectModelClassifier)element); } else if (element instanceof ObjectModelClass) { + if (log.isDebugEnabled()) { + log.debug("Instanceof ObjectModelClass"); + } generateFromClass(monitorOut, (ObjectModelClass)element); } else if (element instanceof ObjectModelInterface) { + if (log.isDebugEnabled()) { + log.debug("Instanceof ObjectModelInterface"); + } generateFromInterface(monitorOut, (ObjectModelInterface)element); } else if (element instanceof ObjectModelEnumeration) { + if (log.isDebugEnabled()) { + log.debug("Instanceof ObjectModelEnumeration"); + } generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); + }*/ + 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); } write(outputFile, monitorOut); Added: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelType.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelType.java (rev 0) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelType.java 2009-05-04 15:57:22 UTC (rev 497) @@ -0,0 +1,35 @@ +/* *##% Eugene + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +package org.nuiton.eugene; + +/** + * Enumeration for ObjectModelGenerator. + * Contains all types available for generating specific ObjectModelElement file. + * Needed because of inheritance between class, interface and classifier. + * Method instanceof (previously used) is inadequat so expliciting the ObjectModel type is much better. + * + * Created: may 4th 2009 + * + * @author Florian DESBOIS <fdesbois(a)codelutin.com> + * + * @version $Revision: 496 $ + */ +enum ObjectModelType { + OBJECT_MODEL, OBJECT_MODEL_ENUMERATION, OBJECT_MODEL_CLASSIFIER, + OBJECT_MODEL_CLASS, OBJECT_MODEL_INTERFACE +}

1 0

[Lutingenerator-commits] r496 - in eugene/trunk: . src/main/java/org/nuiton/eugene
by fdesbois＠users.labs.libre-entreprise.org 04 May '09

04 May '09

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()

1 0

[Lutingenerator-commits] r495 - eugene/trunk/src/main/java/org/nuiton/eugene
by thimel＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: thimel Date: 2009-05-04 13:56:41 +0000 (Mon, 04 May 2009) New Revision: 495 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java Log: Add a method to compute serialVersionUID (may me improved) Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-04 13:17:35 UTC (rev 494) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-04 13:56:41 UTC (rev 495) @@ -542,4 +542,19 @@ return element.hasStereotype(stereotype) || element.hasStereotype(stereotype.toLowerCase()); } + /** + * For the given class and its attributes, this method computes a + * serialVersionUID. Exemple, returns "123456789L". + * This id will change only if the type or the order of an attribute + * changes. + */ + public static String computeSerialVersionUID(ObjectModelClass clazz) { + String query = clazz.getQualifiedName() + "#"; + for (ObjectModelAttribute attr : clazz.getAttributes()) { + query += "-" + attr.getType(); + } + String result = query.hashCode() + "L"; + return result; + } + } // GeneratorUtil

1 0

[Lutingenerator-commits] r494 - eugene/trunk/src/main/java/org/nuiton/eugene
by fdesbois＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: fdesbois Date: 2009-05-04 13:17:35 +0000 (Mon, 04 May 2009) New Revision: 494 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java Log: Correction methode getFilenameFromEnumeration mis en public pour etre surcharge Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 12:58:51 UTC (rev 493) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 13:17:35 UTC (rev 494) @@ -535,7 +535,7 @@ return clazz.getQualifiedName().replace('.', File.separatorChar); } - private String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { + public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { return enumeration.getQualifiedName().replace('.', File.separatorChar); }

1 0

[Lutingenerator-commits] r493 - in eugene/trunk: . src/main/java/org/nuiton/eugene src/main/java/org/nuiton/eugene/models/object src/main/java/org/nuiton/eugene/models/object/xml src/main/xsl src/test/java/org/nuiton/eugene/xmi/objectmodel src/test/resources/xmi/1.2
by fdesbois＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: fdesbois Date: 2009-05-04 12:58:51 +0000 (Mon, 04 May 2009) New Revision: 493 Added: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java eugene/trunk/src/test/resources/xmi/1.2/enumeration.xmi Modified: eugene/trunk/pom.xml eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java Log: Ajout gestion des enumerations dans ObjectModel Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/pom.xml 2009-05-04 12:58:51 UTC (rev 493) @@ -156,6 +156,7 @@ </configuration> <executions> <execution> + <phase>package</phase> <goals> <goal>single</goal> </goals> Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-04 12:58:51 UTC (rev 493) @@ -23,6 +23,7 @@ import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; +import java.util.Collection; import java.util.Enumeration; import java.util.List; import java.util.regex.Matcher; @@ -45,6 +46,7 @@ import org.codelutin.util.FileUtil; import org.codelutin.util.RecursiveProperties; import org.codelutin.util.StringUtil; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.xml.sax.SAXException; /** @@ -279,10 +281,12 @@ * Par defaut la methode appelle la methode * {@link #generateFromModel(Writer, ObjectModel)} puis boucle sur chaque * class en appelant la m?thode - * {@link #generateFromClass(Writer, ObjectModelClass)} et enfin sur chaque + * {@link #generateFromClass(Writer, ObjectModelClass)} puis boucle sur chaque * interface en appelant a méthode - * {@link #generateFromInterface(Writer, ObjectModelInterface)} Le nom de - * fichier est récupérer pour chacun d'eux en appelant la méthode + * {@link #generateFromInterface(Writer, ObjectModelInterface)} et enfin sur chaque + * énumération en appelant la méthode + * {@link #generateFromEnumeration(Writer, ObjectModelEnumeration)} + * Le nom de fichier est récupérer pour chacun d'eux en appelant la méthode * getFilenameFor.... La methode generateFrom... n'utilise pas le Writer * alors le fichier n'est pas généré, si on l'utilise m?me pour ne rien * écrire alors le fichier sera généré. @@ -408,9 +412,89 @@ eee); } } + + // generateFromEnumeration + generateFromElements(model.getEnumerations(), destDir); } /** + * Parcours une collection d'éléments pour la génération suivant un type d'éléments. + * Types possibles : ObjectModelClassifier, ObjectModelClass, ObjectModelInterface et + * ObjectModelEnumeration. + * Deux méthodes dépendent du type et peuvent être surchargées : + * getFilenameForXXX et generateFromXXX (XXX étant un type prédéfini pour une méthode existante). + * @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) { + + String filename = ""; + // Filename depends on type of element (Classifier, Class, Interface or Enumeration) + if (element instanceof ObjectModelClassifier) { + filename = getFilenameForClassifier((ObjectModelClassifier)element); + } else if (element instanceof ObjectModelClass) { + filename = getFilenameForClass((ObjectModelClass)element); + } else if (element instanceof ObjectModelInterface) { + filename = getFilenameForInterface((ObjectModelInterface)element); + } else if (element instanceof ObjectModelEnumeration) { + filename = getFilenameForEnumeration((ObjectModelEnumeration)element); + } + + generateFromElement(element, destDir, filename); + } + } + + /** + * Génération pour un élément du modèle (ou le modèle lui-même). + * Types possibles : ObjectModel, ObjectModelClassifier, ObjectModelClass, + * ObjectModelInterface et ObjectModelEnumeration. + * La méthode generateFromXXX dépend du type d'élément et peut être surchargée. + * @param element element à généré + * @param destDir dossier de destination + * @param filename nom du fichier de sortie + */ + private void generateFromElement(Object element, File destDir, String filename) { + + 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); + + // Specific generation depends on element type + if (element instanceof ObjectModel) { + generateFromModel(monitorOut,(ObjectModel)element); + } else if (element instanceof ObjectModelClassifier) { + generateFromClassifier(monitorOut, (ObjectModelClassifier)element); + } else if (element instanceof ObjectModelClass) { + generateFromClass(monitorOut, (ObjectModelClass)element); + } else if (element instanceof ObjectModelInterface) { + generateFromInterface(monitorOut, (ObjectModelInterface)element); + } else if (element instanceof ObjectModelEnumeration) { + generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); + } + + 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); + } + } + } + + /** * Par defaut cette methode retourne le getName du model. Si l'on souhaite * utiliser la methode generateFromModel il vaut mieux surcharger cette * m?thode @@ -451,6 +535,10 @@ return clazz.getQualifiedName().replace('.', File.separatorChar); } + private String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { + return enumeration.getQualifiedName().replace('.', File.separatorChar); + } + public void generateFromModel(Writer output, ObjectModel model) throws IOException { } @@ -466,4 +554,9 @@ public void generateFromClassifier(Writer output, ObjectModelClassifier clazz) throws IOException { } + + public void generateFromEnumeration(Writer output, + ObjectModelEnumeration enumeration) throws IOException { + } + } Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java 2009-05-04 12:58:51 UTC (rev 493) @@ -71,6 +71,7 @@ */ public ObjectModelClass getClass(String qualifiedClassName); + /** * Indicates whether the model contains the class associated to the given className * @param qualifiedClassName - the qualified name of the class to retrieve. @@ -96,7 +97,23 @@ public ObjectModelInterface getInterface( String qualifiedInterfaceName); + /** + * Returns all enumerations defined in this model. + * @see ObjectModelEnumeration + * + * @return a Collection containing all ObjectModelEnumeration for this model. + */ + public Collection<ObjectModelEnumeration> getEnumerations(); + + /** + * Return the enumeration corresponding to the given qualified name + * @param qualifiedEnumerationName + * @return the ObjectModelEnumeration of the found enumeration or null if the model contains no enumeration for this qualified name. + */ + public ObjectModelEnumeration getEnumeration(String qualifiedEnumerationName); + + /** * Returns all comments not lied to a particular model element * * @return a List containing all comments for this model as Strings. Added: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java (rev 0) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java 2009-05-04 12:58:51 UTC (rev 493) @@ -0,0 +1,61 @@ +/* *##% Eugene + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +package org.nuiton.eugene.models.object; + +import java.util.Collection; + +/** + * ObjectModelEnumeration. + * + * @author Florian Desbois <fdesbois(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision: 483 $ + * + */ +public interface ObjectModelEnumeration extends ObjectModelElement { + + /** + * Returns the package name of this enumeration. + * + * @return the package name of this enumeration. + */ + public String getPackageName(); + + /** + * Returns the qualified name of this enumeration. + * Class qualified name is composed of the package name and the enumeration name. + * + * @return the qualified name of this enumeration. + */ + public String getQualifiedName(); + + /** + * Returns literals of this enumeration. + * + * @return a Collection of String + */ + public Collection<String> getLiterals(); + + /** + * Returns all operations defined on this en enumeration. + * @see ObjectModelOperation + * + * @return a Collection containing all ObjectModelOperation for this enumeration. + */ + public Collection<ObjectModelOperation> getOperations(); +} Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-05-04 12:58:51 UTC (rev 493) @@ -78,6 +78,16 @@ d.addSetProperties("objectModel/interface"); d.addSetNext("objectModel/interface", "addInterface"); + d.addObjectCreate("objectModel/enumeration", + ObjectModelEnumerationImpl.class); + d.addSetProperties("objectModel/enumeration"); + d.addSetNext("objectModel/enumeration", "addEnumeration"); + + d.addObjectCreate("objectModel/enumeration/literal", + ObjectModelImplRef.class); + d.addSetProperties("objectModel/enumeration/literal"); + d.addSetNext("objectModel/enumeration/literal", "addLiteral"); + d.addObjectCreate("objectModel/associationClass", ObjectModelAssociationClassImpl.class); d.addSetProperties("objectModel/associationClass"); Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java 2009-05-04 12:58:51 UTC (rev 493) @@ -21,9 +21,7 @@ import org.nuiton.eugene.models.object.ObjectModelDependency; /** - * Abstraction for the root node of object model trees. - * This an entry point for browsing a model tree. This object offers - * as well several facilities for a direct access to some of the object model elements. + * ObjectModelDependencyImpl. * * Created: april 23th 2009 * Added: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java (rev 0) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java 2009-05-04 12:58:51 UTC (rev 493) @@ -0,0 +1,102 @@ +/* *##% Eugene + * Copyright (C) 2004 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +package org.nuiton.eugene.models.object.xml; + +import java.util.ArrayList; +import java.util.Collection; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/** + * ObjectModelEnumerationImpl. + * + * Created: may 4th 2009 + * + * @author Florian Desbois <desbois(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision: 478 $ + * + */ +public class ObjectModelEnumerationImpl extends ObjectModelElementImpl + implements ObjectModelEnumeration { + + /** + * Collection of references corresponding to literal values + */ + private Collection<ObjectModelImplRef> literalRefs = new ArrayList<ObjectModelImplRef>(); + + /** + * Collection of operations objectModel + */ + private Collection<ObjectModelOperation> operations = new ArrayList<ObjectModelOperation>(); + + /** + * Package name from objectModel file, loaded with Digester + */ + private String packageName; + + public void setPackage(String packageName) { + this.packageName = packageName; + } + + public String getPackage() { + return this.packageName; + } + /** + * Add a literal to the ObjectModelEnumeration from Digester + * @param ref corresponding to a Literal value + */ + public void addLiteral(ObjectModelImplRef ref) { + literalRefs.add(ref); + } + + /** + * Add an operation to the ObjectModelEnumeration from Digester + * @param operation + */ + public void addOperation(ObjectModelOperationImpl operation) { + operation.postInit(); + operation.setDeclaringElement(this); + operations.add(operation); + } + + @Override + public String getPackageName() { + return this.packageName; + } + + @Override + public String getQualifiedName() { + return this.packageName+"."+this.getName(); + } + + @Override + public Collection<String> getLiterals() { + Collection<String> results = new ArrayList<String>(); + for (ObjectModelImplRef ref : literalRefs) { + results.add(ref.getName()); + } + return results; + } + + @Override + public Collection<ObjectModelOperation> getOperations() { + return operations; + } + +} Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-05-04 12:58:51 UTC (rev 493) @@ -24,10 +24,13 @@ import java.util.List; import java.util.Map; +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.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.nuiton.eugene.models.object.ObjectModelInterface; /** @@ -52,9 +55,12 @@ protected Map<String, ObjectModelClass> classes = new HashMap<String, ObjectModelClass>(); protected Map<String, ObjectModelInterface> interfaces = new HashMap<String, ObjectModelInterface>(); protected Map<String, ObjectModelClassifier> classifiers = new HashMap<String, ObjectModelClassifier>(); + protected Map<String, ObjectModelEnumeration> enumerations = new HashMap<String, ObjectModelEnumeration>(); protected List<String> comments = new ArrayList<String>(); private Map<String, String> tagValues = new HashMap<String, String>(); + private static Log log = LogFactory.getLog(ObjectModelImpl.class); + public void setName(String name) { this.name = name; } @@ -185,11 +191,9 @@ if (qualifiedClassName == null) { return null; } - if (!hasClass(qualifiedClassName)) { - System.out.println("WARNING : Class " + qualifiedClassName - + " not found in model"); - System.out - .println("You may forgot to declare for good an external class ?"); + if (!hasClass(qualifiedClassName) && log.isWarnEnabled()) { + log.warn("Class " + qualifiedClassName + " not found in model"); + log.warn("You may forgot to declare for good an external class ?"); } return (ObjectModelClass) classes.get(qualifiedClassName); } @@ -246,9 +250,8 @@ public ObjectModelInterface getInterface(String qualifiedInterfaceName) { ObjectModelInterface result = null; result = (ObjectModelInterface) interfaces.get(qualifiedInterfaceName); - if (result == null) { - System.out.println("WARNING : Class " + qualifiedInterfaceName - + " not found in model"); + if (result == null && log.isWarnEnabled()) { + log.warn("Interface " + qualifiedInterfaceName + " not found in model"); } return result; } @@ -264,6 +267,26 @@ return interfaces.values(); } + public void addEnumeration(ObjectModelEnumerationImpl enumeration) { + enumeration.postInit(); + enumeration.setObjectModelImpl(this); + enumerations.put(enumeration.getName(), enumeration); + } + + @Override + public Collection<ObjectModelEnumeration> getEnumerations() { + return enumerations.values(); + } + + @Override + public ObjectModelEnumeration getEnumeration(String qualifiedEnumerationName) { + ObjectModelEnumeration result = enumerations.get(qualifiedEnumerationName); + if (result == null && log.isWarnEnabled()) { + log.warn("Enumeration " + qualifiedEnumerationName + " not found in model"); + } + return result; + } + /** * Returns all comments not lied to a particular model element * Modified: eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-05-04 12:58:51 UTC (rev 493) @@ -106,6 +106,13 @@ </xsl:with-param> </xsl:call-template> </xsl:for-each> + <xsl:for-each select="UML:Namespace.ownedElement/UML:Enumeration"> + <xsl:call-template name="UMLEnumeration"> + <xsl:with-param name="localPackageName"> + <xsl:value-of select="$localPackageName"/> + </xsl:with-param> + </xsl:call-template> + </xsl:for-each> <xsl:apply-templates> <xsl:with-param name="parentLocalPackageName"> <xsl:value-of select="$localPackageNameDot"/> @@ -334,8 +341,33 @@ </xsl:template> + <xsl:template name="UMLEnumeration"> + <xsl:param name="localPackageName"/> + <xsl:element name="enumeration"> + <xsl:attribute name="name"> + <xsl:value-of select="@name" /> + </xsl:attribute> + + <xsl:attribute name="package"> + <xsl:value-of select="$localPackageName"/> + </xsl:attribute> + +  + <xsl:for-each select="UML:Enumeration.literal/UML:EnumerationLiteral"> + <xsl:element name="literal"> + <xsl:attribute name="name"> + <xsl:value-of select="@name"/> + </xsl:attribute> + </xsl:element> + </xsl:for-each> + +  + <xsl:for-each select="UML:Classifier.feature/UML:Operation"> + <xsl:call-template name="UMLOperation"/> + </xsl:for-each> + </xsl:element> + </xsl:template> - <xsl:template name="UMLAbstractions"> <xsl:param name="classId"/> <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::UML:Abstraction[UML:Dependency.client/UML:Class/@xmi.idref=$classId]"> Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-05-04 12:58:51 UTC (rev 493) @@ -260,6 +260,34 @@ </xsl:element> </xsl:template> +  + <xsl:template match="packagedElement[@xmi:type='uml:Enumeration']"> + <xsl:param name="parentLocalPackageName" /> + <xsl:element name="enumeration"> + <xsl:attribute name="name"> + <xsl:value-of select="@name" /> + </xsl:attribute> + <xsl:attribute name="package"> + <xsl:value-of select="$parentLocalPackageName" /> + </xsl:attribute> + +  + <xsl:apply-templates select="ownedLiteral" /> + +  + <xsl:apply-templates select="ownedOperation" /> + + </xsl:element> + </xsl:template> + + <xsl:template match="ownedLiteral"> + <xsl:element name="literal"> + <xsl:attribute name="name"> + <xsl:value-of select="@name" /> + </xsl:attribute> + </xsl:element> + </xsl:template> + <xsl:template match="ownedAttribute"> <xsl:element name="attribute"> @@ -613,6 +641,10 @@ </xsl:when> <xsl:when test="$node[@xmi:type='uml:Enumeration']"> + <xsl:call-template name="fullClassName2"> + <xsl:with-param name="node" + select="$node/ancestor::packagedElement[@xmi:type = 'uml:Package']" /> + </xsl:call-template> <xsl:value-of select="$node/@name" /> </xsl:when> Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-05-04 12:43:02 UTC (rev 492) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-05-04 12:58:51 UTC (rev 493) @@ -40,6 +40,7 @@ import org.junit.Test; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; /** * Test de la feuille de style "xmi1.2ToObjectModel.xsl" @@ -151,7 +152,7 @@ } /** - * Apply XSL stylesheet on a argouml model. + * Apply XSL stylesheet on an Argouml model. * And make test on it. * * @throws URISyntaxException @@ -184,4 +185,35 @@ Assert.assertEquals(4,nbDependencies); } + /** + * Apply XSL stylesheet on an Argouml model. + * And make test on it. + * + * @throws URISyntaxException + * @throws IOException + * @throws TransformerException + */ + @Test + public void testXSLEnumeration() throws URISyntaxException, IOException, + TransformerException { + + File xmiFile = new File(Resource.getURL("xmi/1.2/enumeration.xmi") + .toURI()); + + File objectModelFile = transformXMI(xmiFile, "enumeration.objectmodel"); + + ObjectModel model = loadModel(objectModelFile); + + Assert.assertNotNull(model); + Assert.assertEquals("EnumerationTest", model.getName()); + Assert.assertEquals(1, model.getEnumerations().size()); + + for (ObjectModelEnumeration enumeration : model.getEnumerations()) { + // 1 seule énumeration avec 3 literals et 2 opérations + Assert.assertNotNull(enumeration.getQualifiedName()); + Assert.assertEquals(3,enumeration.getLiterals().size()); + Assert.assertEquals(2, enumeration.getOperations().size()); + } + } + } Added: eugene/trunk/src/test/resources/xmi/1.2/enumeration.xmi =================================================================== --- eugene/trunk/src/test/resources/xmi/1.2/enumeration.xmi (rev 0) +++ eugene/trunk/src/test/resources/xmi/1.2/enumeration.xmi 2009-05-04 12:58:51 UTC (rev 493) @@ -0,0 +1,89 @@ +<?xml version = '1.0' encoding = 'UTF-8' ?> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon May 04 14:18:59 CEST 2009'> + <XMI.header> <XMI.documentation> + <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> + <XMI.exporterVersion>0.26.2(6) revised on $Date: 2007-05-12 08:08:08 +0200 (Sat, 12 May 2007) $ </XMI.exporterVersion> + </XMI.documentation> + <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> + <XMI.content> + <UML:Model xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBA' + name = 'EnumerationTest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC5' + name = 'org.test.enums' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Enumeration xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBB' + name = 'OneEnumeration' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Classifier.feature> + <UML:Operation xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBC' + name = 'method1' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'true' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBD' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + <UML:Operation xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBE' + name = 'method2' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBF' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000873'/> + </UML:Parameter.type> + </UML:Parameter> + <UML:Parameter xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC3' + name = 'param' isSpecification = 'false'> + <UML:Parameter.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + <UML:Enumeration.literal> + <UML:EnumerationLiteral xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC0' + name = 'LITERAL1' isSpecification = 'false'/> + <UML:EnumerationLiteral xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC1' + name = 'LITERAL2' isSpecification = 'false'/> + <UML:EnumerationLiteral xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC2' + name = 'LITERAL3' isSpecification = 'false'/> + </UML:Enumeration.literal> + </UML:Enumeration> + <UML:Class xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC6' + name = 'TestClass' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC7' + name = 'typeEnum' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC8'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EC9' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Enumeration xmi.idref = '-64--88-99-15--134e8b6f:1210ad9bedb:-8000:0000000000000EBB'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Model> + </XMI.content> +</XMI>

1 0

[Lutingenerator-commits] r492 - eugene/trunk/src/main/xsl
by chatellier＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: chatellier Date: 2009-05-04 12:43:02 +0000 (Mon, 04 May 2009) New Revision: 492 Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl Log: Suppression du test comment?\195?\169 et d'un if seul Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-05-04 10:13:13 UTC (rev 491) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-05-04 12:43:02 UTC (rev 492) @@ -687,16 +687,8 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> -  - <xsl:if test="document($external-url)/xmi:XMI/descendant::packagedElement[@xmi:type=$xmi-type][@xmi:id=$external-id]"> - <xsl:value-of - select="document($external-url)/xmi:XMI/descendant::packagedElement[@xmi:type=$xmi-type][@xmi:id=$external-id]/@name" /> - </xsl:if> -  + <xsl:value-of + select="document($external-url)/xmi:XMI/descendant::packagedElement[@xmi:type=$xmi-type][@xmi:id=$external-id]/@name" /> </xsl:otherwise> </xsl:choose> </xsl:when>

1 0