October 2008 - Buix-commits - mailman.cloud.codelutin.com

r887 - in lutinjaxx/trunk/jaxx-core/src/main/java/jaxx: compiler tags tags/swing
by tchemit＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: tchemit Date: 2008-10-07 18:59:01 +0000 (Tue, 07 Oct 2008) New Revision: 887 Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java Log: improve i18n with a dedicated I18nHelper class Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java 2008-10-07 18:59:01 UTC (rev 887) @@ -0,0 +1,70 @@ +package jaxx.compiler; + +import jaxx.tags.DefaultComponentHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Arrays; +import java.util.List; + +/** + * I18n methods to add {@link org.codelutin.i18n.I18n#_(String, Object[])} method on some attributes. + * + * Make sure to set an i18nable compiler to have his {@link CompilerOptions#isI18nable()} returning true. + * + * @author chemit + */ +public class I18nHelper { + + protected static final Log log = LogFactory.getLog(DefaultComponentHandler.class); + + public static final List<String> I18N_ATTRIBUTES = Arrays.asList("text", "title", "toolTipText"); + + /** + * Test if we have an active i18n attribute (says an i18n attribute on a i18neable compiler). + * + * @param attributeName name of attribute to test + * @param compiler current used compiler (contains options) + * @return <code>true</code> if wa have an active i18n attribute, <code>false</code> otherwise. + */ + public static boolean isI18nableAttribute(String attributeName, JAXXCompiler compiler) { + return compiler.getOptions().isI18nable() && isI18nAttribute(attributeName); + } + + /** + * Test if we have an i18n attribute. + * + * @param attributeName name of attribute to test + * @return <code>true</code> if wa have an active i18n attribute, <code>false</code> otherwise. + */ + public static boolean isI18nAttribute(String attributeName) { + return I18N_ATTRIBUTES.contains(attributeName); + } + /** + * Add the i18n on a attribute. + * + * Note: Be ware : no test is done here to ensure we are on a i18neable attribute for an i18nable compiler. + * + * Make sure with the method {@link jaxx.compiler.I18nHelper#isI18nableAttribute(String, JAXXCompiler)} returns + * <code>true</code< before using this method. + * + * @param widgetId the id of the widget + * @param attributeName the name of the attribute + * @param attributeValueCode the value code of the attribute value + * @param compiler the current used compile + * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise + */ + public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { + + if (log.isDebugEnabled()) { + log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); + } + if (attributeValueCode.contains("_(") && attributeValueCode.contains(")")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "' : ["+attributeValueCode+"]"); + } else { + attributeValueCode = "_(" + attributeValueCode + ")"; + } + + return attributeValueCode; + } +} Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-07 18:56:33 UTC (rev 886) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-07 18:59:01 UTC (rev 887) @@ -8,6 +8,7 @@ import jaxx.UnsupportedAttributeException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import org.apache.commons.logging.Log; @@ -22,8 +23,6 @@ import java.beans.IntrospectionException; import java.io.IOException; import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; public class DefaultComponentHandler extends DefaultObjectHandler { /** log */ @@ -31,8 +30,6 @@ private String containerDelegate; - private static final List<String> I18N_ATTRIBUTES = Arrays.asList("text", "title", "toolTipText"); - public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, Component.class); @@ -203,34 +200,14 @@ } } // ajout du support i18n - valueCode = addI18nInvocation(id, name, valueCode, compiler); + if (I18nHelper.isI18nableAttribute(name,compiler)) { + valueCode = I18nHelper.addI18nInvocation(id, name, valueCode, compiler); + } return super.getSetPropertyCode(id, name, valueCode, compiler); } - /** - * - * @param widgetId the id of the widget - * @param attributeName the name of the attribute - * @param attributeValueCode the value code of the attribute value - * @param compiler the current used compile - * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise - */ - public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { - if (I18N_ATTRIBUTES.contains(attributeName)) { - if (log.isDebugEnabled()) { - log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); - } - if (attributeValueCode.contains("_(") || attributeValueCode.contains(")")) { - compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "'"); - } else { - attributeValueCode = "_(" + attributeValueCode + ")"; - } - } - return attributeValueCode; - } - /** * Maps string values onto integers, so that int-valued enumeration properties can be specified by strings. For * example, when passed a key of 'alignment', this method should normally map the values 'left', 'center', and Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-07 18:56:33 UTC (rev 886) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-07 18:59:01 UTC (rev 887) @@ -7,10 +7,10 @@ import jaxx.CompilerException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; import jaxx.tags.TagHandler; -import jaxx.tags.DefaultComponentHandler; import jaxx.types.TypeManager; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -63,16 +63,20 @@ return; } + String valueCode = TypeManager.getJavaCode(value); + // add i18n support - String i18nvalue = DefaultComponentHandler.addI18nInvocation(id,name,TypeManager.getJavaCode(value),compiler); + if (I18nHelper.isI18nableAttribute(name,compiler)) { + value = valueCode = I18nHelper.addI18nInvocation(id,name,valueCode,compiler); + } if (name.equals("title")) { - tabInfo.setTitle(i18nvalue); - compiledTabInfo.appendInitializationCode(id + ".setTitle(" + i18nvalue + ");"); + tabInfo.setTitle(value); + compiledTabInfo.appendInitializationCode(id + ".setTitle(" + valueCode + ");"); //compiledTabInfo.appendInitializationCode(id + ".setTitle(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("toolTipText")) { - tabInfo.setToolTipText(i18nvalue); - compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + i18nvalue + ");"); + tabInfo.setToolTipText(value); + compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + valueCode + ");"); //compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("icon")) { Icon icon = (Icon) TypeManager.convertFromString(value, Icon.class);

