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

r179 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 20:49:44 +0000 (Mon, 21 Jan 2008) New Revision: 179 Modified: trunk/jaxx/pom.xml trunk/jaxx/profiles.xml Log: ajout dependence direct lutinutil + correction valeurs dans profiles Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-01-13 20:25:53 UTC (rev 178) +++ trunk/jaxx/pom.xml 2008-01-21 20:49:44 UTC (rev 179) @@ -26,6 +26,12 @@ <version>0.10-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinutil</artifactId> + <version>0.29-SNAPSHOT</version> + <scope>compile</scope> + </dependency>  <dependency> <groupId>com.sun</groupId> Modified: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-01-13 20:25:53 UTC (rev 178) +++ trunk/jaxx/profiles.xml 2008-01-21 20:49:44 UTC (rev 179) @@ -17,13 +17,13 @@ <labs.project>buix</labs.project>  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project}</maven.scm.url>  - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> + <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection>  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection>  <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class>

1 0

r178 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 20:25:53 +0000 (Sun, 13 Jan 2008) New Revision: 178 Modified: trunk/maven-jaxx-plugin/profiles.xml Log: les tests sont lanc?\195?\169s avant un install Modified: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-01-13 20:06:00 UTC (rev 177) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-01-13 20:25:53 UTC (rev 178) @@ -5,12 +5,15 @@ <id>project</id> <properties> -  +  <labs.id>38</labs.id>  <labs.project>buix</labs.project> +  + <maven.test.skip>false</maven.test.skip> +  <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url>

1 0

r177 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 20:06:00 +0000 (Sun, 13 Jan 2008) New Revision: 177 Modified: trunk/jaxx/pom.xml Log: le groupid est lutinlib et non buix Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-01-13 19:47:53 UTC (rev 176) +++ trunk/jaxx/pom.xml 2008-01-13 20:06:00 UTC (rev 177) @@ -15,7 +15,7 @@ <version>2.3</version> </parent> - <groupId>buix</groupId> + <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId> <dependencies>

1 0

r176 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:47:53 +0000 (Sun, 13 Jan 2008) New Revision: 176 Modified: trunk/jaxx/pom.xml trunk/jaxx/profiles.xml Log: utilisation du projet parent lutinpom:lutinproject:2.3 au lieu de l'ancien lutinlib:lutinproject:2.2 utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2 Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-01-13 19:46:57 UTC (rev 175) +++ trunk/jaxx/pom.xml 2008-01-13 19:47:53 UTC (rev 176) @@ -5,61 +5,19 @@ <modelVersion>4.0.0</modelVersion> +  +  +  + <parent> - <groupId>lutinlib</groupId> + <groupId>lutinpom</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>2.3</version> </parent> + <groupId>buix</groupId> <artifactId>jaxx</artifactId> - <name>Jaxx core library</name> - - <packaging>jar</packaging> - - <version>1.0.4-SNAPSHOT</version> - - <description>Librairie contenant le framework jaxx</description> - - <inceptionYear>2008</inceptionYear> - - <contributors> - <contributor> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </contributor> - </contributors> - - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id={labs.id}</url> - </issueManagement> - - <distributionManagement> - <repository> - <id>labs</id> - <url> - scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2 - </url> - </repository> - <site> - <id>labs</id> - <url> - scp://labs.libre-entreprise.org/home/groups/buix/htdocs/${pom.artifactId} - </url> - </site> - </distributionManagement> - - <scm> - <connection>scm:svn:svn:anonymous@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</connection> - <developerConnection>scm:svn:svn+ssh:${username}@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</developerConnection> - <url>https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/?root=buix</url> - </scm> - <dependencies>  <dependency> @@ -85,4 +43,43 @@ </dependency> </dependencies> +  +  +  + + <name>Jaxx core library</name> + <version>1.0.4-SNAPSHOT</version> + + <description>Library of framework jaxx</description> + <inceptionYear>2008</inceptionYear> + + <developers> + <developer> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + </developers> + +  +  +  + + <packaging>jar</packaging> + +  +  +  + +  + <scm> + <url>${maven.scm.url}</url> + </scm> + </project> Modified: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-01-13 19:46:57 UTC (rev 175) +++ trunk/jaxx/profiles.xml 2008-01-13 19:47:53 UTC (rev 176) @@ -10,19 +10,21 @@ <properties> -  +  <labs.id>38</labs.id> -  - <maven.src.dir>${basedir}/src</maven.src.dir> +  + <labs.project>buix</labs.project> -  - <maven.test.skip>true</maven.test.skip> +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> +  + <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> +  <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class>

1 0

r175 - trunk/buix
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:46:57 +0000 (Sun, 13 Jan 2008) New Revision: 175 Modified: trunk/buix/pom.xml Log: modification url de d?\195?\169pot de release Modified: trunk/buix/pom.xml =================================================================== --- trunk/buix/pom.xml 2008-01-13 19:45:14 UTC (rev 174) +++ trunk/buix/pom.xml 2008-01-13 19:46:57 UTC (rev 175) @@ -54,7 +54,7 @@ <site> <id>labs</id> <url> - scp://labs.libre-entreprise.org/home/groups/buix/${pom.artifactId}/htdocs/ + scp://labs.libre-entreprise.org/home/groups/buix/htdocs/${pom.artifactId} </url> </site> </distributionManagement>

1 0

r174 - trunk/jaxx/src/test
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:45:14 +0000 (Sun, 13 Jan 2008) New Revision: 174 Added: trunk/jaxx/src/test/resources/ Log: utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2

1 0

r173 - in trunk/jaxx/src/test: . java
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:44:50 +0000 (Sun, 13 Jan 2008) New Revision: 173 Added: trunk/jaxx/src/test/java/jaxx/ Removed: trunk/jaxx/src/test/jaxx/ Log: utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2 Copied: trunk/jaxx/src/test/java/jaxx (from rev 172, trunk/jaxx/src/test/jaxx)

1 0

r172 - trunk/jaxx/src/test
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:44:23 +0000 (Sun, 13 Jan 2008) New Revision: 172 Added: trunk/jaxx/src/test/java/ Log: utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2

1 0

r171 - in trunk/jaxx/src: . main
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:44:02 +0000 (Sun, 13 Jan 2008) New Revision: 171 Added: trunk/jaxx/src/main/resources/ Removed: trunk/jaxx/src/resources/ Log: utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2 Copied: trunk/jaxx/src/main/resources (from rev 170, trunk/jaxx/src/resources)

1 0

r170 - in trunk/jaxx/src: . main
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:41:10 +0000 (Sun, 13 Jan 2008) New Revision: 170 Added: trunk/jaxx/src/main/java/ Removed: trunk/jaxx/src/java/ Log: utilisation des conventions de nommage des r?\195?\169pertoires d?\195?\169finies par maven 2 Copied: trunk/jaxx/src/main/java (from rev 169, trunk/jaxx/src/java)

1 0

r169 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:12:27 +0000 (Sun, 13 Jan 2008) New Revision: 169 Modified: trunk/maven-jaxx-plugin/profiles.xml Log: formatage Modified: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-01-13 19:12:08 UTC (rev 168) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-01-13 19:12:27 UTC (rev 169) @@ -4,8 +4,10 @@ <profile> <id>project</id> <properties> +  <labs.id>38</labs.id> +  <labs.project>buix</labs.project> @@ -17,7 +19,7 @@  <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> - + </properties> </profile> </profiles>

1 0

r168 - trunk/jaxx/src/site
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 19:12:08 +0000 (Sun, 13 Jan 2008) New Revision: 168 Modified: trunk/jaxx/src/site/site.xml Log: changement zone de t?\195?\169l?\195?\169chargement buix/jaxx Modified: trunk/jaxx/src/site/site.xml =================================================================== --- trunk/jaxx/src/site/site.xml 2008-01-13 18:51:33 UTC (rev 167) +++ trunk/jaxx/src/site/site.xml 2008-01-13 19:12:08 UTC (rev 168) @@ -30,7 +30,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/jaxx" name="T�l�chargement"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/buix/jaxx" name="T�l�chargement"/> </menu> <menu name="D�veloppeur">

1 0

r167 - trunk/jaxx/src
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 18:51:33 +0000 (Sun, 13 Jan 2008) New Revision: 167 Added: trunk/jaxx/src/main/ Log: ajout du r?\195?\169pertoire main (pour mihration vers projet maven 2 standard)

1 0

r166 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Jan. 13, 2008

Jan. 13, 2008

Author: tchemit Date: 2008-01-13 18:15:57 +0000 (Sun, 13 Jan 2008) New Revision: 166 Modified: trunk/maven-jaxx-plugin/pom.xml trunk/maven-jaxx-plugin/profiles.xml Log: d?\195?\169finition d'un pom parent pour tous nos plugins : (qui respecte les conventions de nommage des r?\195?\169pertoires de Maven 2) voir le pom lutinpom:lutinpluginproject:2.3 utilisation de ce pom, dans la d?\195?\169finition du pom enfant, on ne doit plus voir appara?\195?\174tre de propri?\195?\169t?\195?\169s en dure!!!! les propri?\195?\169t?\195?\169s requises sont dans profiles.xml Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-01-12 22:25:58 UTC (rev 165) +++ trunk/maven-jaxx-plugin/pom.xml 2008-01-13 18:15:57 UTC (rev 166) @@ -5,156 +5,74 @@ <modelVersion>4.0.0</modelVersion> - <groupId>lutinplugin</groupId> +  +  +  + <parent> + <groupId>lutinpom</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>2.3</version> + </parent> + + <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <name>Plugin maven pour compiler du code jaxx</name> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>jaxx</artifactId> + <version>1.0.4-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + <scope>compile</scope> + </dependency> + </dependencies> - <packaging>maven-plugin</packaging> +  +  +  - <version>0.1-SNAPSHOT</version> + <name>Maven 2 jaxx compilator plugin</name> + <version>0.2-SNAPSHOT</version> <description> - Plugin maven 2 pour la g�n�ration de code source java � partir de - d�finition d'interface graphiques au format jaxx + Maven 2 plugin to generate java source from ui interface definitions + in jaxx format. </description> <inceptionYear>2008</inceptionYear> - <contributors> - <contributor> + <developers> + <developer> <name>Tony Chemit</name> <email>chemit(a)codelutin.com</email> <organization>Code Lutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Developer</role> </roles> - </contributor> - </contributors> + </developer> + </developers> -  - <build> - <plugins> - <plugin> -  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>ISO-8859-1</encoding> - </configuration> - </plugin> - </plugins> +  +  +  - </build> + <packaging>maven-plugin</packaging> - <distributionManagement> - <repository> - <id>labs</id> - <url> - scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2 - </url> - </repository> - <site> - <id>labs</id> - <url> - scp://labs.libre-entreprise.org/home/groups/buix/htdocs/${pom.artifactId} - </url> - </site> - </distributionManagement> -  - - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=${labs.id}</url> - </issueManagement> - +  +  +  + +  <scm> - <connection>scm:svn:svn:anonymous@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</connection> - <developerConnection>scm:svn:svn+ssh:${username}@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</developerConnection> - <url>https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/?root=buix</url> + <url>${maven.scm.url}</url> </scm> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>2.0.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.0.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <version>1.0.4-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <mailingLists> - <mailingList> - <name>buix-cvscomit</name> - <subscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-cvscommit - </subscribe> - <unsubscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-cvscommit - </unsubscribe> - <archive> - http://lists.labs.libre-entreprise.org/pipermail/buix-cvscommit/ - </archive> - </mailingList> - - <mailingList> - <name>buix-devel</name> - <subscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-devel - </subscribe> - <unsubscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-devel - </unsubscribe> - <archive> - http://lists.labs.libre-entreprise.org/pipermail/buix-devel/ - </archive> - </mailingList> - - <mailingList> - <name>buix-user</name> - <subscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-user - </subscribe> - <unsubscribe> - http://lists.labs.libre-entreprise.org/mailman/listinfo/buix-user - </unsubscribe> - <archive> - http://lists.labs.libre-entreprise.org/pipermail/buix-user/ - </archive> - </mailingList> - </mailingLists> - </project> Modified: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-01-12 22:25:58 UTC (rev 165) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-01-13 18:15:57 UTC (rev 166) @@ -1,31 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <settings> - <profiles> - <profile> - <id>project</id> + <profiles> + <profile> + <id>project</id> + <properties> +  + <labs.id>38</labs.id> +  + <labs.project>buix</labs.project> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>user.locale</name> - <value>ISO-8859-1</value> - </property> - </activation> +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> - <properties> - <labs.id>38</labs.id> - <maven.verbose>false</maven.verbose> - -  - <maven.test.skip>false</maven.test.skip> +  + <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> -  - <maven.src.dir>${basedir}/src</maven.src.dir> +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> </properties> - </profile> - </profiles> + </profile> + </profiles> </settings>

1 0

r165 - trunk/maven-jaxx-plugin/src/main/resources
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 22:25:58 +0000 (Sat, 12 Jan 2008) New Revision: 165 Added: trunk/maven-jaxx-plugin/src/main/resources/log4j.properties Log: ajout d'une configuration de log (pour les log de lutinwidget) Added: trunk/maven-jaxx-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/maven-jaxx-plugin/src/main/resources/log4j.properties (rev 0) +++ trunk/maven-jaxx-plugin/src/main/resources/log4j.properties 2008-01-12 22:25:58 UTC (rev 165) @@ -0,0 +1,7 @@ +# Global logging configuration +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +file:///home/tony/.m2/repository/lutinlib/lutinproject/2.2/lutinproject-2.2.pom

1 0

