Author: tchemit Date: 2009-05-14 12:26:03 +0000 (Thu, 14 May 2009) New Revision: 502 Modified: eugene/trunk/pom.xml eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java eugene/trunk/src/site/site.xml eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java Log: migrate to nuiton Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/pom.xml 2009-05-14 12:26:03 UTC (rev 502) @@ -10,9 +10,14 @@ <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> <version>3.5.4</version> + <!--groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version--> </parent> + <!-- assuprimer du de l'utilisation de mavenpom --> <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -20,9 +25,9 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>nuitonutil</artifactId> + <version>1.1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -107,13 +112,16 @@ <properties> - <!-- id du projet du labs --> - <labs.id>39</labs.id> + <redmine.project>eugene</redmine.project> - <!-- name du projet du labs --> + <!-- assuprimer du de l'utilisation de mavenpom --> + <labs.id>39</labs.id> <labs.project>lutingenerator</labs.project> + <helper.version>1.0.0-SNAPSHOT</helper.version> + <helper.licenseName>lgpl_v3</helper.licenseName> + <site.home.url>http://lutingenerator.labs.libre-entreprise.org</site.home.url> + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> - <lutinutil.version>1.0.6</lutinutil.version> </properties> <build> @@ -259,22 +267,7 @@ </activation> <build> <plugins> - <!-- always add license and third-party files to classpath --> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - + <!-- launch in a release the assembly automaticly --> <plugin> <artifactId>maven-assembly-plugin</artifactId> Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -53,7 +53,7 @@ @Override public boolean getOverwrite() { - boolean overwrite = false; + boolean overwrite; if (parent == null) { overwrite = super.getOverwrite(); } else { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java 2009-05-14 12:26:03 UTC (rev 502) @@ -44,8 +44,8 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; -import org.codelutin.util.Resource; -import org.codelutin.util.ZipUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ZipUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -246,9 +246,6 @@ this.resolver = resolver; } - /** - * {@inheritDoc} - */ @Override public void execute() throws BuildException { @@ -572,6 +569,7 @@ return version; } + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-05-14 12:26:03 UTC (rev 502) @@ -80,6 +80,8 @@ /** * + * @param qualifiedName + * @return */ public static String getFilenameFromQualifiedName(String qualifiedName) { return qualifiedName.replace('.', File.separatorChar); @@ -87,6 +89,8 @@ /** * return all classifiers belonging to the given package recursively. The Collection may be empty. + * @param model + * @param packageName * @see ObjectModelClassifier * * @return a Collection containing all classifiers belonging to the given package recursively. @@ -103,6 +107,8 @@ } /** + * @param attribute + * @return * @see #getAttributeType(ObjectModelParameter, boolean) */ public static String getAttributeType(ObjectModelParameter attribute) { @@ -114,6 +120,7 @@ * ou le type defini si la cardinalité n'est pas multiple * * @param attribute + * @param useGenerics * @return attribute type */ public static String getAttributeType(ObjectModelParameter attribute, @@ -137,6 +144,7 @@ /** * Indicates if the specified attribute has a primitive type (byte, boolean, ...) + * @param attribute * @return true if the attribute has a primitive type */ public static boolean isPrimitiveAttributeType( @@ -153,6 +161,7 @@ /** * return an init value for the specified attribute + * @param attribute * @return a String with the corresponding attribute init value */ public static String getInitValue(ObjectModelAttribute attribute) { @@ -257,7 +266,8 @@ } /** - * Retourne la chaine de caractere dont on a besoin pour la declaration + * @param params + * @return la chaine de caractere dont on a besoin pour la declaration * des parametres d'une methode. */ public static String getMethodParameterDeclaration( @@ -275,7 +285,8 @@ } /** - * Retourne la chaine de caractere qui represente chaque nom de parametre + * @param params + * @return la chaine de caractere qui represente chaque nom de parametre * separer par des ','. */ public static String getMethodParameterListName( @@ -292,7 +303,8 @@ } /** - *@return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d + * @param attribute + * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d * si MaxMultiplicity == -1 ou > 1 */ public static boolean isNMultiplicity(ObjectModelAttribute attribute) { @@ -304,6 +316,7 @@ } /** + * @param attribute * @return true is the multiplicity of the given attribute is exactly 1 */ public static boolean isOneMultiplicity(ObjectModelAttribute attribute) { @@ -316,6 +329,8 @@ /** * + * @param word + * @return */ public static String toUpperCaseFirstLetter(String word) { return capitalize(word); @@ -333,12 +348,15 @@ /** * + * @param word + * @return */ public static String toLowerCaseFirstLetter(String word) { return word.substring(0, 1).toLowerCase() + word.substring(1); } /** + * @param attribute * @return true if the given attribute is a composition (composant of the reverse attribute) */ public static boolean isComposition(ObjectModelAttribute attribute) { @@ -421,7 +439,8 @@ } /** - * Retourne la chaine de caractere dont on a besoin pour la declaration + * @param operation + * @return la chaine de caractere dont on a besoin pour la declaration * des parametres d'une methode. */ public static String getOperationParametersListDeclaration( @@ -441,7 +460,8 @@ } /** - * Retourne la chaine de caractere qui represente chaque nom de parametre + * @param operation + * @return la chaine de caractere qui represente chaque nom de parametre * separer par des ','. */ public static String getOperationParametersListName( @@ -459,7 +479,8 @@ } /** - * Renvoie sous forme de String la liste des déclarations des attributes d'une classe donnée + * @param clazz + * @return sous forme de String la liste des déclarations des attributes d'une classe donnée */ public static String getClassAttributesListDeclaration( ObjectModelClass clazz) { @@ -547,6 +568,8 @@ * serialVersionUID. Exemple, returns "123456789L". * This id will change only if the type or the order of an attribute * changes. + * @param clazz + * @return the generated serialVersionUID */ public static String computeSerialVersionUID(ObjectModelClass clazz) { String query = clazz.getQualifiedName() + "#"; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java 2009-05-14 12:26:03 UTC (rev 502) @@ -38,6 +38,7 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter boolean modified = false; + //FIXME : ca sert a quoi duplique cette propriete qui existe dans FilterWriter ? StringWriter out = null; public MonitorWriter(StringWriter out) { @@ -53,16 +54,19 @@ return modified; } + @Override public void write(int c) throws IOException { super.write(c); modified = true; } + @Override public void write(char[] cbuf, int off, int len) throws IOException { super.write(cbuf, off, len); modified = true; } + @Override public void write(String str, int off, int len) throws IOException { super.write(str, off, len); modified = true; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -43,9 +43,9 @@ import org.nuiton.eugene.models.object.xml.ObjectModelImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; import org.nuiton.eugene.models.object.xml.ObjectModelImplTagValue; -import org.codelutin.util.FileUtil; -import org.codelutin.util.RecursiveProperties; -import org.codelutin.util.StringUtil; +import org.nuiton.util.FileUtil; +import org.nuiton.util.RecursiveProperties; +import org.nuiton.util.StringUtil; import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.xml.sax.SAXException; @@ -124,6 +124,7 @@ * @param destDir le répertoire dans lequel il faudra mettre les fichiers * générés */ + @Override public void generate(File[] files, File destDir) { setLastModifiedSource(files); ObjectModel objectModel = new ObjectModelImpl(); @@ -414,7 +415,9 @@ /** * Par defaut cette methode retourne le getName du model. Si l'on souhaite * utiliser la methode generateFromModel il vaut mieux surcharger cette - * m?thode + * methode + * @param model + * @return */ public String getFilenameForModel(ObjectModel model) { return model.getName(); @@ -423,6 +426,9 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param model + * @param packageName + * @return */ public String getFilenameForPackage(ObjectModel model, String packageName) { return packageName.replace('.', File.separatorChar); @@ -431,6 +437,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param interfacez + * @return */ public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar); @@ -439,6 +447,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param clazz + * @return */ public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar); @@ -447,6 +457,8 @@ /** * Par defaut cette methode retourne le QualifiedName convertie en chemin * par exemple pour org.codelutin.Toto on aurait org/codelutin/Toto + * @param clazz + * @return */ public String getFilenameForClassifier(ObjectModelClassifier clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar); Modified: eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -32,8 +32,8 @@ import org.nuiton.eugene.models.state.StateModelStateChart; import org.nuiton.eugene.models.state.xml.DigesterStateModelRuleSet; import org.nuiton.eugene.models.state.xml.StateModelImpl; -import org.codelutin.util.FileUtil; -import org.codelutin.util.RecursiveProperties; +import org.nuiton.util.FileUtil; +import org.nuiton.util.RecursiveProperties; import org.xml.sax.SAXException; /** @@ -123,6 +123,7 @@ /** * Try to load property file, associated to current statemodel file * + * @param stateModelFile * @param stateModel */ protected void loadPropertyFile(File stateModelFile, @@ -170,6 +171,7 @@ * * @param stateModel Le modele d'état * @param destDir le dossier de destination + * @throws IOException */ public void generate(StateModel stateModel, File destDir) throws IOException { @@ -252,6 +254,7 @@ * * @param state * the state + * @param packageName * @return the filename */ public String getFilenameFromState(StateModelState state, String packageName) { @@ -266,6 +269,7 @@ * the output writer * @param state * the state + * @throws IOException */ public void generateFromState(Writer monitorOut, StateModelState state) throws IOException { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java 2009-05-14 12:26:03 UTC (rev 502) @@ -32,7 +32,7 @@ import org.nuiton.eugene.models.ui.UIModelProperty; import org.nuiton.eugene.models.ui.impl.UIModelImpl; import org.nuiton.eugene.models.ui.javaxml.JavaXMLParser; -import org.codelutin.util.ResourceNotFoundException; +import org.nuiton.util.ResourceNotFoundException; import org.dom4j.DocumentException; import org.xml.sax.SAXException; @@ -63,6 +63,7 @@ return model; } + @Override public void generate(File[] tabUIFilesName, File destDir) { setLastModifiedSource(tabUIFilesName); for (int i = 0; i < tabUIFilesName.length; i++) { @@ -136,7 +137,8 @@ * Par defaut cette methode retourne le getName du model. Si l'on souhaite * utiliser la methode generateFromUIModel il vaut mieux surcharger cette * methode - */ + * @return le getName du model + */ public String getFilenameForUIModel(UIModel model) { return model.getRoot().getName().concat(".java"); } Modified: eugene/trunk/src/site/site.xml =================================================================== --- eugene/trunk/src/site/site.xml 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/site/site.xml 2009-05-14 12:26:03 UTC (rev 502) @@ -28,6 +28,7 @@ <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="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> </links> @@ -36,15 +37,15 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <item href="${repository.home.url}/org/nuiton/${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" + <item href="${repository.home.url}/org/nuiton/${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" + <item href="${repository.home.url}/org/nuiton/${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" + <item href="${repository.home.url}/org/nuiton/${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" + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" name="Bundle complêt (zip)"/> </menu> Modified: eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; -import org.codelutin.util.FileUtil; +import org.nuiton.util.FileUtil; import org.junit.Test; /** Modified: eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -3,7 +3,6 @@ import java.io.Serializable; import java.util.List; -import org.nuiton.eugene.ImportsManager; import junit.framework.TestCase; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -27,7 +27,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Test; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,7 @@ import java.util.Map; import org.nuiton.eugene.StateModelGenerator; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -18,13 +18,13 @@ package org.nuiton.eugene.models.ui.javaxml; import java.io.File; -import java.util.ArrayList; +import java.util.List; import org.nuiton.eugene.models.ui.UIModel; import org.nuiton.eugene.models.ui.impl.UIModelChildImpl; import org.nuiton.eugene.models.ui.impl.UIModelEventImpl; import org.nuiton.eugene.models.ui.impl.UIModelObjectImpl; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Test; @@ -83,10 +83,10 @@ Assert.assertEquals(object.getType(), "java.awt.GridBagLayout"); // test sur un event de l'enfant - ArrayList children = (ArrayList) ui.getRoot().getChildren(); + List<?> children = (List<?>) ui.getRoot().getChildren(); UIModelChildImpl child = (UIModelChildImpl) children.get(0); - ArrayList events = (ArrayList) child.getObject().getEvents(); + List<?> events = (List<?>) child.getObject().getEvents(); UIModelEventImpl event = (UIModelEventImpl) events.get(0); Assert.assertEquals(event.getAction(), "actionPerformed"); @@ -94,7 +94,7 @@ // test sur constraint de l'enfant UIModelObjectImpl constraint = (UIModelObjectImpl) child.getConstraint().getValue(); - ArrayList argConstraint = (ArrayList) constraint.getArguments(); + List<?> argConstraint = (List<?>) constraint.getArguments(); Assert.assertEquals(constraint.getType(), "java.awt.GridBagConstraints"); @@ -104,14 +104,14 @@ Assert.assertTrue(child.getObject().getChildren().size() == 0); // test sur une contrainte string (BorderLayout) - ArrayList children1 = (ArrayList) ui1.getRoot().getChildren(); + List<?> children1 = (List<?>) ui1.getRoot().getChildren(); UIModelChildImpl child1 = (UIModelChildImpl) children1.get(0); Object constraint1 = child1.getConstraint().getValue(); Assert.assertEquals(constraint1, "Center"); // test sur le nombre d'enfants d'une Frame est correct - ArrayList children2 = (ArrayList) ui2.getRoot().getChildren(); + List<?> children2 = (List<?>) ui2.getRoot().getChildren(); Assert.assertTrue(children2.size() == 1); // test sur une contrainte d'un panel genere Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,7 @@ import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Test; /** 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-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -24,7 +24,6 @@ import java.net.URISyntaxException; import java.net.URL; -import java.util.Collection; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -34,7 +33,7 @@ import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.xmi.util.ResourceResolver; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -66,6 +65,7 @@ * Apply XSLT Transformation. * * @param xmiFile + * @param modelFile * @return transformed file * @throws IOException * @throws TransformerException Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-05-14 12:26:03 UTC (rev 502) @@ -39,7 +39,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.xmi.util.ResourceResolver; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java 2009-05-12 15:56:07 UTC (rev 501) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java 2009-05-14 12:26:03 UTC (rev 502) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.Resource; +import org.nuiton.util.Resource; /** * ResourceResolver is a URIResolver for XSL transformation. <br/>