1 0

r886 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: tchemit Date: 2008-10-07 18:56:33 +0000 (Tue, 07 Oct 2008) New Revision: 886 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java Log: explicitly modify the file lastmodified when regenerated Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-07 18:35:38 UTC (rev 885) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-07 18:56:33 UTC (rev 886) @@ -389,6 +389,9 @@ } else { dest = new File(baseDir, outputClassName.substring(outputClassName.lastIndexOf(".") + 1) + ".java"); } + if (dest.exists() && !dest.setLastModified(System.currentTimeMillis())) { + log.warn("could not touch file "+dest); + } PrintWriter out = new PrintWriter(new FileWriter(dest)); createJavaSource(out); out.close();

1 0

r885 - in lutinjaxx/trunk: . jaxx-core jaxx-core/src/site jaxx-core/src/site/fr jaxx-core/src/site/fr/rst jaxx-swing-action jaxx-swing-action/src/site jaxx-swing-action/src/site/fr jaxx-swing-action/src/site/fr/rst jaxx-util jaxx-util/src/site jaxx-util/src/site/fr jaxx-util/src/site/fr/rst maven-jaxx-plugin maven-jaxx-plugin/src/site maven-jaxx-plugin/src/site/fr maven-jaxx-plugin/src/site/fr/rst maven-jaxx-plugin/src/test/java/testcases maven-jaxx-plugin/src/test/java/testcases/force src sr
by tchemit＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: tchemit Date: 2008-10-07 18:35:38 +0000 (Tue, 07 Oct 2008) New Revision: 885 Added: lutinjaxx/trunk/jaxx-core/src/site/fr/ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-swing-action/src/site/fr/ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-util/src/site/fr/ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx lutinjaxx/trunk/src/ lutinjaxx/trunk/src/site/ lutinjaxx/trunk/src/site/fr/ lutinjaxx/trunk/src/site/fr/rst/ lutinjaxx/trunk/src/site/fr/rst/Todo.rst lutinjaxx/trunk/src/site/fr/rst/index.rst lutinjaxx/trunk/src/site/site.xml Removed: lutinjaxx/trunk/jaxx-core/src/site/site.xml lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml Modified: lutinjaxx/trunk/jaxx-core/pom.xml lutinjaxx/trunk/jaxx-swing-action/pom.xml lutinjaxx/trunk/jaxx-util/pom.xml lutinjaxx/trunk/maven-jaxx-plugin/pom.xml lutinjaxx/trunk/pom.xml Log: make site works with a multi-module project Modified: lutinjaxx/trunk/jaxx-core/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-core/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-core/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -44,4 +44,13 @@ </dependency> </dependencies> + +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> </project> Added: lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-core +========= + +.. contents:: + + +Présentation +------------ + +Le compilateur Jaxx TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Deleted: lutinjaxx/trunk/jaxx-core/src/site/site.xml =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/site.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-core/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="LutinUtil"> - - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin Buix Jaxx</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</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> - - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/buix/jaxx" name="T�l�chargement"/> - </menu> - - <menu name="D�veloppeur"> - <item name="A faire" href="Todo.html"/> - </menu> - - ${reports} - - </body> -</project> Modified: lutinjaxx/trunk/jaxx-swing-action/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-swing-action/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -51,4 +51,14 @@ </dependency> </dependencies> + +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> + </project> Added: lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-swing-action +================= + +.. contents:: + + +Présentation +------------ + +Framework de gestion des actions et onglets TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Deleted: lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="LutinUtil"> - - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin Buix Jaxx</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</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> - - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/buix/jaxx" name="T�l�chargement"/> - </menu> - - <menu name="D�veloppeur"> - <item name="A faire" href="Todo.html"/> - </menu> - - ${reports} - - </body> -</project> Modified: lutinjaxx/trunk/jaxx-util/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -16,6 +16,7 @@ <packaging>jar</packaging> <version>0.5-SNAPSHOT</version> <description>Jaxx lutin library utility</description> +  <build> <plugins> @@ -26,4 +27,12 @@ </plugins> </build> +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> </project> Added: lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +to be done \ No newline at end of file Added: lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-util +========= + +.. contents:: + + +Présentation +------------ + +Ensemble de classe Java TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Modified: lutinjaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -51,6 +51,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <scope>compile</scope> + </dependency> + </dependencies>  @@ -84,7 +90,7 @@ <reporting> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> </plugin> @@ -94,12 +100,10 @@    + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> -  -  - </project> Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +maven-jaxx-plugin +================= + +.. contents:: + + +Présentation +------------ + +Le plugin maven pour lancer le compilateur jaxx dans un projet maven TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <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> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Goals" href="plugin-info.html"/> + <item name="Détail goals"> + <item name="generate" href="generate-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + <menu name="Detail goals"> + <item name="generate" href="generate-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </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"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/text/JButton.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1 @@ +<JButton id='testId' text='test.text'/> \ No newline at end of file Modified: lutinjaxx/trunk/pom.xml =================================================================== --- lutinjaxx/trunk/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -20,7 +20,7 @@ <modules> <module>jaxx-util</module> <module>jaxx-core</module> - <module>jaxx-swing-action</module> + <module>jaxx-swing-action</module> <module>maven-jaxx-plugin</module> </modules> @@ -56,17 +56,18 @@ <labs.project>buix</labs.project>  - <maven.scm.url>http://${labs.host}/plugins/scmsvn/viewcvs.php/${pom.artifactId}/trunk/?root=${labs.project} - </maven.scm.url> + <scm.url.son>http://${labs.host}/plugins/scmsvn/viewcvs.php/lutinjaxx/trunk/${pom.artifactId}/?root=${labs.project}</scm.url.son> -  - <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk - </maven.scm.developerConnection> +  + <scm.developerConnection.son> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/${pom.artifactId} + </scm.developerConnection.son> -  - <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk</maven.scm.connection> +  + <scm.connection.son> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/${pom.artifactId} + </scm.connection.son> - </properties> <build> @@ -93,6 +94,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <executions> + + <execution> + <phase>pre-site</phase> + </execution> + </executions> </plugin> </plugins> @@ -104,7 +111,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31</version> </dependency> <dependency> @@ -122,7 +129,7 @@ <groupId>org.codelutin</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${current.version}</version> - </dependency> + </dependency> <dependency> <groupId>com.sun</groupId> @@ -152,13 +159,20 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement>    - <scm> + <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> <url>${maven.scm.url}</url> Added: lutinjaxx/trunk/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +lutinjaxx +========= + +.. contents:: + + +Présentation +------------ + +Super pom du projet jaxx. + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Added: lutinjaxx/trunk/src/site/site.xml =================================================================== --- lutinjaxx/trunk/src/site/site.xml (rev 0) +++ lutinjaxx/trunk/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <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> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </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"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project>