r164 - in trunk/jaxx/src/java/jaxx: compiler tags
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 21:37:23 +0000 (Sat, 12 Jan 2008) New Revision: 164 Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java Log: correction des ; manquant dans les scripts g?\195?\169n?\195?\169r?\195?\169s mise en conformit?\195?\169 du code Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 21:32:32 UTC (rev 163) +++ trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 21:37:23 UTC (rev 164) @@ -1001,8 +1001,9 @@ public void run() { DefaultObjectHandler handler = (DefaultObjectHandler) TagManager.getTagHandler(null, finalClassName, JAXXCompiler.this); - if (handler == null) + if (handler == null) { throw new CompilerException("Internal error: missing TagHandler for '" + finalClassName + "'"); + } handler.registerCompiledObject(tag, JAXXCompiler.this); } }); @@ -1169,8 +1170,9 @@ public void closeComponent(CompiledObject component) { - if (openComponents.pop() != component) + if (openComponents.pop() != component) { throw new IllegalArgumentException("can only close the topmost open object"); + } } @@ -1181,14 +1183,17 @@ public void registerCompiledObject(CompiledObject object) { assert symbolTables.values().contains(symbolTable) : "attempting to register CompiledObject before pass 1 is complete"; - if (root == null) + if (root == null) { root = object; + } String id = object.getId(); - if (ids.containsKey(object)) + if (ids.containsKey(object)) { reportError("object '" + object + "' is already registered with id '" + ids.get(object) + "', cannot re-register as '" + id + "'"); - if (objects.containsKey(id) && !(objects.get(id) instanceof Element)) + } + if (objects.containsKey(id) && !(objects.get(id) instanceof Element)) { reportError("id '" + id + "' is already registered to component " + objects.get(id)); + } objects.put(id, object); ids.put(object, id); } @@ -1279,15 +1284,17 @@ int lastPos = 0; while (pos != -1 && pos < stringValue.length()) { if (pos > lastPos) { - if (expression.length() > 0) + if (expression.length() > 0) { expression.append(" + "); + } expression.append('"'); expression.append(JAXXCompiler.escapeJavaString(stringValue.substring(lastPos, pos))); expression.append('"'); } - if (expression.length() > 0) + if (expression.length() > 0) { expression.append(" + "); + } expression.append('('); int pos2 = getNextRightBrace(stringValue, pos + 1); if (pos2 == -1) { @@ -1306,8 +1313,9 @@ } } if (lastPos < stringValue.length()) { - if (expression.length() > 0) + if (expression.length() > 0) { expression.append(" + "); + } expression.append('"'); expression.append(JAXXCompiler.escapeJavaString(stringValue.substring(lastPos))); expression.append('"'); @@ -1384,8 +1392,9 @@ public void addScriptMethod(MethodDescriptor method) { - if (method.getName().equals("main") && method.getParameterTypes().length == 1 && method.getParameterTypes()[0].getName().equals("[Ljava.lang.String;")) + if (method.getName().equals("main") && method.getParameterTypes().length == 1 && method.getParameterTypes()[0].getName().equals("[Ljava.lang.String;")) { mainDeclared = true; + } symbolTable.getScriptMethods().add(method); } @@ -1396,14 +1405,20 @@ public void registerScript(String script, File sourceFile) throws CompilerException { - if (sourceFile != null) + if (sourceFile != null) { sourceFiles.push(sourceFile); + } + script = script.trim(); + if (!"".equals(script) && !script.endsWith("}") && !script.endsWith(";")) { + script +=";"; + } scriptManager.registerScript(script); if (sourceFile != null) { File pop = sourceFiles.pop(); - if (pop != sourceFile) + if (pop != sourceFile) { throw new RuntimeException("leaving registerScript(), but " + sourceFile + " was not the top entry on the stack (found " + pop + " instead)"); + } } } @@ -1414,17 +1429,20 @@ public void registerStylesheet(Stylesheet stylesheet) { - if (this.stylesheet == null) + if (this.stylesheet == null) { this.stylesheet = stylesheet; - else + } + else { this.stylesheet.add(stylesheet.getRules()); + } } public Stylesheet getStylesheet() { Stylesheet merged = new Stylesheet(); - if (stylesheet != null) + if (stylesheet != null) { merged.add(stylesheet.getRules()); + } merged.add(inlineStyles.toArray(new Rule[inlineStyles.size()])); return merged; } @@ -1442,8 +1460,9 @@ public void reportWarning(String warning) { Element currentTag = null; - if (!tagsBeingCompiled.isEmpty()) + if (!tagsBeingCompiled.isEmpty()) { currentTag = tagsBeingCompiled.peek(); + } reportWarning(currentTag, warning, 0); } @@ -1452,8 +1471,9 @@ String lineNumber = null; if (tag != null) { String lineAttr = tag.getAttributeNS(JAXX_INTERNAL_NAMESPACE, "line"); - if (lineAttr.length() > 0) + if (lineAttr.length() > 0) { lineNumber = lineAttr; + } } File src = sourceFiles.peek(); try { @@ -1464,8 +1484,9 @@ } System.err.print(src); - if (lineNumber != null) + if (lineNumber != null) { System.err.print(":" + ((sourceFiles.size() == 1) ? Integer.parseInt(lineNumber) + lineOffset : lineOffset + 1)); + } System.err.println(": Warning: " + warning); warningCount++; } @@ -1473,8 +1494,9 @@ public void reportError(String error) { Element currentTag = null; - if (!tagsBeingCompiled.isEmpty()) + if (!tagsBeingCompiled.isEmpty()) { currentTag = tagsBeingCompiled.peek(); + } reportError(currentTag, error); } @@ -1486,16 +1508,20 @@ public void reportError(String extraMessage, CompilerException ex) { String message = ex.getMessage(); - if (ex.getClass() == UnsupportedAttributeException.class || ex.getClass() == UnsupportedTagException.class) + if (ex.getClass() == UnsupportedAttributeException.class || ex.getClass() == UnsupportedTagException.class) { message = ex.getClass().getName().substring(ex.getClass().getName().lastIndexOf(".") + 1) + ": " + message; + } int lineOffset; - if (ex instanceof ParseException) + if (ex instanceof ParseException) { lineOffset = Math.max(0, ((ParseException) ex).getLine() - 1); - else + } + else { lineOffset = 0; + } Element currentTag = null; - if (!tagsBeingCompiled.isEmpty()) + if (!tagsBeingCompiled.isEmpty()) { currentTag = tagsBeingCompiled.peek(); + } reportError(currentTag, extraMessage != null ? extraMessage + message : message, lineOffset); } @@ -1509,8 +1535,9 @@ int lineNumber = 0; if (tag != null) { String lineAttr = tag.getAttributeNS(JAXX_INTERNAL_NAMESPACE, "line"); - if (lineAttr.length() > 0) + if (lineAttr.length() > 0) { lineNumber = Integer.parseInt(lineAttr); + } } lineNumber = Math.max(lineNumber, 1) + lineOffset; reportError(lineNumber, error); @@ -1520,16 +1547,18 @@ public void reportError(int lineNumber, String error) { File src = sourceFiles.isEmpty() ? null : sourceFiles.peek(); try { - if (src != null) + if (src != null) { src = src.getCanonicalFile(); + } } catch (IOException e) { // ignore ? } System.err.print(src != null ? src.getPath() : "<unknown source>"); - if (lineNumber > 0) + if (lineNumber > 0) { System.err.print(":" + lineNumber); + } System.err.println(": " + error); errorCount++; failed = true; @@ -1558,8 +1587,9 @@ i++; } else if (c < 32 || c > 127) { String value = Integer.toString((int) c, 16); - while (value.length() < 4) + while (value.length() < 4) { value = "0" + value; + } out.replace(i, i + 1, "\\u" + value); i += 5; } @@ -1587,8 +1617,9 @@ public ClassLoader getClassLoader() { if (classLoader == null) { String classPath = options.getClassPath(); - if (classPath == null) + if (classPath == null) { classPath = "."; + } String[] paths = classPath.split(File.pathSeparator); URL[] urls = new URL[paths.length]; for (int i = 0; i < paths.length; i++) { @@ -1623,8 +1654,9 @@ */ public static SymbolTable getSymbolTable(String className) { JAXXCompiler compiler = getJAXXCompiler(className); - if (compiler == null) + if (compiler == null) { return null; + } return compiler.getSymbolTable(); } @@ -1633,11 +1665,13 @@ } public static File URLtoFile(String urlString) { - if (!urlString.startsWith("file:")) + if (!urlString.startsWith("file:")) { throw new IllegalArgumentException("url must start with 'file:'"); + } urlString = urlString.substring("file:".length()); - if (urlString.startsWith("/") && System.getProperty("os.name").startsWith("Windows")) + if (urlString.startsWith("/") && System.getProperty("os.name").startsWith("Windows")) { urlString = urlString.substring(1); + } try { return new File(URLDecoder.decode(urlString.replace('/', File.separatorChar), "utf-8")); } @@ -1654,8 +1688,9 @@ try { File jaxxFile = URLtoFile(jaxxURL); File classFile = URLtoFile(classURL); - if (classFile.lastModified() > jaxxFile.lastModified()) + if (classFile.lastModified() > jaxxFile.lastModified()) { return; // class file is newer, no need to recompile + } } catch (Exception e) { // do nothing @@ -1673,8 +1708,9 @@ assert jaxxFile.getName().equalsIgnoreCase(className.substring(className.lastIndexOf(".") + 1) + ".jaxx") : "expecting file name to match " + className + ", but found " + jaxxFile.getName(); if (jaxxFile.getName().equals(className.substring(className.lastIndexOf(".") + 1) + ".jaxx")) { // check case match - if (currentPass == PASS_2) + if (currentPass == PASS_2) { throw new AssertionError("Internal error: adding dependency class " + className + " during second compilation pass"); + } jaxxFileClassNames.add(className); jaxxFiles.add(jaxxFile); } @@ -1917,18 +1953,23 @@ success = false; } options.setTargetDirectory(targetDirectory); - } else + } else { success = false; + } } else if (arg[i].equals("-cp") || arg[i].equals("-classpath")) { - if (++i < arg.length) + if (++i < arg.length) { options.setClassPath(arg[i]); - else + } + else { success = false; + } } else if (arg[i].equals("-javac_opts")) { - if (++i < arg.length) + if (++i < arg.length) { options.setJavacOpts(arg[i]); - else + } + else { success = false; + } } else if (arg[i].equals("-k") || arg[i].equals("-keep")) options.setKeepJavaFiles(true); else if (arg[i].equals("-j") || arg[i].equals("-java")) { @@ -1951,8 +1992,9 @@ success &= (errorCount == 0 && files.size() > 0); - if (success) + if (success) { success = compile(new File("."), files.toArray(new String[files.size()]), options); + } else { showUsage(); System.exit(1); Modified: trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 21:32:32 UTC (rev 163) +++ trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 21:37:23 UTC (rev 164) @@ -88,26 +88,32 @@ private void preprocessScriptNode(SimpleNode node, boolean staticContext) throws CompilerException { // identify static methods and initializers -- we can't fire events statically if (node.getId() == JavaParserTreeConstants.JJTMETHODDECLARATION) { - if (node.getParent().getChild(0).getText().indexOf("static") != -1) + if (node.getParent().getChild(0).getText().indexOf("static") != -1) { staticContext = true; + } } else if (node.getId() == JavaParserTreeConstants.JJTINITIALIZER) - if (node.getText().trim().startsWith("static")) + if (node.getText().trim().startsWith("static")) { staticContext = true; + } int count = node.jjtGetNumChildren(); - for (int i = 0; i < count; i++) + for (int i = 0; i < count; i++) { preprocessScriptNode(node.getChild(i), staticContext); + } int id = node.getId(); - if (id == JavaParserTreeConstants.JJTNAME || id == JavaParserTreeConstants.JJTCLASSORINTERFACETYPE) + if (id == JavaParserTreeConstants.JJTNAME || id == JavaParserTreeConstants.JJTCLASSORINTERFACETYPE) { scanCompoundSymbol(node.getText()); + } if (!staticContext) { String lhs = null; - if (id == JavaParserTreeConstants.JJTASSIGNMENTEXPRESSION || (id == JavaParserTreeConstants.JJTPOSTFIXEXPRESSION && node.jjtGetNumChildren() == 2)) + if (id == JavaParserTreeConstants.JJTASSIGNMENTEXPRESSION || (id == JavaParserTreeConstants.JJTPOSTFIXEXPRESSION && node.jjtGetNumChildren() == 2)) { lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); + } else - if (id == JavaParserTreeConstants.JJTPREINCREMENTEXPRESSION || id == JavaParserTreeConstants.JJTPREDECREMENTEXPRESSION) + if (id == JavaParserTreeConstants.JJTPREINCREMENTEXPRESSION || id == JavaParserTreeConstants.JJTPREDECREMENTEXPRESSION) { lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); + } if (lhs != null) { FieldDescriptor[] fields = compiler.getScriptFields(); for (FieldDescriptor field : fields) { @@ -135,31 +141,36 @@ if (line.jjtGetNumChildren() == 1) { SimpleNode node = line.getChild(0); if (node.getId() == JavaParserTreeConstants.JJTBLOCKSTATEMENT) { - if (node.jjtGetNumChildren() == 1) + if (node.jjtGetNumChildren() == 1) { return node.getChild(0).getId(); + } } else if (node.getId() == JavaParserTreeConstants.JJTCLASSORINTERFACEBODYDECLARATION) { int id = node.getChild(0).getId(); - if (id == JavaParserTreeConstants.JJTMODIFIERS) + if (id == JavaParserTreeConstants.JJTMODIFIERS) { return node.getChild(1).getId(); - else if (id == JavaParserTreeConstants.JJTINITIALIZER) + } + if (id == JavaParserTreeConstants.JJTINITIALIZER) { return id; + } } return node.getId(); - } else - return JavaParserTreeConstants.JJTLINE; // generic value implying that it's okay to put into the initializer block + } + return JavaParserTreeConstants.JJTLINE; // generic value implying that it's okay to put into the initializer block } private SimpleNode findExplicitConstructorInvocation(SimpleNode parent) { - if (parent.getId() == JavaParserTreeConstants.JJTEXPLICITCONSTRUCTORINVOCATION) + if (parent.getId() == JavaParserTreeConstants.JJTEXPLICITCONSTRUCTORINVOCATION) { return parent; + } int count = parent.jjtGetNumChildren(); for (int i = 0; i < count; i++) { SimpleNode result = findExplicitConstructorInvocation(parent.getChild(i)); - if (result != null) + if (result != null) { return result; + } } return null; } @@ -168,16 +179,19 @@ 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) + 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) + if (explicitConstructorInvocation == null) { node.getChild(1).firstToken.image = code + node.getChild(1).firstToken.image; - else + } + else { explicitConstructorInvocation.lastToken.image += code; + } } } @@ -190,10 +204,12 @@ int nodeType = getLineType(node); if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { // have to handle imports early so the preprocessing takes them into account String text = node.getChild(0).getText().trim(); - if (text.startsWith("import")) + if (text.startsWith("import")) { text = text.substring("import".length()).trim(); - if (text.endsWith(";")) + } + if (text.endsWith(";")) { text = text.substring(0, text.length() - 1); + } compiler.addImport(text); } @@ -241,7 +257,11 @@ } else if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEDECLARATION || nodeType == JavaParserTreeConstants.JJTINITIALIZER) { - compiler.bodyCode.append(node.getText()); + String str = node.getText().trim(); + if (str.endsWith(";")) { + str+=";"; + } + compiler.bodyCode.append(str); //compiler.bodyCode.append(";\n"); } else if (nodeType == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION) { @@ -251,11 +271,15 @@ // the "local" variable declarations in this expression aren't actually local -- they are flagged local // just because there isn't an enclosing class scope visible to the parser. "Real" local variable // declarations won't show up here, because they will be buried inside of methods. - String text = node.getText(); + String text = node.getText().trim(); + if (!text.endsWith(";")) { + text+=";"; + } String declaration = text; int equals = text.indexOf("="); - if (equals != -1) + if (equals != -1) { declaration = declaration.substring(0, equals); + } declaration = declaration.trim(); String[] declarationTokens = declaration.split("\\s"); boolean isFinal = Arrays.asList(declarationTokens).contains("final"); @@ -288,6 +312,9 @@ } else { String text = node.getText().trim(); if (text.length() > 0) { + if (!text.endsWith(";")) { + text += ";"; + } compiler.initializer.append(text); //compiler.initializer.append(";\n"); } Modified: trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-12 21:32:32 UTC (rev 163) +++ trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-12 21:37:23 UTC (rev 164) @@ -645,15 +645,15 @@ String name = attribute.getName(); String value = attribute.getValue(); if (name.equals("constraints") || isEventHandlerName(name)) { - compiler.preprocessScript(value + ";"); // adds dependencies as a side effect + compiler.preprocessScript(value); // adds dependencies as a side effect } else if (name.equals("constructorParams")) { String[] params = value.split("\\s*,\\s*"); for (String param : params) { - compiler.preprocessScript(param + ";"); + compiler.preprocessScript(param); } } else if (value.startsWith("{") && value.endsWith("}")) { - compiler.preprocessScript(value.substring(1, value.length() - 1) + ";"); + compiler.preprocessScript(value.substring(1, value.length() - 1)); } } } @@ -672,20 +672,26 @@ public void setAttributes(CompiledObject object, Element tag, JAXXCompiler compiler) { List<Attr> attributes = new ArrayList<Attr>(); NamedNodeMap children = tag.getAttributes(); - for (int i = 0; i < children.getLength(); i++) + for (int i = 0; i < children.getLength(); i++) { attributes.add((Attr) children.item(i)); + } Collections.sort(attributes, getAttributeComparator()); for (Attr attribute : attributes) { String name = attribute.getName(); - String value = attribute.getValue(); + String value = attribute.getValue().trim(); if (name.equals("id") || name.equals("constraints") || name.equals("constructorParams") || name.equals("styleClass") || name.startsWith("xmlns") || JAXXCompiler.JAXX_INTERNAL_NAMESPACE.equals(attribute.getNamespaceURI())) { // ignore, already handled - } else if (isEventHandlerName(name)) + } else if (isEventHandlerName(name)) { + if (!value.endsWith(";")) { + value+=";"; + } addEventHandler(object, Introspector.decapitalize(name.substring(2)), value, compiler); - else + } + else { setAttribute(object, name, value, true, compiler); + } } } @@ -769,8 +775,9 @@ ClassDescriptor type = getPropertyType(object, propertyName, compiler); String binding = compiler.processDataBindings(stringValue, type); if (binding != null) { - if (inline) + if (inline) { compiler.addInlineStyle(object, propertyName, true); + } ClassDescriptor propertyType = getPropertyType(object, propertyName, compiler); if (propertyType != null && propertyType != ClassDescriptorLoader.getClassDescriptor(Boolean.class) && @@ -779,16 +786,18 @@ propertyType != ClassDescriptorLoader.getClassDescriptor(Integer.class) && propertyType != ClassDescriptorLoader.getClassDescriptor(Float.class) && propertyType != ClassDescriptorLoader.getClassDescriptor(Double.class) && - propertyType != ClassDescriptorLoader.getClassDescriptor(Character.class)) - binding = "((" + propertyType.getName() + ") " + binding + ")"; + propertyType != ClassDescriptorLoader.getClassDescriptor(Character.class)) { + //binding = "((" + propertyType.getName() + ") " + binding + ")"; + } if (propertyName.equals("layout")) { // handle containerDelegate (e.g. contentPane on JFrame) // have to set layout early, before children are added object.appendInitializationCode(getSetPropertyCode(object.getJavaCode(), propertyName, binding, compiler)); } object.registerDataBinding(binding, propertyName, getSetPropertyCode(object.getJavaCode(), propertyName, binding, compiler), compiler); } else { // no bindings, convert from string - if (inline) + if (inline) { compiler.addInlineStyle(object, propertyName, false); + } try { Class typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null; Object value = convertFromString(propertyName, stringValue, typeClass);

1 0

r163 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 21:32:32 +0000 (Sat, 12 Jan 2008) New Revision: 163 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: ajout d'un test sur les scripts (pour v?\195?\169rifier les statement sans d?\195?\169limiteur de fin) Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 21:32:18 UTC (rev 162) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 21:32:32 UTC (rev 163) @@ -99,6 +99,10 @@ goal.execute(); } + @CompileConfig(packageName = "Script", runJavac = true) + public void testScript() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } @CompileConfig(packageName = "OverridingDataBindings", runJavac = true) public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException {

1 0

r162 - in trunk/maven-jaxx-plugin/src/test/java/testcases: . Script
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 21:32:18 +0000 (Sat, 12 Jan 2008) New Revision: 162 Added: trunk/maven-jaxx-plugin/src/test/java/testcases/Script/ trunk/maven-jaxx-plugin/src/test/java/testcases/Script/JScriptInitializer.jaxx Log: ajout d'un test sur les scripts (pour v?\195?\169rifier les statement sans d?\195?\169limiteur de fin) Added: trunk/maven-jaxx-plugin/src/test/java/testcases/Script/JScriptInitializer.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/testcases/Script/JScriptInitializer.jaxx (rev 0) +++ trunk/maven-jaxx-plugin/src/test/java/testcases/Script/JScriptInitializer.jaxx 2008-01-12 21:32:18 UTC (rev 162) @@ -0,0 +1,19 @@ +<JDialog> + <script> + protected boolean value + </script> + <script> + value=false + </script> + + <script> + value=getOk(); + + public boolean getOk() { + return true; + } + </script> + <VBox> + <JButton text='close' onActionPerformed="dispose()"/> + </VBox> +</JDialog>

1 0

r161 - trunk/buix/src/java/org/codelutin/buix
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:33:08 +0000 (Sat, 12 Jan 2008) New Revision: 161 Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java Log: correction typage + foreach Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java =================================================================== --- trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-12 19:31:33 UTC (rev 160) +++ trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-12 19:33:08 UTC (rev 161) @@ -36,7 +36,6 @@ import java.beans.EventSetDescriptor; import java.beans.Introspector; import java.beans.BeanInfo; -import java.beans.EventHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -46,7 +45,6 @@ import java.awt.Component; -import org.codelutin.buix.BuixException; import org.codelutin.widget.MessageDialog; import java.util.EventListener; @@ -56,11 +54,13 @@ public class ActivateEventListModel extends DefaultListModel implements BuixSelectionListener{ // ActivateEventListModel Object bean = null; + private static final long serialVersionUID = -2591944891700452461L; public ActivateEventListModel(){ super(); } + @SuppressWarnings({"unchecked"}) public void setBean(Object bean){ this.bean = bean; @@ -70,29 +70,28 @@ BeanInfo info = Introspector.getBeanInfo(bean.getClass()); if(info != null){ EventSetDescriptor[] events = info.getEventSetDescriptors(); - for(int i=0; i<events.length; i++){ - Method m = events[i].getGetListenerMethod(); - Object [] listeners = null; - if(m == null && bean instanceof Component){ + for (EventSetDescriptor event : events) { + Method m = event.getGetListenerMethod(); + EventListener[] listeners; + if (m == null && bean instanceof Component) { // on ne peut pas recuperer les listeners par les beans // on essai d'une autre facon - Class<EventListener> type = (Class<EventListener>) events[i].getListenerType(); - listeners = ((Component)bean).getListeners(type); - }else{ + Class<?> type = event.getListenerType(); + listeners = ((Component) bean).getListeners((Class<EventListener>)type); + } else { listeners = (EventListener[]) m.invoke(bean); } - if(listeners != null){ - for (int j=0;j<listeners.length;j++) { - Object listener = listeners[j]; + if (listeners != null) { + for (Object listener : listeners) { if (listener instanceof Proxy) { - addElement(new ActivateEventListItem(events[i], + addElement(new ActivateEventListItem(event, listener)); } else { Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "le listener n'a pas ete creer par un EventHandler: " + listener.getClass().getName()); } } - }else{ - Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "Impossible de recuperer les listeners de type: " + events[i].getListenerType().getName()); + } else { + Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "Impossible de recuperer les listeners de type: " + event.getListenerType().getName()); } } }

1 0

r160 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:31:33 +0000 (Sat, 12 Jan 2008) New Revision: 160 Modified: trunk/maven-jaxx-plugin/profiles.xml Log: par d?\195?\169faut on lance les tests Modified: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-01-12 19:31:05 UTC (rev 159) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-01-12 19:31:33 UTC (rev 160) @@ -17,7 +17,7 @@ <maven.verbose>false</maven.verbose>  - <maven.test.skip>true</maven.test.skip> + <maven.test.skip>false</maven.test.skip>  <maven.src.dir>${basedir}/src</maven.src.dir>

1 0

r159 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:31:05 +0000 (Sat, 12 Jan 2008) New Revision: 159 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: on doit permettre de diff?\195?\169rencer le r?\195?\169pertoire de g?\195?\169n?\195?\169ration du r?\195?\169pertoire de compilation TODO : r?\195?\169gler le probl?\195?\168me de compilation javac lorsque interd?\195?\169pendances entre source g?\195?\169n?\195?\169r?\195?\169... Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 19:30:22 UTC (rev 158) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 19:31:05 UTC (rev 159) @@ -12,9 +12,10 @@ protected JaxxGeneratorGoal goal; - protected static File srcDir; protected static final String PREFIX_PACKAGE = "testcases"; + protected static File srcDir; + protected static File getSrcDir() { if (srcDir == null) { srcDir = new File("src" + File.separator + "test" + File.separator + "java"); @@ -22,41 +23,68 @@ return srcDir; } + protected static File outDir; + + protected static File getOutDir() { + if (outDir == null) { + outDir = new File("target" + File.separator + "test-gen-java"); + outDir.mkdirs(); + } + return outDir; + } + + protected static File ClassOutDir; + + protected static File getClassOutDir() { + if (ClassOutDir == null) { + ClassOutDir = new File("target" + File.separator + "test-classes"); + ClassOutDir.mkdirs(); + } + return ClassOutDir; + } + @Override public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); final File srcDir = getSrcDir(); assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); + final File outDir = getOutDir(); + assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); + final File classOutDir = getClassOutDir(); + assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); String packageName = anno.packageName(); goal = new JaxxGeneratorGoal(); goal.setSrc(srcDir); - goal.setOut(srcDir); + goal.setOut(outDir); + goal.setClassOut(classOutDir); goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); goal.setRunJavac(anno.runJavac()); goal.setJavaOpts(anno.javaOpts()); + System.out.println(getName()); } - @Override - protected void tearDown() throws Exception { - String[] files = goal.getFiles(); - if (files != null) { - for (String s : files) { + @CompileConfig(packageName = "InnerClasses", runJavac = true) + public void testInnerClasses() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + - File file = new File(getSrcDir(), s.substring(0, s.length() - 4) + "java"); - System.out.println("delete file " + file); - boolean b = file.delete(); - assertTrue("could not delete file " + file, b); - } - super.tearDown(); + @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) + public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); } + goal.execute(); } - - @CompileConfig(packageName = "CssTests") public void testCssTests() throws MojoExecutionException, MojoFailureException { goal.execute(); @@ -66,29 +94,28 @@ public void testErrors() throws MojoExecutionException, MojoFailureException { } - @CompileConfig(packageName = "Initializers") + @CompileConfig(packageName = "Initializers", runJavac = true) public void testInitializers() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "InnerClasses") - public void testInnerClasses() throws MojoExecutionException, MojoFailureException { - System.out.println("hum"); - goal.execute(); - } - @CompileConfig(packageName = "OverridingDataBindings") + @CompileConfig(packageName = "OverridingDataBindings", runJavac = true) public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "SpecialSubclassing") - public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + @CompileConfig(packageName = "ClassReferences", runJavac = true) + public void testClassReferences() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); + } goal.execute(); } - @CompileConfig(packageName = "ClassReferences") - public void testClassReferences() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } + } \ No newline at end of file

1 0

r158 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:30:22 +0000 (Sat, 12 Jan 2008) New Revision: 158 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java Log: par d?\195?\169fault le compilateur jaxx est silencieux Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java 2008-01-12 19:29:50 UTC (rev 157) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java 2008-01-12 19:30:22 UTC (rev 158) @@ -36,7 +36,7 @@ public boolean runJavac() default false; - public boolean verbose() default true; + public boolean verbose() default false; public String javaOpts() default ""; }

1 0

r157 - trunk/maven-jaxx-plugin/src/main/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:29:50 +0000 (Sat, 12 Jan 2008) New Revision: 157 Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java Log: on doit permettre de diff?\195?\169rencer le r?\195?\169pertoire de g?\195?\169n?\195?\169ration du r?\195?\169pertoire de compilation Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 19:29:09 UTC (rev 156) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 19:29:50 UTC (rev 157) @@ -21,6 +21,7 @@ import jaxx.compiler.CompilerOptions; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.JavaCCompiler; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -49,6 +50,11 @@ */ protected File out; /** + * @description R�pertoire de destination des fichiers � compiler. + * @parameter expression="${jaxx.classOut}" default-value="${basedir}/target/test-classes" + */ + protected File classOut; + /** * @description pour optimizer le code compil� ou g�n�r� ? * @parameter expression="${jaxx.optimize}" default-value="false" */ @@ -61,9 +67,9 @@ /** * @description les options de la compilation - * @parameter expression="${jaxx.javaOpts}" default-value="" + * @parameter expression="${jaxx.javaOpts}" */ - protected String javaOpts=""; + protected String javaOpts = null; /** * @description pour filter @@ -81,20 +87,23 @@ private static final String[] INCLUDES = {"**\\/*.jaxx"}; + private static final String[] INCLUDES_JAVA = {"**\\/*.java"}; + public void execute() throws MojoExecutionException, MojoFailureException { - // init(); - - DirectoryScanner ds = new DirectoryScanner(); + DirectoryScanner ds; + ds = new DirectoryScanner(); ds.setBasedir(getSrc()); - ds.setIncludes(includes==null|| includes.length==0?INCLUDES:includes); + boolean noIncludes = includes == null || includes.length == 0; + ds.setIncludes(noIncludes ? INCLUDES : includes); ds.scan(); files = ds.getIncludedFiles(); log.info("jaxx - found " + files.length + " file(s) to generate. "); CompilerOptions options = toCompilerOptions(); if (verbose) { log.debug("classPath: " + options.getClassPath()); - log.debug("out : " + options.getTargetDirectory()); + log.debug("javaOut : " + options.getTargetDirectory()); + log.debug("classOut : " + options.getJavacTargetDirectory()); log.debug("javacOpts: " + options.getJavacOpts()); log.debug("runJavac : " + options.getRunJavac()); log.debug("optiomize: " + options.getOptimize()); @@ -102,18 +111,48 @@ log.debug(file); } } + if (!JAXXCompiler.compile(src, files, options)) { throw new MojoFailureException("Aborting due to errors reported by jaxxc"); } + + if (options.getRunJavac()) { + // compile also non generated java sources + ds = new DirectoryScanner(); + ds.setBasedir(getSrc()); + if (noIncludes) { + ds.setIncludes(INCLUDES_JAVA); + } else { + String[] includesJava = new String[includes.length]; + for (int i = 0; i < includes.length; i++) { + String include = includes[i]; + if (include.endsWith(".jaxx")) { + includesJava[i] = include.substring(0, include.length() - "jaxx".length()) + "java"; + } else { + includesJava[i] = include; + } + } + ds.setIncludes(includesJava); + } + ds.scan(); + for (String file : ds.getIncludedFiles()) { + // compile + JavaCCompiler.runJavac(getClassOut().getPath(), options.getJavacOpts(), getSrc().getPath() + File.separator + file); + } + } + } public CompilerOptions toCompilerOptions() { CompilerOptions result = new CompilerOptions(); result.setClassPath(getSrc().getPath()); - result.setJavacOpts(getJavaOpts()); + if (getJavaOpts() != null && !"".equals(getJavaOpts())) { + result.setJavacOpts(getJavaOpts()); + } result.setKeepJavaFiles(true); result.setRunJavac(isRunJavac()); result.setOptimize(isOptimize()); + result.setJavacTargetDirectory(getClassOut()); result.setTargetDirectory(getOut()); return result; } @@ -136,6 +175,10 @@ return javaOpts; } + public File getClassOut() { + return classOut; + } + public boolean isRunJavac() { return runJavac; } @@ -156,6 +199,10 @@ this.out = out; } + public void setClassOut(File classOut) { + this.classOut = classOut; + } + public void setRunJavac(boolean runJavac) { this.runJavac = runJavac; }

1 0

r156 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:29:09 +0000 (Sat, 12 Jan 2008) New Revision: 156 Modified: trunk/jaxx/build.xml Log: modification buil ant pour s'adapter au projet maven 2 Modified: trunk/jaxx/build.xml =================================================================== --- trunk/jaxx/build.xml 2008-01-12 19:28:30 UTC (rev 155) +++ trunk/jaxx/build.xml 2008-01-12 19:29:09 UTC (rev 156) @@ -2,7 +2,7 @@ <property name="src.dir" location="src"/> <property name="jaxx.version" value="1.0.3-beta3"/> <property name="java.src.dir" location="${src.dir}/java"/> - <property name="docs.src.dir" location="${src.dir}/docs"/> + <property name="docs.src.dir" location="${basedir}/doc"/> <property name="build.dir" location="target"/> <property name="java.build.dir" location="${build.dir}/classes"/> <property name="lib.build.dir" location="${build.dir}/lib"/> @@ -12,7 +12,7 @@ <property name="bin.build.dir" location="${build.dir}/bin"/> <property name="examples.dir" value="examples"/> <property name="examples.build.dir" value="${build.dir}/java/examples"/> - <property name="testcases.dir" value="testcases"/> + <property name="testcases.dir" value="src/test/"/> <property name="junit.src.dir" location="${testcases.dir}/unittests"/> <property name="junit.build.dir" location="${build.dir}/test-classes"/>

1 0

r155 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:28:30 +0000 (Sat, 12 Jan 2008) New Revision: 155 Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java Log: extraction du compilateur javac du compilateur jaxxc Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 19:27:52 UTC (rev 154) +++ trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 19:28:30 UTC (rev 155) @@ -47,14 +47,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; -import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectOutputStream; -import java.io.PrintStream; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.net.URL; @@ -259,18 +256,6 @@ for (String s : INITIALIZER_CLASSES) { ((Initializer) Class.forName(s).newInstance()).initialize(); } - -// Enumeration/*<URL>*/ e = JAXXCompiler.class.getClassLoader().getResources("jaxx.properties"); -// while (e.hasMoreElements()) { -// Properties p = new Properties(); -// InputStream in = ((URL) e.nextElement()).openConnection().getInputStream(); -// p.load(in); -// in.close(); -// -// String initializer = p.getProperty("jaxx.initializer"); -// if (initializer != null) -// ((Initializer) Class.forName(initializer).newInstance()).initialize(); -// } } @@ -394,86 +379,6 @@ out.close(); } - - private void runJavac() { - try { - URL jaxxURL = getClass().getResource("/jaxx/compiler/JAXXCompiler.class"); - if (jaxxURL == null) { - throw new InternalError("Can't-happen error: could not find /jaxx/compiler/JAXXCompiler.class on class path"); - } - String classpath = jaxxURL.toString(); - if (classpath.startsWith("jar:")) { - classpath = classpath.substring("jar:".length()); - classpath = classpath.substring(0, classpath.indexOf("!")); - classpath = URLtoFile(classpath).getPath(); - } - URL runtimeURL = getClass().getResource("/jaxx/runtime/JAXXObject.class"); - if (runtimeURL == null) { - throw new InternalError("Can't-happen error: could not find /jaxx/runtime/JAXXObject.class on class path"); - } - String runtime = runtimeURL.toString(); - if (runtime.startsWith("jar:")) { - runtime = runtime.substring("jar:".length()); - runtime = runtime.substring(0, runtime.indexOf("!")); - runtime = URLtoFile(runtime).getPath(); - } - classpath += File.pathSeparator + runtime + File.pathSeparator + options.getClassPath() + File.pathSeparator + "."; - Class<?> javac = Class.forName("com.sun.tools.javac.Main"); - Method main = javac.getMethod("compile", new Class[]{String[].class}); - final PrintStream oldErr = System.err; - System.setErr(new PrintStream(new FilterOutputStream(oldErr) { - @Override - public void write(byte[] b, int off, int len) throws IOException { - String stringValue = new String(b, off, len).trim(); - if (stringValue.startsWith("Error:") || stringValue.startsWith("Usage:") || stringValue.endsWith("error") || - stringValue.endsWith("errors")) { - failed = true; - } - if (stringValue.endsWith("uses unchecked or unsafe operations.") || - stringValue.endsWith("with -Xlint:unchecked for details.")) { - return; - } - super.write(b, off, len); - } - })); - List<String> javacOpts = new ArrayList<String>(); - if (options.getJavacOpts() != null) { - javacOpts.addAll(Arrays.asList(options.getJavacOpts().split("\\s+"))); - } - if (options.getTargetDirectory() != null) { - String destRoot = options.getTargetDirectory().getPath(); - javacOpts.add("-d"); - javacOpts.add(destRoot); - classpath += File.pathSeparator + destRoot; - } - javacOpts.add("-classpath"); - javacOpts.add(classpath); - javacOpts.add(dest.getPath()); - main.invoke(null, new Object[]{javacOpts.toArray(new String[javacOpts.size()])}); - System.setErr(oldErr); - } - catch (ClassNotFoundException e) { - System.err.println("Unable to find javac (com.sun.tools.javac.Main) on class path."); - System.err.println("jaxxc launch script is responsible for adding javac (typically"); - System.err.println("located in tools.jar) to the class path; it either added the"); - System.err.println("wrong path or tools.jar does not exist."); - System.err.println(); - System.err.println("Check to make sure that JAVA_HOME points to a valid JDK"); - System.err.println("installation."); - failed = true; - } - catch (Exception e) { - System.err.println("An error occurred while invoking javac:"); - e.printStackTrace(); - failed = true; - } - - if (!options.getKeepJavaFiles()) { - dest.delete(); - } - } - - private void createJavaSource(PrintWriter out) throws IOException { int dotPos = outputClassName.lastIndexOf("."); String packageName = dotPos != -1 ? outputClassName.substring(0, dotPos) : null; @@ -999,7 +904,8 @@ result.append(" = "); String constructorParams = object.getConstructorParams(); if (constructorParams != null) { - result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + result.append(" new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + //result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); } else { result.append("new ").append(getCanonicalName(object.getObjectClass())).append("();"); } @@ -1932,9 +1838,12 @@ if (compiler == null) { throw new CompilerException("Internal error: could not find compiler for " + className + " during compilation"); } - compiler.runJavac(); + boolean keepJavaFiles = compiler.getOptions().getKeepJavaFiles(); + JavaCCompiler.runJavac(compiler); if (compiler.failed) { success = false; + } else if (!keepJavaFiles) { + compiler.getDest().delete(); } } } @@ -2051,4 +1960,12 @@ System.exit(success ? 0 : 1); } -} + + public File getDest() { + return dest; + } + + public void setFailed(boolean failed) { + this.failed = failed; + } +}