1 0

r884 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by sletellier＠users.labs.libre-entreprise.org 06 Oct '08

06 Oct '08

Author: sletellier Date: 2008-10-06 14:59:44 +0000 (Mon, 06 Oct 2008) New Revision: 884 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java Log: Correction bug constructeur Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java 2008-10-06 14:50:36 UTC (rev 883) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java 2008-10-06 14:59:44 UTC (rev 884) @@ -176,27 +176,28 @@ } - private void processConstructor(String modifiers, SimpleNode node) { - assert node.getId() == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION : "expected node to be ConstructorDeclaration, found " + JavaParserTreeConstants.jjtNodeName[node.getId()] + " instead"; - assert node.getChild(0).getId() == JavaParserTreeConstants.JJTFORMALPARAMETERS : "expected node 0 to be FormalParameters, found " + JavaParserTreeConstants.jjtNodeName[node.getChild(1).getId()] + " instead"; - if (node.getChild(0).jjtGetNumChildren() == 0) { - compiler.reportError("The default no-argument constructor may not be redefined"); - } - else { - SimpleNode explicitConstructorInvocation = findExplicitConstructorInvocation(node); - if (explicitConstructorInvocation == null || explicitConstructorInvocation.getText().trim().startsWith("super(")) { - String code = "$initialize();" + JAXXCompiler.getLineSeparator(); - if (explicitConstructorInvocation == null) { - node.getChild(1).firstToken.image = code + node.getChild(1).firstToken.image; - } - else { - explicitConstructorInvocation.lastToken.image += code; - } - } - } - - compiler.bodyCode.append(modifiers).append(" ").append(node.getText()); - //compiler.bodyCode.append(";\n"); + private void processConstructor(String modifiers, SimpleNode node) { + assert node.getId() == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION : "expected node to be ConstructorDeclaration, found " + JavaParserTreeConstants.jjtNodeName[node.getId()] + " instead"; + assert node.getChild(0).getId() == JavaParserTreeConstants.JJTFORMALPARAMETERS : "expected node 0 to be FormalParameters, found " + JavaParserTreeConstants.jjtNodeName[node.getChild(1).getId()] + " instead"; + String code = ""; + if (node.getChild(0).jjtGetNumChildren() == 0) { + compiler.reportError("The default no-argument constructor may not be redefined"); + } + else { + SimpleNode explicitConstructorInvocation = findExplicitConstructorInvocation(node); + if (explicitConstructorInvocation == null || explicitConstructorInvocation.getText().trim().startsWith("super(")) { + code = "$initialize();" + JAXXCompiler.getLineSeparator(); + if (explicitConstructorInvocation == null) { + node.getChild(1).firstToken.image = node.getChild(1).firstToken.image; + } + else { + explicitConstructorInvocation.lastToken.image += code; + } + } + } + + compiler.bodyCode.append(modifiers).append(" ").append(node.getText().substring(0,node.getText().length()-1) + code + "}"); + //compiler.bodyCode.append(";\n"); } @@ -332,4 +333,4 @@ } } } -} \ No newline at end of file +}

1 0

r883 - lutinjaxx/trunk/jaxx-core
by tchemit＠users.labs.libre-entreprise.org 06 Oct '08

06 Oct '08

Author: tchemit Date: 2008-10-06 14:50:36 +0000 (Mon, 06 Oct 2008) New Revision: 883 Modified: lutinjaxx/trunk/jaxx-core/changelog Log: changelog Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-06 14:50:20 UTC (rev 882) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-06 14:50:36 UTC (rev 883) @@ -1,5 +1,6 @@ ver-0-5 chemit 20081002 * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improvei18n integration (works now also for tabs) + * 20081002 [chemit] Improve i18n integration (works now also for tabs)

1 0

r882 - lutinjaxx/trunk/maven-jaxx-plugin/src/test/java
by tchemit＠users.labs.libre-entreprise.org 06 Oct '08

06 Oct '08

Author: tchemit Date: 2008-10-06 14:50:20 +0000 (Mon, 06 Oct 2008) New Revision: 882 Removed: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/jaxx/ Log: unused directory

1 0

r881 - lutinjaxx/trunk/jaxx-core
by tchemit＠users.labs.libre-entreprise.org 02 Oct '08

02 Oct '08

Author: tchemit Date: 2008-10-02 18:08:55 +0000 (Thu, 02 Oct 2008) New Revision: 881 Modified: lutinjaxx/trunk/jaxx-core/changelog Log: fix bug on method creation via scripting Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-02 18:08:00 UTC (rev 880) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-02 18:08:55 UTC (rev 881) @@ -1,3 +1,5 @@ ver-0-5 chemit 20081002 * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improvei18n integration (works now also for tabs)

1 0

r880 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect
by tchemit＠users.labs.libre-entreprise.org 02 Oct '08

02 Oct '08

Author: tchemit Date: 2008-10-02 18:08:00 +0000 (Thu, 02 Oct 2008) New Revision: 880 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/MethodDescriptor.java Log: fix bug on method creation via scripting Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/MethodDescriptor.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/MethodDescriptor.java 2008-10-02 17:55:51 UTC (rev 879) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/MethodDescriptor.java 2008-10-02 18:08:00 UTC (rev 880) @@ -35,8 +35,11 @@ public ClassDescriptor[] getParameterTypes() { ClassDescriptor[] result = new ClassDescriptor[parameterTypes.length]; try { - for (int i = 0; i < result.length; i++) - result[i] = ClassDescriptorLoader.getClassDescriptor(parameterTypes[i], getClassLoader()); + for (int i = 0; i < result.length; i++) { + if (parameterTypes[i] != null) { + result[i] = ClassDescriptorLoader.getClassDescriptor(parameterTypes[i], getClassLoader()); + } + } return result; } catch (ClassNotFoundException e) {

1 0

r879 - in lutinjaxx/trunk: jaxx-core/src/main/java/jaxx/tags jaxx-core/src/main/java/jaxx/tags/swing maven-jaxx-plugin/src/test/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org 02 Oct '08

02 Oct '08

Author: tchemit Date: 2008-10-02 17:55:51 +0000 (Thu, 02 Oct 2008) New Revision: 879 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: makes i18n work with tabs :) Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-02 17:49:08 UTC (rev 878) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-02 17:55:51 UTC (rev 879) @@ -203,14 +203,31 @@ } } // ajout du support i18n - if (I18N_ATTRIBUTES.contains(name)) { - if (valueCode.contains("_(") || valueCode.contains(")")) { - compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + name + "' in component '" + id + "'"); + valueCode = addI18nInvocation(id, name, valueCode, compiler); + + return super.getSetPropertyCode(id, name, valueCode, compiler); + } + + /** + * + * @param widgetId the id of the widget + * @param attributeName the name of the attribute + * @param attributeValueCode the value code of the attribute value + * @param compiler the current used compile + * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise + */ + public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { + if (I18N_ATTRIBUTES.contains(attributeName)) { + if (log.isDebugEnabled()) { + log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); + } + if (attributeValueCode.contains("_(") || attributeValueCode.contains(")")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "'"); } else { - valueCode = "_(" + valueCode + ")"; + attributeValueCode = "_(" + attributeValueCode + ")"; } } - return super.getSetPropertyCode(id, name, valueCode, compiler); + return attributeValueCode; } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-02 17:49:08 UTC (rev 878) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-02 17:55:51 UTC (rev 879) @@ -10,6 +10,7 @@ import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; import jaxx.tags.TagHandler; +import jaxx.tags.DefaultComponentHandler; import jaxx.types.TypeManager; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -24,6 +25,7 @@ import java.io.IOException; public class TabHandler implements TagHandler { + public void compileFirstPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { compileChildrenFirstPass(tag, compiler); } @@ -56,14 +58,22 @@ TabInfo tabInfo = tabs.tabInfo; String id = tabInfo.getId(); String binding = compiler.processDataBindings(value, ClassDescriptorLoader.getClassDescriptor(Object.class)); - if (binding != null) + if (binding != null) { compiler.registerDataBinding(binding, id + "." + name, id + ".set" + JAXXCompiler.capitalize(name) + "(" + binding + ");"); - else if (name.equals("title")) { - tabInfo.setTitle(value); - compiledTabInfo.appendInitializationCode(id + ".setTitle(" + TypeManager.getJavaCode(value) + ");"); + return; + } + + // add i18n support + String i18nvalue = DefaultComponentHandler.addI18nInvocation(id,name,TypeManager.getJavaCode(value),compiler); + + if (name.equals("title")) { + tabInfo.setTitle(i18nvalue); + compiledTabInfo.appendInitializationCode(id + ".setTitle(" + i18nvalue + ");"); + //compiledTabInfo.appendInitializationCode(id + ".setTitle(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("toolTipText")) { - tabInfo.setToolTipText(value); - compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + TypeManager.getJavaCode(value) + ");"); + tabInfo.setToolTipText(i18nvalue); + compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + i18nvalue + ");"); + //compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("icon")) { Icon icon = (Icon) TypeManager.convertFromString(value, Icon.class); tabInfo.setIcon(icon); @@ -94,8 +104,9 @@ compiledTabInfo.appendInitializationCode(id + ".setBackground(" + TypeManager.getJavaCode(background) + ");"); } else if (name.equals("id")) { // ignore, already handled - } else + } else { compiler.reportError("The <tab> tag does not support the attribute '" + name + "'"); + } } @@ -105,8 +116,9 @@ Attr attribute = (Attr) children.item(i); String name = attribute.getName(); String value = attribute.getValue(); - if (!name.startsWith("xmlns") && !JAXXCompiler.JAXX_INTERNAL_NAMESPACE.equals(attribute.getNamespaceURI())) + if (!name.startsWith("xmlns") && !JAXXCompiler.JAXX_INTERNAL_NAMESPACE.equals(attribute.getNamespaceURI())) { setAttribute(compiledTabInfo, tabs, name, value, compiler); + } } } @@ -122,8 +134,9 @@ } else if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { String text = ((Text) node).getData().trim(); - if (text.length() > 0) + if (text.length() > 0) { compiler.reportError("tag '" + tag.getLocalName() + "' may not contain text ('" + ((Text) node).getData().trim() + "')"); + } } } } @@ -145,8 +158,9 @@ } else if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { String text = ((Text) node).getData().trim(); - if (text.length() > 0) + if (text.length() > 0) { compiler.reportError("tag '" + tag.getLocalName() + "' may not contain text ('" + ((Text) node).getData().trim() + "')"); + } } } } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-02 17:49:08 UTC (rev 878) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-02 17:55:51 UTC (rev 879) @@ -9,21 +9,21 @@ public class I18nTest extends AbstractCompilerTest { - @CompileConfig(packageName = "i18n.text", verbose = true) + @CompileConfig(packageName = "i18n.text", verbose = false) public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); assertTrue(true); checkPattern("testId.setText(_(\"test.text\"));"); } - @CompileConfig(packageName = "i18n.title", verbose = true) + @CompileConfig(packageName = "i18n.title", verbose = false) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); assertTrue(true); checkPattern("testId.setTitle(_(\"test.title\"));"); } - @CompileConfig(packageName = "i18n.tooltiptext", verbose = true) + @CompileConfig(packageName = "i18n.tooltiptext", verbose = false) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); assertTrue(true);

1 0

r878 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 02 Oct '08

02 Oct '08

Author: tchemit Date: 2008-10-02 17:49:08 +0000 (Thu, 02 Oct 2008) New Revision: 878 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXContext.java Log: fix bug : some jaxx object are not Container, so modify the new method getContainerParent Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXContext.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXContext.java 2008-10-02 17:48:54 UTC (rev 877) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXContext.java 2008-10-02 17:49:08 UTC (rev 878) @@ -61,5 +61,5 @@ * @param clazz desired * @return parent's container */ - public <O extends Container> O getParentContainer(Container top, Class<O> clazz); + public <O extends Container> O getParentContainer(Object top, Class<O> clazz); }

1 0