1 0

r154 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:27:52 +0000 (Sat, 12 Jan 2008) New Revision: 154 Added: trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java Log: extraction du compilateur javac du compilateur jaxxc Added: trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java (rev 0) +++ trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java 2008-01-12 19:27:52 UTC (rev 154) @@ -0,0 +1,130 @@ +/* + * Copyright 2006 Ethan Nicholas. All rights reserved. + * Use is subject to license terms. + */ +package jaxx.compiler; + +import static jaxx.compiler.JAXXCompiler.URLtoFile; + +import java.io.File; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + + +/** + * Compiles java files into Java classes. + * + * @author chemit + */ +public class JavaCCompiler { + + static JAXXCompiler compiler; + static String classpath; + + public static void runJavac(final JAXXCompiler compiler) { + + CompilerOptions options = compiler.getOptions(); + JavaCCompiler.compiler = compiler; + runJavac( + options.getJavacTargetDirectory().getPath(), + options.getJavacOpts(), + compiler.getDest().getPath() + ); + } + + public static void runJavac(String destRoot, String options, String... destJavas) { + + PrintStream oldErr = System.err; + + String classpath = getClassPath(); + + try { + + initOutStream(oldErr); + + for (String destJava : destJavas) { + + String[] javacOpts = initOptions(classpath, destRoot, destJava, options==null?null:options.split("\\s+")); + //System.out.println("launch javac : "+ Arrays.toString(javacOpts)); + com.sun.tools.javac.Main.compile(javacOpts); + } + + } + catch (Exception e) { + System.err.println("An error occurred while invoking javac: "); + e.printStackTrace(); + if (compiler != null) { + compiler.setFailed(true); + } + } finally { + System.setErr(oldErr); + compiler = null; + } + } + + private static String getClassPath() { + if (classpath == null) { + // we do actually use a single jar for jaxx (core + runtime + swing +...) + String PATH = "/jaxx/compiler/JAXXCompiler.class"; + URL jaxxURL = JavaCCompiler.class.getResource(PATH); + if (jaxxURL == null) { + throw new InternalError("Can't-happen error: could not find /jaxx/compiler/JAXXCompiler.class on class path"); + } + String classpath = jaxxURL.toString(); + if (classpath.startsWith("jar:")) { + classpath = classpath.substring("jar:".length()); + classpath = classpath.substring(0, classpath.indexOf("!")); + classpath = URLtoFile(classpath).getPath(); + } else if (classpath.startsWith("file:")) { + // fix-bug : we must take the classpath and not the entire location to class + classpath = classpath.substring(0, classpath.length() - PATH.length()); + classpath = URLtoFile(classpath).getPath(); + } + JavaCCompiler.classpath = classpath; + } + return classpath; + } + + private static String[] initOptions(String classpath, String destRoot, String destJava, String... options) { + List<String> javacOpts = new ArrayList<String>(); + + if (options != null) { + javacOpts.addAll(Arrays.asList(options)); + } + if (destRoot != null) { + javacOpts.add("-d"); + javacOpts.add(destRoot); + classpath += File.pathSeparator + destRoot; + } + javacOpts.add("-classpath"); + javacOpts.add(classpath); + javacOpts.add(destJava); + return javacOpts.toArray(new String[javacOpts.size()]); + } + + private static void initOutStream(final PrintStream oldErr) { + System.setErr(new PrintStream(new FilterOutputStream(oldErr) { + @Override + public void write(byte[] b, int off, int len) throws IOException { + String stringValue = new String(b, off, len).trim(); + if (stringValue.startsWith("Error:") || stringValue.startsWith("Usage:") || stringValue.endsWith("error") || + stringValue.endsWith("errors")) { + if (compiler != null) { + compiler.setFailed(true); + } + } + if (stringValue.endsWith("uses unchecked or unsafe operations.") || + stringValue.endsWith("with -Xlint:unchecked for details.")) { + return; + } + super.write(b, off, len); + } + })); + } + +} \ No newline at end of file

1 0

r153 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:25:23 +0000 (Sat, 12 Jan 2008) New Revision: 153 Modified: trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java Log: am?\195?\169lioration code de scriptlet g?\195?\169n?\195?\169r?\195?\169 (suppression ; inutiles) Modified: trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 19:23:55 UTC (rev 152) +++ trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 19:25:23 UTC (rev 153) @@ -51,7 +51,8 @@ public String preprocessScript(String script) throws CompilerException { script = trimScript(script); StringBuffer result = new StringBuffer(); - JavaParser p = new JavaParser(new StringReader(script + ";")); + JavaParser p = new JavaParser(new StringReader(script)); + //JavaParser p = new JavaParser(new StringReader(script + ";")); while (!p.Line()) { SimpleNode node = p.popNode(); if (node != null) { @@ -111,7 +112,7 @@ FieldDescriptor[] fields = compiler.getScriptFields(); for (FieldDescriptor field : fields) { if (field.getName().equals(lhs)) { - lhs.substring(lhs.lastIndexOf(".") + 1); + //lhs.substring(lhs.lastIndexOf(".") + 1); node.firstToken.image = "jaxx.runtime.Util.assignment(" + node.firstToken.image; String outputClassName = compiler.getOutputClassName(); node.lastToken.image = node.lastToken.image + ", \"" + lhs + "\", " + outputClassName + ".this)"; @@ -181,7 +182,7 @@ } compiler.bodyCode.append(modifiers).append(" ").append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); } @@ -235,13 +236,13 @@ } } compiler.bodyCode.append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); compiler.addScriptMethod(new MethodDescriptor(name, Modifier.PUBLIC, returnType, parameterTypes.toArray(new String[parameterTypes.size()]), compiler.getClassLoader())); } else if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEDECLARATION || nodeType == JavaParserTreeConstants.JJTINITIALIZER) { compiler.bodyCode.append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); } else if (nodeType == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION) { processConstructor(node.getChild(0).getChild(0).getText(), node.getChild(0).getChild(1)); @@ -260,16 +261,19 @@ boolean isFinal = Arrays.asList(declarationTokens).contains("final"); boolean isStatic = Arrays.asList(declarationTokens).contains("static"); String name = declarationTokens[declarationTokens.length - 1]; - if (name.endsWith(";")) + if (name.endsWith(";")) { name = name.substring(0, name.length() - 1).trim(); + } String className = declarationTokens[declarationTokens.length - 2]; String type = TagManager.resolveClassName(className, compiler); compiler.addScriptField(new FieldDescriptor(name, Modifier.PUBLIC, type, compiler.getClassLoader())); // TODO: determine the actual modifiers if (equals != -1 && !isFinal && !isStatic) { // declare the field in the class body, but wait to actually initialize it + //compiler.bodyCode.append(text.substring(0, equals).trim()); compiler.bodyCode.append(text.substring(0, equals).trim()).append(";"); String initializer = text.substring(equals + 1).trim(); - if (type.endsWith("[]")) + if (type.endsWith("[]")) { initializer = "new " + type + " " + initializer; + } final String finalInitializer = name + " = " + initializer; compiler.registerInitializer(new Runnable() { public void run() { @@ -279,19 +283,21 @@ } else { compiler.bodyCode.append(text); } - compiler.bodyCode.append(";\n"); + compiler.bodyCode.append("\n"); + //compiler.bodyCode.append(";\n"); } else { String text = node.getText().trim(); if (text.length() > 0) { compiler.initializer.append(text); - compiler.initializer.append(";\n"); + //compiler.initializer.append(";\n"); } } } public void registerScript(String script) throws CompilerException { - JavaParser p = new JavaParser(new StringReader(script + ";")); + JavaParser p = new JavaParser(new StringReader(script)); + //JavaParser p = new JavaParser(new StringReader(script + ";")); while (!p.Line()) { SimpleNode node = p.popNode(); if (node != null) {

1 0

r152 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:23:55 +0000 (Sat, 12 Jan 2008) New Revision: 152 Modified: trunk/jaxx/src/java/jaxx/compiler/JavaFile.java Log: am?\195?\169lioration g?\195?\169n?\195?\169ration code raw (formatage) Modified: trunk/jaxx/src/java/jaxx/compiler/JavaFile.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaFile.java 2008-01-12 19:23:03 UTC (rev 151) +++ trunk/jaxx/src/java/jaxx/compiler/JavaFile.java 2008-01-12 19:23:55 UTC (rev 152) @@ -156,9 +156,15 @@ } if (rawBodyCode.length() > 0) { - result.append(" /* begin raw body code */"); - result.append(rawBodyCode); - result.append(" /* end raw body code */"); + result.append(addIndentation("/* begin raw body code */\n", 4)); + String s = rawBodyCode.toString(); + if (!s.startsWith("\n")) { + result.append('\n'); + } + result.append(addIndentation(s, 4)); + result.append('\n'); + result.append(addIndentation("/* end raw body code */", 4)); + result.append("\n"); } for (JavaFile innerClass : innerClasses) {

1 0

r151 - trunk/jaxx/src/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:23:03 +0000 (Sat, 12 Jan 2008) New Revision: 151 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java Log: suppression TODO r?\195?\169alis?\195?\169 (typer les listes d'items) Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 19:22:32 UTC (rev 150) +++ trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 19:23:03 UTC (rev 151) @@ -48,7 +48,6 @@ List<Item> items = list.getItems(); if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; - //TODO ajout du bon typage g�n�rique list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId();

1 0

r150 - trunk/jaxx/src/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:22:32 +0000 (Sat, 12 Jan 2008) New Revision: 150 Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java Log: javadoc Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java 2008-01-12 19:22:02 UTC (rev 149) +++ trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java 2008-01-12 19:22:32 UTC (rev 150) @@ -10,6 +10,7 @@ * Retrieves an object defined in an XML tag by its ID. * * @param id the id of the component to retrieve + * @return the object */ public Object getObjectById(String id);

1 0

r149 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:22:02 +0000 (Sat, 12 Jan 2008) New Revision: 149 Modified: trunk/jaxx/src/java/jaxx/compiler/JavaField.java Log: suppression ; g?\195?\169n?\195?\169r?\195?\169 inutile + ajout de getter proptected pour les fields private Modified: trunk/jaxx/src/java/jaxx/compiler/JavaField.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaField.java 2008-01-12 19:21:33 UTC (rev 148) +++ trunk/jaxx/src/java/jaxx/compiler/JavaField.java 2008-01-12 19:22:02 UTC (rev 149) @@ -98,9 +98,11 @@ result.append(initializer); } result.append(';'); - result.append(';'); + result.append(' '); if (java.lang.reflect.Modifier.isProtected(modifiers)) { result.append("public ").append(type).append(" get").append(name.substring(0, 1).toUpperCase()).append(name.substring(1)).append("() {return ").append(name).append(";}"); + } else if (java.lang.reflect.Modifier.isPrivate(modifiers)) { + result.append("protected ").append(type).append(" get").append(name.substring(0, 1).toUpperCase()).append(name.substring(1)).append("() {return ").append(name).append(";}"); } return result.toString(); }

1 0

r148 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:21:33 +0000 (Sat, 12 Jan 2008) New Revision: 148 Modified: trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java Log: suppresion d'un cast g?\195?\169n?\195?\169r?\195?\169 Modified: trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java 2008-01-12 18:12:06 UTC (rev 147) +++ trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java 2008-01-12 19:21:33 UTC (rev 148) @@ -263,10 +263,11 @@ * @return the Java code for this object */ public String getJavaCode() { - if (isOverride()) // handle cases where object is overridden to be a different class - return "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; - else - return javaCode; + //if (isOverride()) // handle cases where object is overridden to be a different class + // return "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + //else + //TODO Check if this is safe + return javaCode; }

1 0

r147 - trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 18:12:06 +0000 (Sat, 12 Jan 2008) New Revision: 147 Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx Log: use variable in test :) Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx 2008-01-12 16:13:13 UTC (rev 146) +++ trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx 2008-01-12 18:12:06 UTC (rev 147) @@ -15,7 +15,7 @@ public Initializers(int dummy, String label) { - super("Test 3 worked!"); + super("Test 3 worked! "+dummy); constructorTest2.setText(label); }

1 0

r146 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 16:13:13 +0000 (Sat, 12 Jan 2008) New Revision: 146 Modified: trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java Log: on doit permettre de diff?\195?\169rencer le r?\195?\169pertoire de g?\195?\169n?\195?\169ration du r?\195?\169pertoire de compilation Modified: trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java 2008-01-12 16:12:30 UTC (rev 145) +++ trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java 2008-01-12 16:13:13 UTC (rev 146) @@ -8,6 +8,7 @@ */ public class CompilerOptions { private File targetDirectory; + private File javacTargetDirectory; private String classPath; private String javacOpts; private boolean runJavac; @@ -20,6 +21,21 @@ * @return the target directory * @see #setTargetDirectory */ + public File getJavacTargetDirectory() { + if (javacTargetDirectory==null) { + // to use the old way : if javacTargetDirectory not specified, + // use same directory as targetDirectory (says where the java sources + // are generated) + return targetDirectory; + } + return javacTargetDirectory; + } + /** + * Returns the target directory, generally specified with the "-d" option on the command line. + * + * @return the target directory + * @see #setTargetDirectory + */ public File getTargetDirectory() { return targetDirectory; } @@ -35,6 +51,9 @@ this.targetDirectory = targetDirectory; } + public void setJavacTargetDirectory(File javacTargetDirectory) { + this.javacTargetDirectory = javacTargetDirectory; + } /** * Returns the class path to be used during compilation.

1 0

r145 - trunk/jaxx/src/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 16:12:30 +0000 (Sat, 12 Jan 2008) New Revision: 145 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java Log: g?\195?\169n?\195?\169ration de code 1.5 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -49,7 +49,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO ajout du bon typage g�n�rique - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -47,7 +47,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO Add the correct generic type - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -58,7 +58,7 @@ List<Item> items = tree.getItems(); if (items != null && !items.isEmpty()) { String listName = tree.getId() + "$items"; - tree.appendAdditionCode("java.util.List " + listName + " = new java.util.ArrayList();"); + tree.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); createItems(tree, items, listName + ".add", compiler); tree.appendAdditionCode(tree.getId() + ".setItems(" + listName + ");"); }

1 0

r144 - trunk/jaxx/src/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 13:39:18 +0000 (Sat, 12 Jan 2008) New Revision: 144 Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java Log: generify Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-12 13:34:53 UTC (rev 143) +++ trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-12 13:39:18 UTC (rev 144) @@ -40,7 +40,7 @@ * TagHandler instances, because subclasses of the bean class should be handled by the same TagHandler * (assuming no more specific mappings exist), which requires creating a new instance of the TagHandler. */ - private static ClassMap<Class> registeredBeans = new ClassMap<Class>(); + private static ClassMap<Class<? extends TagHandler>> registeredBeans = new ClassMap<Class<? extends TagHandler>>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName private static class QName { @@ -99,9 +99,10 @@ * @param handler the <code>TagHandler</code> class, which must descend from <code>DefaultObjectHandler</code> * @throws IllegalArgumentException if the handler class does not descend from <code>DefaultObjectHandler</code> */ - public static void registerBean(ClassDescriptor beanClass, Class handler) { - if (!DefaultObjectHandler.class.isAssignableFrom(handler)) + public static <T extends TagHandler> void registerBean(ClassDescriptor beanClass, Class<T> handler) { + if (!DefaultObjectHandler.class.isAssignableFrom(handler)) { throw new IllegalArgumentException("handler class must be a subclass of DefaultObjectHandler"); + } registeredBeans.put(beanClass, handler); String name = beanClass.getName(); int dotPos = name.lastIndexOf("."); @@ -147,7 +148,7 @@ * @param tag the simple name of the tag * @param handler the <code>TagHandler</code> which should process the tag */ - public static void registerTag(String namespace, String tag, TagHandler handler) { + public static <T extends TagHandler> void registerTag(String namespace, String tag, T handler) { if (namespace == null) { namespace = "*"; } @@ -196,24 +197,24 @@ * are considered. * @throws jaxx.CompilerException ? */ - public static DefaultObjectHandler getTagHandler(ClassDescriptor beanClass) throws CompilerException { + public static DefaultObjectHandler getTagHandler(ClassDescriptor beanClass) throws CompilerException { try { if (beanClass == null) { throw new NullPointerException(); } String namespace = getNamespace(beanClass); String tag = getSimpleName(beanClass); - TagHandler handler = registeredTags.get(new QName(namespace, tag)); + DefaultObjectHandler handler = (DefaultObjectHandler) registeredTags.get(new QName(namespace, tag)); if (handler == null) { - Class<?> handlerClass = registeredBeans.get(beanClass); + Class<? extends TagHandler> handlerClass = registeredBeans.get(beanClass); if (handlerClass == null) { throw new CompilerException("unable to find handler for " + beanClass); } - Constructor<?> constructor = handlerClass.getConstructor(ClassDescriptor.class); + Constructor<? extends TagHandler> constructor = handlerClass.getConstructor(ClassDescriptor.class); handler = (DefaultObjectHandler) constructor.newInstance(beanClass); registerTag(namespace, tag, handler); } - return (DefaultObjectHandler) handler; + return handler; } catch (InstantiationException e) { throw new RuntimeException(e);

1 0

r143 - trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 13:34:53 +0000 (Sat, 12 Jan 2008) New Revision: 143 Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx Log: un test ne fonctionne plus : une classe compil?\195?\169e est requise ClassTest, elle doit ?\195?\170tre compil?\195?\169e ? Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx 2008-01-12 12:39:50 UTC (rev 142) +++ trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx 2008-01-12 13:34:53 UTC (rev 143) @@ -10,7 +10,8 @@ </script> <VBox id='box'> - <ClassTest customProperty='Compiled class file worked'/> +  +  <JAXXTest customProperty='Uncompiled JAXX file worked'/> <JavaTest customProperty='Uncompiled Java file worked'/> </VBox>

1 0

r142 - in trunk/maven-jaxx-plugin/src/test: . java
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 12:39:50 +0000 (Sat, 12 Jan 2008) New Revision: 142 Added: trunk/maven-jaxx-plugin/src/test/java/testcases/ Removed: trunk/maven-jaxx-plugin/src/test/testcases/ Log: rajout des propri?\195?\169t?\195?\169s includes et celles pour utiliser javac Copied: trunk/maven-jaxx-plugin/src/test/java/testcases (from rev 141, trunk/maven-jaxx-plugin/src/test/testcases)

1 0

r141 - in trunk: jaxx/src/test maven-jaxx-plugin/src/test
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 12:39:21 +0000 (Sat, 12 Jan 2008) New Revision: 141 Added: trunk/maven-jaxx-plugin/src/test/testcases/ Removed: trunk/jaxx/src/test/testcases/ Log: d?\195?\169placement des tests de g?\195?\169n?\195?\169rations de code dans le plugin Copied: trunk/maven-jaxx-plugin/src/test/testcases (from rev 140, trunk/jaxx/src/test/testcases)

1 0

r140 - trunk/maven-jaxx-plugin/src/main/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 12:37:15 +0000 (Sat, 12 Jan 2008) New Revision: 140 Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java Log: rajout des propri?\195?\169t?\195?\169s includes et celles pour utiliser javac Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 12:35:39 UTC (rev 139) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 12:37:15 UTC (rev 140) @@ -53,13 +53,32 @@ * @parameter expression="${jaxx.optimize}" default-value="false" */ protected boolean optimize; + /** + * @description pour demander la compilation via javac des sources g�n�r�s + * @parameter expression="${jaxx.runJavac}" default-value="false" + */ + protected boolean runJavac; /** + * @description les options de la compilation + * @parameter expression="${jaxx.javaOpts}" default-value="" + */ + protected String javaOpts=""; + + /** + * @description pour filter + * @parameter expression="${jaxx.includes}" + */ + protected String[] includes; + + /** * @description verbose * @parameter expression="${jaxx.verbose}" default-value="${maven.verbose}" */ protected boolean verbose; + protected String[] files; + private static final String[] INCLUDES = {"**\\/*.jaxx"}; public void execute() throws MojoExecutionException, MojoFailureException { @@ -68,9 +87,9 @@ DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(getSrc()); - ds.setIncludes(INCLUDES); + ds.setIncludes(includes==null|| includes.length==0?INCLUDES:includes); ds.scan(); - String[] files = ds.getIncludedFiles(); + files = ds.getIncludedFiles(); log.info("jaxx - found " + files.length + " file(s) to generate. "); CompilerOptions options = toCompilerOptions(); if (verbose) { @@ -91,9 +110,9 @@ public CompilerOptions toCompilerOptions() { CompilerOptions result = new CompilerOptions(); result.setClassPath(getSrc().getPath()); - result.setJavacOpts(""); + result.setJavacOpts(getJavaOpts()); result.setKeepJavaFiles(true); - result.setRunJavac(false); + result.setRunJavac(isRunJavac()); result.setOptimize(isOptimize()); result.setTargetDirectory(getOut()); return result; @@ -112,4 +131,48 @@ public File getOut() { return out; } + + public String getJavaOpts() { + return javaOpts; + } + + public boolean isRunJavac() { + return runJavac; + } + + public String[] getIncludes() { + return includes; + } + + public void setJavaOpts(String javaOpts) { + this.javaOpts = javaOpts; + } + + public void setOptimize(boolean optimize) { + this.optimize = optimize; + } + + public void setOut(File out) { + this.out = out; + } + + public void setRunJavac(boolean runJavac) { + this.runJavac = runJavac; + } + + public void setSrc(File src) { + this.src = src; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public String[] getFiles() { + return files; + } } \ No newline at end of file

1 0

r139 - in trunk/maven-jaxx-plugin/src/test/java: . jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 12:35:39 +0000 (Sat, 12 Jan 2008) New Revision: 139 Added: trunk/maven-jaxx-plugin/src/test/java/jaxx/ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: ajout du test pour compiler des templates (reprise des tests de l'ancien projet). Added: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java (rev 0) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java 2008-01-12 12:35:39 UTC (rev 139) @@ -0,0 +1,42 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Une annotation pour configurer les tests de compilation. + * + * @author chemit + */ +(a)Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +@Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) +public @interface CompileConfig { + + public String packageName(); + + public boolean optimize() default true; + + public boolean runJavac() default false; + + public boolean verbose() default true; + + public String javaOpts() default ""; +} Added: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java (rev 0) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 12:35:39 UTC (rev 139) @@ -0,0 +1,94 @@ +package jaxx; + +import junit.framework.TestCase; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; + +public class CompilerTest extends TestCase { + + protected JaxxGeneratorGoal goal; + + protected static File srcDir; + protected static final String PREFIX_PACKAGE = "testcases"; + + protected static File getSrcDir() { + if (srcDir == null) { + srcDir = new File("src" + File.separator + "test" + File.separator + "java"); + } + return srcDir; + } + + @Override + public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { + CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); + assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); + final File srcDir = getSrcDir(); + assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); + String packageName = anno.packageName(); + goal = new JaxxGeneratorGoal(); + goal.setSrc(srcDir); + goal.setOut(srcDir); + goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); + goal.setOptimize(anno.optimize()); + goal.setVerbose(anno.verbose()); + goal.setRunJavac(anno.runJavac()); + goal.setJavaOpts(anno.javaOpts()); + + } + + @Override + protected void tearDown() throws Exception { + String[] files = goal.getFiles(); + if (files != null) { + for (String s : files) { + + File file = new File(getSrcDir(), s.substring(0, s.length() - 4) + "java"); + System.out.println("delete file " + file); + boolean b = file.delete(); + assertTrue("could not delete file " + file, b); + } + super.tearDown(); + } + } + + + + @CompileConfig(packageName = "CssTests") + public void testCssTests() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "errors") + public void testErrors() throws MojoExecutionException, MojoFailureException { + } + + @CompileConfig(packageName = "Initializers") + public void testInitializers() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "InnerClasses") + public void testInnerClasses() throws MojoExecutionException, MojoFailureException { + System.out.println("hum"); + goal.execute(); + } + + @CompileConfig(packageName = "OverridingDataBindings") + public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "SpecialSubclassing") + public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "ClassReferences") + public void testClassReferences() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } +} \ No newline at end of file

1 0

r138 - trunk/maven-jaxx-plugin/src/main/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 11, 2008

Jan. 11, 2008

Author: tchemit Date: 2008-01-11 22:58:10 +0000 (Fri, 11 Jan 2008) New Revision: 138 Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java Log: modification de la propri?\195?\169t?\195?\169 verbose Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-11 15:38:54 UTC (rev 137) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-11 22:58:10 UTC (rev 138) @@ -56,7 +56,7 @@ /** * @description verbose - * @parameter expression="${maven.verbose}" + * @parameter expression="${jaxx.verbose}" default-value="${maven.verbose}" */ protected boolean verbose;

1 0

r137 - trunk/buix/src/java/org/codelutin/buix
by tchemit＠users.labs.libre-entreprise.org Jan. 11, 2008

Jan. 11, 2008

Author: tchemit Date: 2008-01-11 15:38:54 +0000 (Fri, 11 Jan 2008) New Revision: 137 Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java Log: le cast ne fonctionne pas en java 1.5 Modified: trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java =================================================================== --- trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-11 15:36:36 UTC (rev 136) +++ trunk/buix/src/java/org/codelutin/buix/ActivateEventListModel.java 2008-01-11 15:38:54 UTC (rev 137) @@ -76,17 +76,19 @@ if(m == null && bean instanceof Component){ // on ne peut pas recuperer les listeners par les beans // on essai d'une autre facon - listeners = ((Component)bean).getListeners(events[i].getListenerType()); + Class<EventListener> type = (Class<EventListener>) events[i].getListenerType(); + listeners = ((Component)bean).getListeners(type); }else{ - listeners = (Object[])m.invoke(bean, null); + listeners = (EventListener[]) m.invoke(bean); } if(listeners != null){ - for(int l=0; l<listeners.length; l++){ - if(listeners[l] instanceof Proxy){ + for (int j=0;j<listeners.length;j++) { + Object listener = listeners[j]; + if (listener instanceof Proxy) { addElement(new ActivateEventListItem(events[i], - listeners[l])); - }else{ - Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "le listener n'a pas ete creer par un EventHandler: " + listeners[l].getClass().getName()); + listener)); + } else { + Logger.getLogger(getClass().getName() + ".setBean").log(Level.WARNING, "le listener n'a pas ete creer par un EventHandler: " + listener.getClass().getName()); } } }else{

1 0

r136 - trunk/buix
by tchemit＠users.labs.libre-entreprise.org Jan. 11, 2008

Jan. 11, 2008

Author: tchemit Date: 2008-01-11 15:36:36 +0000 (Fri, 11 Jan 2008) New Revision: 136 Modified: trunk/buix/pom.xml Log: passage en buix-0.8-SNAPSHOT avec correction d?\195?\169pendance sur swin-beaninfo r?\195?\169solue + r?\195?\169ajout de lutinutil en d?\195?\169pendance car directement utilis?\195?\169 par le projet Modified: trunk/buix/pom.xml =================================================================== --- trunk/buix/pom.xml 2008-01-11 13:56:33 UTC (rev 135) +++ trunk/buix/pom.xml 2008-01-11 15:36:36 UTC (rev 136) @@ -17,7 +17,7 @@ <packaging>jar</packaging> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> <description>Constructeur d'interface graphique �crit en Java qui permet la sauvegarde de l'interface en XML. @@ -69,15 +69,20 @@ </dependency> <dependency> <groupId>lutinlib</groupId> + <artifactId>lutinutil</artifactId> + <version>0.19</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>lutinlib</groupId> <artifactId>lutinxml</artifactId> <version>0.7</version> </dependency> -  -  + <version>0.1</version> + </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId>

1 0

r135 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 11, 2008

Jan. 11, 2008

Author: tchemit Date: 2008-01-11 13:56:33 +0000 (Fri, 11 Jan 2008) New Revision: 135 Modified: trunk/jaxx/pom.xml Log: passage en lutinwidget-0.10-SNAPSHOT avec correction d?\195?\169pendance sur sdoc Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-01-11 00:03:29 UTC (rev 134) +++ trunk/jaxx/pom.xml 2008-01-11 13:56:33 UTC (rev 135) @@ -65,7 +65,7 @@ <dependency> <groupId>lutinlib</groupId> <artifactId>lutinwidget</artifactId> - <version>0.9</version> + <version>0.10-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

r134 - in trunk/jaxx/src/java/jaxx: . runtime runtime/css runtime/swing tags tools/jaxxcapture
by tchemit＠users.labs.libre-entreprise.org Jan. 11, 2008

Jan. 11, 2008

Author: tchemit Date: 2008-01-11 00:03:29 +0000 (Fri, 11 Jan 2008) New Revision: 134 Modified: trunk/jaxx/src/java/jaxx/ClassMap.java trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java trunk/jaxx/src/java/jaxx/runtime/swing/Item.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java trunk/jaxx/src/java/jaxx/tags/StyleHandler.java trunk/jaxx/src/java/jaxx/tags/TagManager.java trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java Log: fin de migration en 1.5 du code Modified: trunk/jaxx/src/java/jaxx/ClassMap.java =================================================================== --- trunk/jaxx/src/java/jaxx/ClassMap.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/ClassMap.java 2008-01-11 00:03:29 UTC (rev 134) @@ -20,7 +20,7 @@ * A <code>get</code> operation will return the value associated with the class itself, or failing * that, with its nearest ancestor for which there exists a mapping. */ -public class ClassMap extends HashMap<ClassDescriptor, Object> { +public class ClassMap<T> extends HashMap<ClassDescriptor, T> { /** * Keeps track of automatically-added Classes so we can distinguish them from user-added * Classes. Unknown Classes are automatically added to the map during <code>get</code> @@ -40,8 +40,8 @@ * @return the mapping for the class */ @Override - public Object get(Object key) { - Object result = null; + public T get(Object key) { + T result = null; ClassDescriptor c = (ClassDescriptor) key; while (c != null) { result = super.get(c); @@ -70,7 +70,7 @@ * @return the old value associated with the class */ @Override - public Object put(ClassDescriptor key, Object value) { + public T put(ClassDescriptor key, T value) { if (!(key instanceof ClassDescriptor)) throw new IllegalArgumentException("expected ClassDescriptor, got " + key); if (autoKeys.size() > 0) { // remove all automatic keys which descend from the class being modified Modified: trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/ComponentDescriptor.java 2008-01-11 00:03:29 UTC (rev 134) @@ -11,6 +11,7 @@ String javaClassName; String styleClass; ComponentDescriptor parent; + private static final long serialVersionUID = 3001121176691770788L; public ComponentDescriptor(String id, String javaClassName, String styleClass, ComponentDescriptor parent) { @@ -41,6 +42,7 @@ } + @Override public String toString() { return "ComponentDescriptor[" + id + ", " + javaClassName + ", " + styleClass + "]"; } Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/JAXXObjectDescriptor.java 2008-01-11 00:03:29 UTC (rev 134) @@ -11,6 +11,7 @@ public class JAXXObjectDescriptor implements Serializable { private ComponentDescriptor[] descriptors; private Stylesheet stylesheet; + private static final long serialVersionUID = -1706159556633801154L; public JAXXObjectDescriptor(ComponentDescriptor[] descriptors, Modified: trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/css/Pseudoclasses.java 2008-01-11 00:03:29 UTC (rev 134) @@ -15,7 +15,7 @@ private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<Object, Map<String, List<PropertyValue>>>(); - private static class PropertyValue implements Comparable { + private static class PropertyValue implements Comparable<PropertyValue> { private Object value; private int id; @@ -24,22 +24,19 @@ this.id = id; } - public Object getValue() { return value; } - public int getId() { return id; } - - public int compareTo(Object o) { - return getId() - ((PropertyValue) o).getId(); + public int compareTo(PropertyValue o) { + return getId() - o.getId(); } - + @Override public boolean equals(Object o) { if (!(o instanceof PropertyValue)) return false; @@ -52,18 +49,17 @@ return value.getValue().equals(getValue()); } - + @Override public int hashCode() { return (value != null ? value.hashCode() : 0) ^ id; } - + @Override public String toString() { return "PropertyValue[" + value + ", " + id + "]"; } } - private static List<PropertyValue> getPropertyList(Object object, String property) { Map<String, List<PropertyValue>> propertyMap = properties.get(object); if (propertyMap == null) { @@ -80,29 +76,26 @@ return propertyList; } - public static boolean isPropertyApplied(Object object, String property, int id) { - List<PropertyValue> propertyList = getPropertyList(object, property); - for (Object aPropertyList : propertyList) - if (((PropertyValue) aPropertyList).getId() == id) + for (PropertyValue aPropertyList : getPropertyList(object, property)) { + if (aPropertyList.getId() == id) { return true; + } + } return false; } - public static void propertyApplied(Object object, String property, Object value, int id) { List<PropertyValue> propertyList = getPropertyList(object, property); propertyList.add(new PropertyValue(value, id)); Collections.sort(propertyList); } - public static void propertyRemoved(Object object, String property, Object value, int id) { List<PropertyValue> propertyList = getPropertyList(object, property); propertyList.remove(new PropertyValue(value, id)); } - public static Object getCurrentValue(Object object, String property) { List<PropertyValue> propertyList = getPropertyList(object, property); if (propertyList.size() > 0) { @@ -111,29 +104,31 @@ return NO_PSEUDOCLASS; } - public static Object applyProperty(JAXXObject parent, Object object, String property, Object newValue, Object currentValue, int id) { if (!isPropertyApplied(object, property, id)) { Object value = getCurrentValue(object, property); - if (value == NO_PSEUDOCLASS) + if (value == NO_PSEUDOCLASS) { propertyApplied(object, property, wrap(currentValue), -1); + } propertyApplied(object, property, wrap(newValue), id); value = getCurrentValue(object, property); - if (value instanceof DataBinding) + if (value instanceof DataBinding) { parent.applyDataBinding(((DataBinding) value).getId()); + } return value; } else return currentValue; } - public static Object removeProperty(JAXXObject parent, Object object, String property, Object oldValue, Object currentValue, int id) { if (isPropertyApplied(object, property, id)) { Object value = getCurrentValue(object, property); - if (value == NO_PSEUDOCLASS) - throw new java.lang.IllegalStateException("found NO_PSEUDOCLASS value for a property which does not have a default value"); - if (value instanceof DataBinding) + if (value == NO_PSEUDOCLASS) { + throw new IllegalStateException("found NO_PSEUDOCLASS value for a property which does not have a default value"); + } + if (value instanceof DataBinding) { parent.removeDataBinding(((DataBinding) value).getId()); + } propertyRemoved(object, property, wrap(oldValue), id); value = getCurrentValue(object, property); return value; @@ -141,47 +136,38 @@ return currentValue; } - public static Object wrap(boolean value) { return value; } - public static Object wrap(byte value) { return value; } - public static Object wrap(short value) { return value; } - public static Object wrap(int value) { return value; } - public static Object wrap(long value) { return value; } - public static Object wrap(float value) { return value; } - public static Object wrap(double value) { return value; } - public static Object wrap(char value) { return value; } - public static Object wrap(Object value) { return value; } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/HBox.java 2008-01-11 00:03:29 UTC (rev 134) @@ -88,6 +88,7 @@ } + @Override public Insets getInsets() { Insets result = super.getInsets(); if (margin != null) { Modified: trunk/jaxx/src/java/jaxx/runtime/swing/Item.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/Item.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/Item.java 2008-01-11 00:03:29 UTC (rev 134) @@ -28,7 +28,6 @@ private Item parent; private PropertyChangeSupport propertyChangeSupport; - /** * Creates a new Item. This should only be called from compiled JAXX files. * @@ -44,7 +43,6 @@ this.selected = selected; } - /** * Returns this item's ID. * @@ -54,7 +52,6 @@ return id; } - /** * Returns the string that should be used to represent the item at display time. If <code>null</code>, * <code>String.valueOf(getValue())</code> will be used instead. @@ -66,7 +63,6 @@ return label; } - /** * Sets the item's display string. If <code>null, String.valueOf(getValue())</code> will be used instead. * @@ -79,7 +75,6 @@ firePropertyChange(LABEL_PROPERTY, oldLabel, label); } - /** * Returns the item's actual value as it appears in the component's model. The <code>Item</code> itself is not * visible from the model, only the value. @@ -91,7 +86,6 @@ return value; } - /** * Sets the item's value as it appears in the component's model. The <code>Item</code> itself is not * visible from the model, only the value. @@ -105,7 +99,6 @@ firePropertyChange(VALUE_PROPERTY, oldValue, value); } - /** * Returns <code>true</code> if this item is currently selected. This is a bound property. * @@ -116,7 +109,6 @@ return selected; } - /** * Sets the item's selection state. This is a bound property. * @@ -129,32 +121,31 @@ firePropertyChange(SELECTED_PROPERTY, oldSelected, selected); } - /** * Adds a new child node (Items can be nested in trees). * * @param item the new child item */ public void addChild(Item item) { - if (children == null) + if (children == null) { children = new ArrayList<Item>(); + } children.add(item); item.parent = this; } - /** * Returns a list of this item's children. * * @return a list of all nested child nodes */ public List<Item> getChildren() { - if (children == null) + if (children == null) { children = new ArrayList<Item>(); + } return children; } - /** * Returns the <code>Item</code> containing this <code>Item</code>, or <code>null</code> for a top-level * <code>Item</code>. @@ -165,40 +156,36 @@ return parent; } - private PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) + if (propertyChangeSupport == null) { propertyChangeSupport = new SwingPropertyChangeSupport(this); + } return propertyChangeSupport; } - public void addPropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(listener); } - public void addPropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(property, listener); } - public void removePropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(listener); } - public void removePropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(property, listener); } - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - if (propertyChangeSupport != null) + if (propertyChangeSupport != null) { getPropertyChangeSupport().firePropertyChange(propertyName, oldValue, newValue); + } } - + @Override public String toString() { return getClass().getName() + "[" + value + "]"; } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-11 00:03:29 UTC (rev 134) @@ -22,15 +22,17 @@ updateSelectedValue(); } }; + private static final long serialVersionUID = -2096340516687228691L; + @Override public void add(AbstractButton button) { super.add(button); button.addChangeListener(changeListener); updateSelectedValue(); } - + @Override public void remove(AbstractButton button) { super.remove(button); button.removeChangeListener(changeListener); @@ -39,9 +41,9 @@ public void updateSelectedValue() { - Enumeration/*<AbstractButton>*/ e = getElements(); + Enumeration<AbstractButton> e = getElements(); while (e.hasMoreElements()) { - AbstractButton button = (AbstractButton) e.nextElement(); + AbstractButton button = e.nextElement(); if (button.isSelected()) { Object selectedValue = button.getClientProperty("$value"); if (selectedValue != getSelectedValue()) @@ -64,8 +66,9 @@ protected PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) + if (propertyChangeSupport == null) { propertyChangeSupport = new PropertyChangeSupport(this); + } return propertyChangeSupport; } @@ -91,8 +94,9 @@ private void firePropertyChange(Object oldValue) { - if (propertyChangeSupport != null) + if (propertyChangeSupport != null) { getPropertyChangeSupport().firePropertyChange(SELECTED_VALUE_PROPERTY, oldValue, getSelectedValue()); + } } } Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXComboBox.java 2008-01-11 00:03:29 UTC (rev 134) @@ -44,13 +44,17 @@ } if (item.isSelected()) { if (index != -1) // it was already selected + { return; + } newSelection = new int[oldSelection.length + 1]; System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); newSelection[newSelection.length - 1] = itemIndex; } else { if (index == -1) // it already wasn't selected + { return; + } newSelection = new int[oldSelection.length - 1]; System.arraycopy(oldSelection, 0, newSelection, 0, index); System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); @@ -61,8 +65,9 @@ for (int i = 0; i < getSize(); i++) { if (getElementAt(i) == ((Item) e.getSource()).getValue()) { fireContentsChanged(JAXXComboBoxModel.this, i, i); - if (getSelectedIndex() == i) + if (getSelectedIndex() == i) { fireItemStateChanged(new ItemEvent(JAXXComboBox.this, ItemEvent.ITEM_STATE_CHANGED, getElementAt(i), ItemEvent.DESELECTED)); + } return; } } @@ -70,7 +75,6 @@ } }; for (Item item : items) { - item.addPropertyChangeListener(listener); } } @@ -121,8 +125,9 @@ if (item != null) { String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); @@ -137,8 +142,9 @@ for (int i = items.size() - 1; i >= 0; i--) { boolean selected = getSelectedIndex() == i; Item item = items.get(i); - if (selected != item.isSelected()) + if (selected != item.isSelected()) { item.setSelected(selected); + } } } } @@ -147,11 +153,11 @@ // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireItemStateChanged(ItemEvent e) { super.fireItemStateChanged(e); } - public void setItems(List<Item> items) { setModel(new JAXXComboBoxModel(items)); List<Integer> selectedIndexList = new ArrayList<Integer>(); Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXList.java 2008-01-11 00:03:29 UTC (rev 134) @@ -18,9 +18,10 @@ public class JAXXList extends JList { public class JAXXListModel extends AbstractListModel { - private List/*<Item>*/ items; + private List<Item> items; + private static final long serialVersionUID = -1598924187490122036L; - public JAXXListModel(List/*<Item>*/ items) { + public JAXXListModel(List<Item> items) { this.items = items; PropertyChangeListener listener = new PropertyChangeListener() { @@ -39,13 +40,17 @@ } if (item.isSelected()) { if (index != -1) // it was already selected + { return; + } newSelection = new int[oldSelection.length + 1]; System.arraycopy(oldSelection, 0, newSelection, 0, oldSelection.length); newSelection[newSelection.length - 1] = itemIndex; } else { if (index == -1) // it already wasn't selected + { return; + } newSelection = new int[oldSelection.length - 1]; System.arraycopy(oldSelection, 0, newSelection, 0, index); System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index); @@ -55,21 +60,23 @@ for (int i = 0; i < getSize(); i++) { if (getElementAt(i) == ((Item) e.getSource()).getValue()) { fireContentsChanged(JAXXListModel.this, i, i); - if (isSelectedIndex(i)) + if (isSelectedIndex(i)) { fireSelectionValueChanged(i, i, false); + } return; } } } } }; - for (int i = 0; i < items.size(); i++) - ((Item) items.get(i)).addPropertyChangeListener(listener); + for (Item item : items) { + item.addPropertyChangeListener(listener); + } } public Object getElementAt(int i) { - return ((Item) items.get(i)).getValue(); + return items.get(i).getValue(); } @@ -78,18 +85,17 @@ } } - ; - - public JAXXList() { setCellRenderer(new DefaultListCellRenderer() { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { ListModel model = list.getModel(); if (model instanceof JAXXListModel) { - Item item = (Item) ((JAXXListModel) model).items.get(index); + Item item = ((JAXXListModel) model).items.get(index); String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); } @@ -99,12 +105,13 @@ public void valueChanged(ListSelectionEvent e) { ListModel model = getModel(); if (model instanceof JAXXListModel) { - List/*<Item>*/ items = ((JAXXListModel) model).items; + List<Item> items = ((JAXXListModel) model).items; for (int i = items.size() - 1; i >= 0; i--) { boolean selected = isSelectedIndex(i); - Item item = (Item) items.get(i); - if (selected != item.isSelected()) + Item item = items.get(i); + if (selected != item.isSelected()) { item.setSelected(selected); + } } } } @@ -113,6 +120,7 @@ // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireSelectionValueChanged(int firstIndex, int lastIndex, boolean isAdjusting) { super.fireSelectionValueChanged(firstIndex, lastIndex, isAdjusting); } @@ -123,15 +131,18 @@ } - public void setItems(List/*<Item>*/ items) { + public void setItems(List<Item> items) { setModel(new JAXXListModel(items)); - List/*<Integer>*/ selectedIndexList = new ArrayList/*<Integer>*/(); - for (int i = 0; i < items.size(); i++) - if (((Item) items.get(i)).isSelected()) - selectedIndexList.add(new Integer(i)); + List<Integer> selectedIndexList = new ArrayList<Integer>(); + for (int i = 0; i < items.size(); i++) { + if (items.get(i).isSelected()) { + selectedIndexList.add(i); + } + } int[] selectedIndices = new int[selectedIndexList.size()]; - for (int i = 0; i < selectedIndexList.size(); i++) - selectedIndices[i] = ((Integer) selectedIndexList.get(i)).intValue(); + for (int i = 0; i < selectedIndexList.size(); i++) { + selectedIndices[i] = selectedIndexList.get(i); + } setSelectedIndices(selectedIndices); } } \ No newline at end of file Modified: trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/runtime/swing/JAXXTree.java 2008-01-11 00:03:29 UTC (rev 134) @@ -23,25 +23,29 @@ public class JAXXTreeModel implements TreeModel { private Item root; - private List/*<TreeModelListener>*/ listeners = new ArrayList/*<TreeModelListener>*/(); + private List<TreeModelListener> listeners = new ArrayList<TreeModelListener>(); - public JAXXTreeModel(List/*<Item>*/ items) { - if (items.size() == 1) - this.root = (Item) items.get(0); + public JAXXTreeModel(List<Item> items) { + if (items.size() == 1) { + this.root = items.get(0); + } else { this.root = new Item(null, null, SYNTHETIC, false); - for (int i = 0; i < items.size(); i++) - root.addChild((Item) items.get(i)); + for (Item item : items) { + root.addChild(item); + } } PropertyChangeListener listener = new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent e) { if (e.getPropertyName().equals(Item.SELECTED_PROPERTY)) { Item item = (Item) e.getSource(); - if (item.isSelected()) + if (item.isSelected()) { addSelectionPath(getTreePath(item)); - else + } + else { removeSelectionPath(getTreePath(item)); + } } else { Item item = (Item) e.getSource(); boolean root = item.getParent() == null; @@ -58,9 +62,10 @@ private void addPropertyChangeListener(Item item, PropertyChangeListener listener) { item.addPropertyChangeListener(listener); - List/*<Item>*/ children = item.getChildren(); - for (int i = 0; i < children.size(); i++) - addPropertyChangeListener((Item) children.get(i), listener); + List<Item> children = item.getChildren(); + for (Item aChildren : children) { + addPropertyChangeListener(aChildren, listener); + } } @@ -80,9 +85,9 @@ if (node.getValue() == value) return node; else { - List/*<Item>*/ children = node.getChildren(); - for (int i = 0; i < children.size(); i++) { - Item result = findItem((Item) children.get(i), value); + List<Item> children = node.getChildren(); + for (Item aChildren : children) { + Item result = findItem(aChildren, value); if (result != null) return result; } @@ -92,7 +97,7 @@ private TreePath getTreePath(Item node) { - List/*<Object>*/ path = new ArrayList/*<Object>*/(); + List<Object> path = new ArrayList<Object>(); while (node != null) { path.add(0, node.getValue()); node = node.getParent(); @@ -103,7 +108,7 @@ public Object getChild(Object parent, int index) { Item node = findItem(parent); - return ((Item) node.getChildren().get(index)).getValue(); + return node.getChildren().get(index).getValue(); } @@ -115,10 +120,11 @@ public int getIndexOfChild(Object parent, Object child) { Item node = findItem(parent); - List/*<Item>*/ children = node.getChildren(); - for (int i = 0; i < children.size(); i++) - if (((Item) children.get(i)).getValue() == child) + List<Item> children = node.getChildren(); + for (int i = 0,j = children.size();i<j; i++) + if (children.get(i).getValue() == child) { return i; + } return -1; } @@ -140,8 +146,9 @@ public void fireTreeNodesChanged(TreeModelEvent e) { - for (int i = 0; i < listeners.size(); i++) - ((TreeModelListener) listeners.get(i)).treeNodesChanged(e); + for (TreeModelListener listener : listeners) { + listener.treeNodesChanged(e); + } } @@ -149,19 +156,18 @@ } } - ; - - public JAXXTree() { setCellRenderer(new DefaultTreeCellRenderer() { + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { TreeModel model = tree.getModel(); if (model instanceof JAXXTreeModel) { Item item = ((JAXXTreeModel) model).findItem(value); if (item != null) { String label = item.getLabel(); - if (label != null) + if (label != null) { value = label; + } } } return super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); @@ -171,27 +177,31 @@ addTreeSelectionListener(new TreeSelectionListener() { public void valueChanged(TreeSelectionEvent e) { TreeModel model = getModel(); - if (model instanceof JAXXTreeModel) + if (model instanceof JAXXTreeModel) { scan((JAXXTreeModel) model, ((JAXXTreeModel) model).root); + } } private void scan(JAXXTreeModel model, Item item) { TreePath path = model.getTreePath(item); - if (item.isSelected() != isPathSelected(path)) + if (item.isSelected() != isPathSelected(path)) { item.setSelected(!item.isSelected()); - List/*<Item>*/ children = item.getChildren(); - for (int i = 0; i < children.size(); i++) - scan(model, (Item) children.get(i)); + } + List<Item> children = item.getChildren(); + for (Item aChildren : children) { + scan(model, aChildren); + } } }); } - public void setItems(List/*<Item>*/ items) { + public void setItems(List<Item> items) { JAXXTreeModel model = new JAXXTreeModel(items); - if (model.getRoot() != null) + if (model.getRoot() != null) { setRootVisible(model.getRoot() != SYNTHETIC); + } setModel(model); } Modified: trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/DefaultComponentHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -26,8 +26,9 @@ public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); - if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) + if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { throw new IllegalArgumentException(getClass().getName() + " does not support the class " + beanClass.getName()); + } } @Override @@ -36,8 +37,9 @@ super.init(); containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); - if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) + if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) { containerDelegate = ((DefaultComponentHandler) TagManager.getTagHandler(getBeanClass().getSuperclass())).getContainerDelegate(); + } } } @@ -54,8 +56,9 @@ addProxyEventInfo("getY", ComponentListener.class); addProxyEventInfo("getWidth", ComponentListener.class); addProxyEventInfo("getHeight", ComponentListener.class); - if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass())) + if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass())) { addProxyEventInfo("getComponentCount", ContainerListener.class); + } } @Override Modified: trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/DefaultObjectHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -128,15 +128,17 @@ JAXXPropertyDescriptor[] propertiesArray = jaxxBeanInfo.getJAXXPropertyDescriptors(); properties = new HashMap<String, JAXXPropertyDescriptor>(); - for (int i = propertiesArray.length - 1; i >= 0; i--) + for (int i = propertiesArray.length - 1; i >= 0; i--) { properties.put(propertiesArray[i].getName(), propertiesArray[i]); + } JAXXEventSetDescriptor[] eventsArray = jaxxBeanInfo.getJAXXEventSetDescriptors(); events = new HashMap<String, JAXXEventSetDescriptor>(); for (int i = eventsArray.length - 1; i >= 0; i--) { MethodDescriptor[] methods = eventsArray[i].getListenerMethods(); - for (MethodDescriptor method : methods) + for (MethodDescriptor method : methods) { events.put(method.getName(), eventsArray[i]); + } } configureProxyEventInfo(); @@ -283,6 +285,7 @@ * * @param objectCode Java code which evaluates to the object to which to add the listener * *@param dataBinding the name of the data binding this listener is a part of + * @param dataBinding databinding * @param memberName the name of the field or method to listen to * @param propertyChangeListenerCode Java code which evaluates to a <code>PropertyChangeListener</code> * @param compiler the current <code>JAXXCompiler</code> @@ -319,10 +322,12 @@ return result.toString(); } else { String propertyName = null; - if (memberName.startsWith("get")) + if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - else if (memberName.startsWith("is")) + } + else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); + } else { try { getBeanClass().getFieldDescriptor(memberName); @@ -375,10 +380,11 @@ String modelClassName = modelMemberName != null ? getBeanClass().getMethodDescriptor(modelMemberName, new ClassDescriptor[0]).getReturnType().getName() : JAXXCompiler.getCanonicalName(getBeanClass()); String code = objectCode + (eventInfo.modelName != null ? "." + modelMemberName + "()" : ""); result.append("((").append(modelClassName).append(") $bindingSources.remove(\"").append(code).append("\")).").append(eventInfo.removeMethod).append("((").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(") jaxx.runtime.Util.getEventListener(").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(".class, ").append(compiler.getRootObject().getJavaCode()).append(", ").append(TypeManager.getJavaCode(methodName)).append("));\n"); - if (eventInfo.modelName != null) + if (eventInfo.modelName != null) { result.append(getRemoveMemberListenerCode(objectCode, dataBinding, "get" + JAXXCompiler.capitalize(eventInfo.modelName), "jaxx.runtime.Util.getDataBindingUpdateListener(this, \"" + dataBinding + "\")", compiler)); + } return result.toString(); } catch (NoSuchMethodException e) { @@ -386,10 +392,12 @@ } } else { String propertyName = null; - if (memberName.startsWith("get")) + if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - else if (memberName.startsWith("is")) + } + else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); + } else { try { getBeanClass().getFieldDescriptor(memberName); @@ -519,8 +527,9 @@ info.modelName = modelName; info.addMethod = addMethod; info.removeMethod = removeMethod; - if (eventInfos == null) + if (eventInfos == null) { eventInfos = new HashMap<String, ProxyEventInfo>(); + } eventInfos.put(memberName, info); } @@ -539,12 +548,14 @@ throw new RuntimeException(e); } CompiledObject object = objectMap.get(tag); - if (object == null) + if (object == null) { throw new IllegalStateException("unable to find CompiledObject associated with tag <" + tag.getTagName() + ">; should have been registered before second pass"); + } compiler.checkOverride(object); String constructorParams = tag.getAttribute("constructorParams"); - if (constructorParams != null && constructorParams.length() > 0) + if (constructorParams != null && constructorParams.length() > 0) { object.setConstructorParams(compiler.getScriptManager().trimScript(constructorParams)); + } setDefaults(object, tag, compiler); setAttributes(object, tag, compiler); @@ -555,13 +566,15 @@ public void registerCompiledObject(Element tag, JAXXCompiler compiler) { String id = tag.getAttribute("id"); - if (id == null || id.length() == 0) + if (id == null || id.length() == 0) { id = compiler.getAutoId(getBeanClass()); + } CompiledObject object = createCompiledObject(id, compiler); objectMap.put(tag, object); String styleClass = tag.getAttribute("styleClass").trim(); - if (styleClass.length() > 0) + if (styleClass.length() > 0) { object.setStyleClass(styleClass); + } compiler.registerCompiledObject(object); } @@ -623,21 +636,25 @@ protected void scanAttributesForDependencies(Element tag, JAXXCompiler compiler) { List<Attr> attributes = new ArrayList<Attr>(); NamedNodeMap children = tag.getAttributes(); - for (int i = 0; i < children.getLength(); i++) + for (int i = 0; i < children.getLength(); i++) { attributes.add((Attr) children.item(i)); + } Collections.sort(attributes, getAttributeComparator()); for (Attr attribute : attributes) { String name = attribute.getName(); String value = attribute.getValue(); - if (name.equals("constraints") || isEventHandlerName(name)) + if (name.equals("constraints") || isEventHandlerName(name)) { compiler.preprocessScript(value + ";"); // adds dependencies as a side effect + } else if (name.equals("constructorParams")) { String[] params = value.split("\\s*,\\s*"); - for (String param : params) + for (String param : params) { compiler.preprocessScript(param + ";"); - } else if (value.startsWith("{") && value.endsWith("}")) + } + } else if (value.startsWith("{") && value.endsWith("}")) { compiler.preprocessScript(value.substring(1, value.length() - 1) + ";"); + } } } Modified: trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/ScriptHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -40,8 +40,9 @@ FileReader in = new FileReader(scriptFile); char[] readBuffer = new char[2048]; int c; - while ((c = in.read(readBuffer)) > 0) + while ((c = in.read(readBuffer)) > 0) { scriptBuffer.write(readBuffer, 0, c); + } } catch (FileNotFoundException e) { compiler.reportError("script file not found: " + scriptFile); @@ -67,8 +68,9 @@ String scriptString = script.toString().trim(); if (scriptString.length() > 0) { - if (scriptFile != null) + if (scriptFile != null) { compiler.reportError("<script> tag has both a source attribute and an inline script"); + } compiler.registerScript(script.toString()); } } Modified: trunk/jaxx/src/java/jaxx/tags/StyleHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/StyleHandler.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/StyleHandler.java 2008-01-11 00:03:29 UTC (rev 134) @@ -128,8 +128,9 @@ protected Rule processRule(SimpleNode ruleNode) { - if (ruleNode.getId() != CSSParserTreeConstants.JJTRULE) + if (ruleNode.getId() != CSSParserTreeConstants.JJTRULE) { throw new IllegalArgumentException("argument node is not a Rule"); + } SimpleNode selectorsNode = ruleNode.getChild(0); assert selectorsNode.getId() == CSSParserTreeConstants.JJTSELECTORS : "expected node to be of type Selectors"; @@ -146,8 +147,9 @@ String key = declarationNode.getChild(0).getText(); SimpleNode valueNode = declarationNode.getChild(1); String value = valueNode.getText(); - if (valueNode.firstToken.kind == CSSParserConstants.STRING) + if (valueNode.firstToken.kind == CSSParserConstants.STRING) { value = value.substring(1, value.length() - 1); + } properties.put(key, value); } } Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-11 00:03:29 UTC (rev 134) @@ -40,7 +40,7 @@ * TagHandler instances, because subclasses of the bean class should be handled by the same TagHandler * (assuming no more specific mappings exist), which requires creating a new instance of the TagHandler. */ - private static ClassMap registeredBeans = new ClassMap(); + private static ClassMap<Class> registeredBeans = new ClassMap<Class>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName private static class QName { @@ -203,17 +203,17 @@ } String namespace = getNamespace(beanClass); String tag = getSimpleName(beanClass); - DefaultObjectHandler handler = (DefaultObjectHandler) registeredTags.get(new QName(namespace, tag)); + TagHandler handler = registeredTags.get(new QName(namespace, tag)); if (handler == null) { - Class handlerClass = (Class) registeredBeans.get(beanClass); + Class<?> handlerClass = registeredBeans.get(beanClass); if (handlerClass == null) { throw new CompilerException("unable to find handler for " + beanClass); } - Constructor constructor = handlerClass.getConstructor(ClassDescriptor.class); + Constructor<?> constructor = handlerClass.getConstructor(ClassDescriptor.class); handler = (DefaultObjectHandler) constructor.newInstance(beanClass); registerTag(namespace, tag, handler); } - return handler; + return (DefaultObjectHandler) handler; } catch (InstantiationException e) { throw new RuntimeException(e); Modified: trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java =================================================================== --- trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java 2008-01-10 23:27:48 UTC (rev 133) +++ trunk/jaxx/src/java/jaxx/tools/jaxxcapture/JAXXCapture.java 2008-01-11 00:03:29 UTC (rev 134) @@ -47,7 +47,7 @@ import java.util.jar.Manifest; public class JAXXCapture { - private static ClassMap objectHandlers = new ClassMap(); + private static ClassMap<Object> objectHandlers = new ClassMap<Object>(); static { objectHandlers.put(ClassDescriptorLoader.getClassDescriptor(Object.class), new ObjectHandler()); @@ -69,7 +69,7 @@ this.classLoader = classLoader; } - + @Override public void dispatchEvent(AWTEvent event) { if (event.getID() == MouseEvent.MOUSE_PRESSED && ((MouseEvent) event).isControlDown()) { Component target = ((MouseEvent) event).getComponent();

1 0

r133 - in trunk: jaxx maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Jan. 10, 2008

Jan. 10, 2008

Author: tchemit Date: 2008-01-10 23:27:48 +0000 (Thu, 10 Jan 2008) New Revision: 133 Modified: trunk/jaxx/pom.xml trunk/maven-jaxx-plugin/pom.xml Log: ajout distributionManagement + scm ( a v?\195?\169rifier que c'est le bon param?\195?\169trage) Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-01-10 23:08:42 UTC (rev 132) +++ trunk/jaxx/pom.xml 2008-01-10 23:27:48 UTC (rev 133) @@ -24,30 +24,42 @@ <inceptionYear>2008</inceptionYear> <contributors> - <contributor> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </contributor> - </contributors> + <contributor> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </contributor> + </contributors> <issueManagement> <url>http://labs.libre-entreprise.org/tracker/?group_id={labs.id}</url> </issueManagement> <distributionManagement> + <repository> + <id>labs</id> + <url> + scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2 + </url> + </repository> <site> <id>labs</id> <url> - scp://labs.libre-entreprise.org/home/groups/buix/${pom.artifactId}/htdocs/ + scp://labs.libre-entreprise.org/home/groups/buix/htdocs/${pom.artifactId} </url> </site> </distributionManagement> + <scm> + <connection>scm:svn:svn:anonymous@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</connection> + <developerConnection>scm:svn:svn+ssh:${username}@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</developerConnection> + <url>https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/?root=buix</url> + </scm> + <dependencies>  <dependency> @@ -72,5 +84,5 @@ <systemPath>${java.home}/../lib/dt.jar</systemPath> </dependency> </dependencies> - + </project> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-01-10 23:08:42 UTC (rev 132) +++ trunk/maven-jaxx-plugin/pom.xml 2008-01-10 23:27:48 UTC (rev 133) @@ -61,7 +61,7 @@ <site> <id>labs</id> <url> - scp://labs.libre-entreprise.org/home/groups/lutin/htdocs/buix/${pom.artifac… + scp://labs.libre-entreprise.org/home/groups/buix/htdocs/${pom.artifactId} </url> </site> </distributionManagement> @@ -72,8 +72,8 @@ </issueManagement> <scm> - <connection>scm:svn:svn:anonymous@labs.libre-entreprise.org/svnroot/buix/${pom.artifactId}/trunk</connection> - <developerConnection>scm:svn:svn+ssh:${username}@labs.libre-entreprise.org/svnroot/buix/${pom.artifactId}/trunk</developerConnection> + <connection>scm:svn:svn:anonymous@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</connection> + <developerConnection>scm:svn:svn+ssh:${username}@labs.libre-entreprise.org/svnroot/buix/trunk/${pom.artifactId}</developerConnection> <url>https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/?root=buix</url> </scm>

1 0

r132 - trunk/jaxx/src/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org Jan. 10, 2008

Jan. 10, 2008

Author: tchemit Date: 2008-01-10 23:08:42 +0000 (Thu, 10 Jan 2008) New Revision: 132 Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java Log: jaxx au format maven 2 (version 1.0.4) tout les code est pass?\195?\169 en java 1.5 : -- typage, -- foreach, -- unboxing,... -- suppression cast inutiles mise en conformit?\195?\169 avec les conventions de codage java : -- reformatage des imports pour en pas utiliser les * -- utilisation des blocks explicite m?\195?\170me lors d'un block ?\195?\160 1 instruction -- javadoc La tache Ant a ?\195?\169t?\195?\169 supprim?\195?\169e de ce module (il sera dans le module maven-jaxx-plugin) TODO : -- il faudrait supprimer la partir de compilation javac car cela n'est plus utile avec maven -- revoir la class JAXXCompiler Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-10 22:51:41 UTC (rev 131) +++ trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-10 23:08:42 UTC (rev 132) @@ -209,7 +209,7 @@ if (handlerClass == null) { throw new CompilerException("unable to find handler for " + beanClass); } - Constructor constructor = handlerClass.getConstructor(new Class[]{ClassDescriptor.class}); + Constructor constructor = handlerClass.getConstructor(ClassDescriptor.class); handler = (DefaultObjectHandler) constructor.newInstance(beanClass); registerTag(namespace, tag, handler); }

1 0

[Buix-cvscommit] [buix] .
by bpoussin＠users.labs.libre-entreprise.org June 28, 2005

June 28, 2005

Changement dans le répertoire buix: --- changement de version des librairies --- (par bpoussin) Fichiers affectés: ----------------- project.xml modifié (1.29 -> 1.30) lutinproject.xml modifié (1.5 -> 1.6)

1 0

[Buix-cvscommit] [buix] .
by bpoussin＠users.labs.libre-entreprise.org Dec. 23, 2004

Dec. 23, 2004

Changement dans le répertoire buix: --- mise a jour version lib lutinutil --- (par bpoussin) Fichiers affectés: ----------------- project.xml modifié (1.28 -> 1.29)

1 0