February 2011 - Jaxx-commits - mailman.cloud.codelutin.com

r2237 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: hudson Date: 2011-02-20 13:13:14 +0100 (Sun, 20 Feb 2011) New Revision: 2237 Url: http://nuiton.org/repositories/revision/jaxx/2237 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-compiler/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-demo/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-runtime/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-config/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-css/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-validator/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/jaxx-widgets/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/maven-jaxx-plugin/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-20 12:13:12 UTC (rev 2236) +++ trunk/pom.xml 2011-02-20 12:13:14 UTC (rev 2237) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4</version> + <version>3.0-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -110,9 +110,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <dependencyManagement>

1 0

r2236 - tags
by hudson＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: hudson Date: 2011-02-20 13:13:12 +0100 (Sun, 20 Feb 2011) New Revision: 2236 Url: http://nuiton.org/repositories/revision/jaxx/2236 Log: [maven-release-plugin] copy for tag jaxx-2.4 Added: tags/jaxx-2.4/

1 0

r2235 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: hudson Date: 2011-02-20 13:13:11 +0100 (Sun, 20 Feb 2011) New Revision: 2235 Url: http://nuiton.org/repositories/revision/jaxx/2235 Log: [maven-release-plugin] prepare release jaxx-2.4 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-compiler/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-demo/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-runtime/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-config/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-css/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-validator/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/jaxx-widgets/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/maven-jaxx-plugin/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) +++ trunk/pom.xml 2011-02-20 12:13:11 UTC (rev 2235) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <modules> <module>jaxx-runtime</module> @@ -110,9 +110,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4</url> </scm> <dependencyManagement>

1 0

r2234 - trunk
by tchemit＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: tchemit Date: 2011-02-20 13:10:51 +0100 (Sun, 20 Feb 2011) New Revision: 2234 Url: http://nuiton.org/repositories/revision/jaxx/2234 Log: make more automatic release (using extra-modules profile) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-20 12:05:41 UTC (rev 2233) +++ trunk/pom.xml 2011-02-20 12:10:51 UTC (rev 2234) @@ -521,33 +521,38 @@ <profiles> -  +  <profile> <id>demo</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <modules> <module>jaxx-demo</module> </modules> </profile> -  +  <profile> <id>tutorial</id> + <modules> + <module>jaxx-tutorial</module> + </modules> + + </profile> + +  + <profile> + <id>extra-modules</id> <activation> <property> <name>performRelease</name> <value>true</value> </property> </activation> - <modules> + <module>jaxx-demo</module> <module>jaxx-tutorial</module> </modules>

1 0

r2233 - trunk/src/site/rst
by tchemit＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: tchemit Date: 2011-02-20 13:05:41 +0100 (Sun, 20 Feb 2011) New Revision: 2233 Url: http://nuiton.org/repositories/revision/jaxx/2233 Log: update doc Modified: trunk/src/site/rst/index.rst Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-02-20 11:36:20 UTC (rev 2232) +++ trunk/src/site/rst/index.rst 2011-02-20 12:05:41 UTC (rev 2233) @@ -40,6 +40,9 @@ Nouveautés de la version 2.4 ---------------------------- +Amélioration des imports +________________________ + La version 2.4 fait le ménage dans le code généré par JAXX en se rapprochant du projet eugene_. @@ -75,6 +78,14 @@ trouver les objets correspondants au tags d'un fichier jaxx et les imports d'une classe java à générer. Actuellement les deux concepts sont mélangés. +Utilisation de JXLayer 3.0.4 +____________________________ + +L'utilisation de cette mise à jour (à partir de la 3.0.3) a des impacts car +l'api a été modifiée et n'est plus compatible... Il s'agit en fait de +modification des generics sur JXLayer, vous devrez peut-être modifier votre code +pour qu'il compile. + Nouveautés de la version 2.3 ----------------------------

1 0

r2232 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/finalizers jaxx-compiler/src/main/java/jaxx/compiler/java jaxx-validator/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: tchemit Date: 2011-02-20 12:36:20 +0100 (Sun, 20 Feb 2011) New Revision: 2232 Url: http://nuiton.org/repositories/revision/jaxx/2232 Log: add javadoc for SwingValidatorUtil + improve generation Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2011-02-20 11:34:09 UTC (rev 2231) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2011-02-20 11:36:20 UTC (rev 2232) @@ -126,7 +126,7 @@ Modifier.PUBLIC, TYPE_VOID, "registerValidatorFields", - validatorUtilPrefix + "installFields(this);", + validatorUtilPrefix + "detectValidatorFields(this);", true) ); builder.append("// register "); @@ -135,7 +135,7 @@ builder.append(eol); builder.append("validatorIds = "); - builder.append(validatorUtilPrefix).append("initUI(this);"); + builder.append(validatorUtilPrefix).append("detectValidators(this);"); builder.append(eol); builder.append(validatorUtilPrefix).append("installUI(this);"); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-02-20 11:34:09 UTC (rev 2231) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-02-20 11:36:20 UTC (rev 2232) @@ -172,14 +172,21 @@ return methods.contains(method.getName()); } }, - JAXXValidation(Modifier.PUBLIC, "JAXXValidation implementation") { + JAXXValidation(Modifier.PUBLIC, "JAXXValidator implementation") { private final List<String> methods = - Arrays.asList("getValidator", "getValidatorIds"); + Arrays.asList("getValidator", "getValidatorIds", "registerValidatorFields"); @Override public boolean accept(JavaMethod method) { - return methods.contains(method.getName()); + boolean contains = methods.contains(method.getName()); + if (contains && method.getName().equals("getValidator")) { + // only accept the method getValidator(String) and not anything else... + // since user can have a validator field which is a validator, but not part of the + // JAXXValidatator contract + return method.getArguments().length==1; + } + return contains; } }, events(Modifier.PUBLIC, "Event methods") { @@ -202,7 +209,7 @@ return method.getName().startsWith("set"); } }, - otherPublic(Modifier.PUBLIC, "Public mutator methods") { + otherPublic(Modifier.PUBLIC, "Other methods") { @Override public boolean accept(int mod) { return super.accept(mod) && !Modifier.isStatic(mod); Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2011-02-20 11:34:09 UTC (rev 2231) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2011-02-20 11:36:20 UTC (rev 2232) @@ -126,7 +126,8 @@ // no instance } - public static <O> SwingValidator<O> newValidator(Class<O> type, String context) { + public static <O> SwingValidator<O> newValidator(Class<O> type, + String context) { if (BeanValidatorFactory.isDefaultCreator()) { @@ -134,11 +135,63 @@ BeanValidatorFactory.setCreator(new DefaultSwingValidatorCreator()); } SwingValidator<O> validator = - (SwingValidator<O>) BeanValidatorFactory.newBeanValidator(type, context); + (SwingValidator<O>) BeanValidatorFactory.newBeanValidator( + type, context); return validator; } - public static List<String> initUI(JAXXValidator ui) { + /** + * To install all the stuff for validation on a {@link JAXXValidator} ui. + * <p/> + * This method is called after validators has beeen detected in the ui (via + * the method {@link #detectValidators(JAXXValidator)}).. + * <p/> + * It will first find and register all validator field via the method + * {@link JAXXValidator#registerValidatorFields()}, then for each + * validators it will install ui for it (says connect validator to ui via layers) + * and will reload attached bean to make visible bean validation state on ui. + * <p/> + * This method is always inovked by a generated jaxx-validator file at the + * end of the {@code $completeSetup} method. + * + * @param ui the validator ui to init. + */ + public static void installUI(JAXXValidator ui) { + + // first install fields with validation + ui.registerValidatorFields(); + +// detectValidatorFields(ui); + + // for each validator install uis + reload bean + + List<String> validatorIds = ui.getValidatorIds(); + for (String validatorId : validatorIds) { + SwingValidator<?> validator = (SwingValidator<?>) + ui.getValidator(validatorId); + + // install uis + validator.installUIs(); + + // reload attached bean (to see validation on uis) + validator.reloadBean(); + } + } + + /** + * Given a {@link JAXXValidator} ui, detects on it all the validators it + * contains. + * <p/> + * A validator is detected from the annotation {@link Validator} placed on + * his field. + * <p/> + * This method is always inovked by a generated jaxx-validator file at the + * end of the {@code $completeSetup} method. + * + * @param ui the ui where to seek for validators. + * @return the list of ids of validators found on the given ui + */ + public static List<String> detectValidators(JAXXValidator ui) { List<String> validatorIds = new ArrayList<String>(); Map<Field, Validator> validators = ReflectUtil.getFieldAnnotation( ui.getClass(), @@ -152,22 +205,41 @@ String validatorId = annotation.validatorId(); validatorIds.add(validatorId); if (log.isInfoEnabled()) { - log.info("Detect validator [" + annotation.validatorId() + "] on field " + field.getName()); + log.info("Detect validator [" + annotation.validatorId() + + "] on field " + field.getName()); } } return Collections.unmodifiableList(validatorIds); } - public static void installFields(JAXXValidator ui) { + /** + * Detects on a {@link JAXXValidator} ui all the validator fields it + * contains. + * <p/> + * A validator field is detected via the annotation placed on his field or + * his getter (in cas of inheritance). + * <p/> + * Each field found will be registred to his corresponding validator via + * the method {@link SwingValidator#setFieldRepresentation(String, JComponent)}. + * <p/> + * By default, this method is invoked in the generated method + * {@link JAXXValidator#registerValidatorFields()} by a generated + * jaxx-validator file. + * + * @param ui the ui to seek + */ + public static void detectValidatorFields(JAXXValidator ui) { Map<JComponent, ValidatorField> editors = getValidatorEditors(ui); try { for (String validatorId : ui.getValidatorIds()) { - SwingValidator<?> validator = (SwingValidator<?>) ui.getValidator(validatorId); + SwingValidator<?> validator = + (SwingValidator<?>) ui.getValidator(validatorId); - for (Map.Entry<JComponent, ValidatorField> entry : editors.entrySet()) { + for (Map.Entry<JComponent, ValidatorField> entry : + editors.entrySet()) { ValidatorField fieldAnnotation = entry.getValue(); JComponent editor = entry.getKey(); if (!validatorId.equals(fieldAnnotation.validatorId())) { @@ -177,11 +249,12 @@ } String propertyName = fieldAnnotation.propertyName(); if (log.isInfoEnabled()) { - log.info("Detects for validator [" + validatorId + "] property " + propertyName + " for editor " + fieldAnnotation.editorName()); + log.info("Detects for validator [" + validatorId + + "] property " + propertyName + + " for editor " + fieldAnnotation.editorName()); } validator.setFieldRepresentation(propertyName, editor); } - } } finally { @@ -190,25 +263,6 @@ } } - public static void installUI(JAXXValidator ui) { - - // first install fields with validation - installFields(ui); - - // for each validator install uis + reload bean - - List<String> validatorIds = ui.getValidatorIds(); - for (String validatorId : validatorIds) { - SwingValidator<?> validator = (SwingValidator<?>) ui.getValidator(validatorId); - - // install uis - validator.installUIs(); - - // reload attached bean (to see validation on uis) - validator.reloadBean(); - } - } - /** * Prepare the ui where to display the validators messages. *

1 0

r2231 - in trunk/jaxx-demo/src/main/java/jaxx/demo: feature/databinding feature/validation fun
by tchemit＠users.nuiton.org Feb. 20, 2011

Feb. 20, 2011

Author: tchemit Date: 2011-02-20 12:34:09 +0100 (Sun, 20 Feb 2011) New Revision: 2231 Url: http://nuiton.org/repositories/revision/jaxx/2231 Log: improve demo layouts Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -23,7 +23,7 @@ #L% --> -<BaseBeanDataBinding> +<BaseBeanDataBinding layout='{new BorderLayout()}'> <Boolean id='editing3' javaBean='true'/> <script><![CDATA[ Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -24,7 +24,8 @@ --> -<jaxx.demo.DemoPanel id='mainFrame' implements='DemoUIModel'> +<jaxx.demo.DemoPanel id='mainFrame' implements='DemoUIModel' + layout='{new BorderLayout()}'> <import> jaxx.runtime.JAXXBinding @@ -78,7 +79,7 @@ <DemoUIModel id='model1' javaBean='new DefaultDemoUIModel()'/> - <Table fill="both" constraints='BorderLayout.NORTH'> + <Table fill="both" constraints='BorderLayout.CENTER'> <row> <cell columns="3"> <JPanel layout="{new GridLayout(1,0)}"> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -23,7 +23,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <style source="Validation.css"/> <import> @@ -33,6 +33,8 @@ jaxx.demo.entities.Model jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer jaxx.runtime.validator.swing.SwingValidatorMessageListModel + + java.io.File </import> <script><![CDATA[ @@ -78,7 +80,7 @@ <field name="email" component="email2"/> </BeanValidator> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell weightx='1' weighty='1' insets='6, 3, 0, 0'> <JPanel border='{BorderFactory.createTitledBorder("Form")}' @@ -274,7 +276,7 @@ </cell> <cell> <JTextField id='config' text='{identity.getConfig()+""}' - onKeyReleased='identity.setConfig(new java.io.File(config.getText()))'/> + onKeyReleased='identity.setConfig(new File(config.getText()))'/> </cell> </row> <row> @@ -283,7 +285,7 @@ </cell> <cell> <JTextField id='dir' text='{identity.getDir()+""}' - onKeyReleased='identity.setDir(new java.io.File(dir.getText()))'/> + onKeyReleased='identity.setDir(new File(dir.getText()))'/> </cell> </row> </Table> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -23,7 +23,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <style source="Validation.css"/> <import> @@ -34,6 +34,8 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer jaxx.runtime.validator.swing.SwingValidatorMessageTableModel + + java.io.File </import> <script><![CDATA[ @@ -77,7 +79,7 @@ <field name="email" component="email2"/> </BeanValidator> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell weightx='1' weighty='1' insets='6, 3, 0, 0'> <JPanel border='{BorderFactory.createTitledBorder("Form")}' @@ -275,7 +277,7 @@ </cell> <cell> <JTextField id='config' text='{identity.getConfig()+""}' - onKeyReleased='identity.setConfig(new java.io.File(config.getText()))'/> + onKeyReleased='identity.setConfig(new File(config.getText()))'/> </cell> </row> <row> @@ -284,7 +286,7 @@ </cell> <cell> <JTextField id='dir' text='{identity.getDir()+""}' - onKeyReleased='identity.setDir(new java.io.File(dir.getText()))'/> + onKeyReleased='identity.setDir(new File(dir.getText()))'/> </cell> </row> </Table> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -23,7 +23,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.awt.Color Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2011-02-19 22:29:23 UTC (rev 2230) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2011-02-20 11:34:09 UTC (rev 2231) @@ -23,7 +23,7 @@ #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.awt.Color

1 0

r2230 - in trunk: jaxx-compiler/src/license jaxx-compiler/src/main/java/jaxx/compiler/java jaxx-runtime/src/license jaxx-tutorial-config/src/license jaxx-tutorial-css/src/license jaxx-tutorial-databinding/src/license jaxx-tutorial-helloworld/src/license jaxx-tutorial-helloworld2/src/license jaxx-tutorial-validation/src/license jaxx-widgets/src/license maven-jaxx-plugin/src/license
by hudson＠users.nuiton.org Feb. 19, 2011

Feb. 19, 2011

Author: hudson Date: 2011-02-19 23:29:23 +0100 (Sat, 19 Feb 2011) New Revision: 2230 Url: http://nuiton.org/repositories/revision/jaxx/2230 Log: optimize third-parties + add file header Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -3,16 +3,17 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:10:41 CET 2011 +#Sat Feb 19 21:46:20 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java 2011-02-19 22:29:23 UTC (rev 2230) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Compiler + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.compiler.java; import java.lang.reflect.Constructor; Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -3,14 +3,13 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:08:30 CET 2011 +#Sat Feb 19 21:30:15 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,14 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:12:47 CET 2011 +#Sat Feb 19 22:39:53 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-css/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,14 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:33:48 CET 2010 +#Sat Feb 19 22:38:35 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-databinding/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,14 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:34:28 CET 2010 +#Sat Feb 19 22:39:17 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-helloworld/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,14 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:32:10 CET 2010 +#Sat Feb 19 22:37:26 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-helloworld2/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,14 +2,13 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:33:05 CET 2010 +#Sat Feb 19 22:38:02 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -2,16 +2,17 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:12:49 CET 2011 +#Sat Feb 19 23:13:29 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-widgets/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -3,14 +3,13 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:23:40 CET 2010 +#Sat Feb 19 21:54:05 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-02-19 22:02:20 UTC (rev 2229) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-02-19 22:29:23 UTC (rev 2230) @@ -3,23 +3,24 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - Public Domain -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 # - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:11:32 CET 2011 +#Sat Feb 19 21:50:40 CET 2011 classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org… commons-cli--commons-cli--1.0--jar=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file

1 0

r2229 - in trunk/jaxx-compiler/src/main/java/jaxx/compiler: . decorators
by tchemit＠users.nuiton.org Feb. 19, 2011

Feb. 19, 2011

Author: tchemit Date: 2011-02-19 23:02:20 +0100 (Sat, 19 Feb 2011) New Revision: 2229 Url: http://nuiton.org/repositories/revision/jaxx/2229 Log: fix api Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java 2011-02-19 21:56:44 UTC (rev 2228) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java 2011-02-19 22:02:20 UTC (rev 2229) @@ -84,6 +84,7 @@ * @param packageName the package name * @param className the (simple ?) class name * @param fullClassName the fully class name + * @throws ClassNotFoundException if a class is not found */ void finalizeCompiler(JAXXCompiler compiler, CompiledObject root, @@ -91,7 +92,7 @@ JavaFile javaFile, String packageName, String className, - String fullClassName); + String fullClassName) throws ClassNotFoundException; /** * Obtain the creation code of the given {@code object} from the {@code compiler} to inject in generate method Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2011-02-19 21:56:44 UTC (rev 2228) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2011-02-19 22:02:20 UTC (rev 2229) @@ -69,7 +69,7 @@ JavaFile javaFile, String packageName, String className, - String fullClassName) { + String fullClassName) throws ClassNotFoundException{ if (object instanceof ScriptInitializer) {

1 0

r2228 - in trunk/jaxx-compiler/src/main/java/jaxx/compiler: . binding css css/parser decorators finalizers java java/parser script tags tags/swing tasks tools/jaxxcapture tools/jaxxcapture/handlers
by tchemit＠users.nuiton.org Feb. 19, 2011

Feb. 19, 2011

Author: tchemit Date: 2011-02-19 22:56:44 +0100 (Sat, 19 Feb 2011) New Revision: 2228 Url: http://nuiton.org/repositories/revision/jaxx/2228 Log: Evolution #1349: Replace StringBuffer by StringBuilder Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -88,14 +88,14 @@ * Because CompiledObject initialization order cannot be guaranteed, it is not safe to refer to other * CompiledObjects from initializationCode -- you must refer to them from additionCode instead. */ - private StringBuffer initializationCode = new StringBuffer(); + private StringBuilder initializationCode = new StringBuilder(); /** * Java code snippet which completes setup by adding any child objects, or otherwise manipulates any refererenced * objects. Because CompiledObject initialization order cannot be guaranteed, it is not safe to refer to other * CompiledObjects from initializationCode -- you must refer to them from additionCode instead. */ - private StringBuffer additionCode = new StringBuffer(); + private StringBuilder additionCode = new StringBuilder(); /** List of all registered event handlers. */ private List<EventHandler> eventHandlers = new ArrayList<EventHandler>(); @@ -172,7 +172,7 @@ this.childJavaCode = childJavaCode; } - public void addToAdditionCode(StringBuffer buffer, + public void addToAdditionCode(StringBuilder buffer, boolean isRootObject) { //TC-20091026 do not prefix if on root object String prefix; @@ -505,7 +505,7 @@ * @return the code which initializes this object */ public String getInitializationCode(JAXXCompiler compiler) { - StringBuffer result = new StringBuffer(initializationCode.toString()); + StringBuilder result = new StringBuilder(initializationCode.toString()); for (Object eventHandler : eventHandlers) { EventHandler handler = (EventHandler) eventHandler; result.append(getInitializationCode(handler, compiler)); @@ -775,7 +775,7 @@ List<ChildRef> refList = getChilds(); if (refList != null && !refList.isEmpty()) { // compute additionCode for all childs - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for (ChildRef childRef : refList) { childRef.addToAdditionCode(buffer, equals(compiler.getRootObject())); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -71,7 +71,7 @@ boolean createInitializer(JAXXCompiler compiler, CompiledObject root, CompiledObject object, - StringBuffer code, + StringBuilder code, boolean lastWasMethodCall); /** @@ -91,7 +91,7 @@ JavaFile javaFile, String packageName, String className, - String fullClassName) throws ClassNotFoundException; + String fullClassName); /** * Obtain the creation code of the given {@code object} from the {@code compiler} to inject in generate method Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -232,13 +232,13 @@ private String superGenericType; /** Extra code to be added to the instance initializer. */ - protected StringBuffer initializer; + protected StringBuilder initializer; /** Extra code to be added at the end of the instance initializer. */ - protected StringBuffer lateInitializer; + protected StringBuilder lateInitializer; /** Extra code to be added to the class body. */ - protected StringBuffer bodyCode; + protected StringBuilder bodyCode; /** true if a main() method has been declared in a script */ protected boolean mainDeclared; @@ -317,9 +317,9 @@ ids = new LinkedHashMap<CompiledObject, String>(); objects = new LinkedHashMap<String, CompiledObject>(); - bodyCode = new StringBuffer(); - lateInitializer = new StringBuffer(); - initializer = new StringBuffer(); + bodyCode = new StringBuilder(); + lateInitializer = new StringBuilder(); + initializer = new StringBuilder(); tagsBeingCompiled = new Stack<Element>(); initializers = new ArrayList<Runnable>(); eventHandlerMethodNames = new HashMap<EventHandler, String>(); @@ -1315,15 +1315,15 @@ /*-- Buffer --------------------------------------------------------------*/ /*------------------------------------------------------------------------*/ - public StringBuffer getInitializer() { + public StringBuilder getInitializer() { return initializer; } - public StringBuffer getLateInitializer() { + public StringBuilder getLateInitializer() { return lateInitializer; } - public StringBuffer getBodyCode() { + public StringBuilder getBodyCode() { return bodyCode; } @@ -1768,7 +1768,7 @@ * by equivalent Java escape sequences */ public static String escapeJavaString(String raw) { - StringBuffer out = new StringBuffer(raw); + StringBuilder out = new StringBuilder(raw); for (int i = 0; i < out.length(); i++) { char c = out.charAt(i); if (c == '\\' || c == '"') { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -89,7 +89,7 @@ public static String processDataBindings(String stringValue) throws CompilerException { int pos = getNextLeftBrace(stringValue, 0); if (pos != -1) { - StringBuffer expression = new StringBuffer(); + StringBuilder expression = new StringBuilder(); int lastPos = 0; while (pos != -1 && pos < stringValue.length()) { if (pos > lastPos) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -471,8 +471,8 @@ log.debug("for symbol " + symbol + ", contextClass " + contextClass + ", isMethod " + isMethod); log.debug("tokens " + Arrays.toString(tokens)); } - StringBuffer currentSymbol = new StringBuffer(); - StringBuffer tokensSeenSoFar = new StringBuffer(); + StringBuilder currentSymbol = new StringBuilder(); + StringBuilder tokensSeenSoFar = new StringBuilder(); // if this ends up false, it means we weren't able to figure out boolean accepted; // which object the method is being invoked on @@ -667,7 +667,7 @@ DefaultObjectHandler.ProxyEventInfo eventInfo = handler.getEventInfo(memberName); if (eventInfo != null) { // a "proxied" event is one that doesn't fire PropertyChangeEvent, so we need to convert its native event type into PropertyChangeEvents - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); String methodName = "$pr" + compiler.getUniqueId(propertyChangeListenerCode.equals("this") ? constantId : propertyChangeListenerCode); boolean methodExists = hasMethod(methodName); ClassDescriptor eventClass = DefaultObjectHandler.getEventClass(eventInfo.getListenerClass()); @@ -766,7 +766,7 @@ if (eventInfo != null) { // a "proxied" event is one that doesn't fire PropertyChangeEvent, // so we need to convert its native event type into PropertyChangeEvents - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); String methodName = "$pr" + compiler.getUniqueId(propertyChangeListenerCode.equals("this") ? constantId : propertyChangeListenerCode); boolean methodExists = hasMethod(methodName); if (!methodExists) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -351,7 +351,7 @@ if (pseudoClass.contains("[")) { pseudoClass = pseudoClass.substring(0, pseudoClass.indexOf("[")); } - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); DefaultObjectHandler handler = TagManager.getTagHandler(object.getObjectClass()); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -88,7 +88,7 @@ } public int jjtGetNumChildren() { - return (children == null) ? 0 : children.length; + return children == null ? 0 : children.length; } /* You can override these two methods in subclasses of SimpleNode to @@ -121,7 +121,7 @@ } } - private void appendSpecialTokens(StringBuffer s, Token st) { + private void appendSpecialTokens(StringBuilder s, Token st) { if (st != null) { appendSpecialTokens(s, st.specialToken); s.append(st.image); @@ -131,7 +131,7 @@ /** @return the text of the tokens comprising this node. */ public String getText() { - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); Token t = firstToken; while (t != null) { appendSpecialTokens(text, t.specialToken); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -58,7 +58,7 @@ * @return the espaced text */ protected static String addEscapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { @@ -112,11 +112,11 @@ * token manager to indicate a lexical error. */ protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { - return ("Lexical error at line " + + return "Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + - (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") + - "after : \"" + addEscapes(errorAfter) + "\""); + (EOFSeen ? "<EOF> " : "\"" + addEscapes(String.valueOf(curChar)) + "\"" + " (" + (int) curChar + "), ") + + "after : \"" + addEscapes(errorAfter) + "\""; } /** Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -69,7 +69,7 @@ JavaFile javaFile, String packageName, String className, - String fullClassName) throws ClassNotFoundException { + String fullClassName) { if (object instanceof ScriptInitializer) { @@ -170,7 +170,7 @@ } String eol = JAXXCompiler.getLineSeparator(); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); StringBuilder init = new StringBuilder(); if (compiler.getRootObject().equals(object) || @@ -257,7 +257,7 @@ public String createCompleteSetupMethod(JAXXCompiler compiler, CompiledObject object, JavaFile javaFile) { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); if (object.getId().startsWith("$")) { String additionCode = object.getAdditionCode(); @@ -299,7 +299,7 @@ public boolean createInitializer(JAXXCompiler compiler, CompiledObject root, CompiledObject object, - StringBuffer code, + StringBuilder code, boolean lastWasMethodCall) { String eol = JAXXCompiler.getLineSeparator(); @@ -344,7 +344,7 @@ } protected void addClientProperties(CompiledObject object, - StringBuffer code, + StringBuilder code, String eol) { //TC-20090327 generate client properties if (object.hasClientProperties()) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -753,7 +753,7 @@ ); } else { - StringBuffer initializer = new StringBuffer(); + StringBuilder initializer = new StringBuilder(); for (int i = 0; i < data.length(); i += sizeLimit) { String name = FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR + i; javaFile.addField(newField( @@ -950,7 +950,7 @@ protected JavaMethod createConstructor(JAXXCompiler compiler, String className, boolean superclassIsJAXXObject) throws CompilerException { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); String constructorParams = compiler.getRootObject().getConstructorParams(); String eol = JAXXCompiler.getLineSeparator(); if (constructorParams != null) { @@ -1049,7 +1049,7 @@ compiler.containsScriptField(FIELD_NAME_CONTEXT_INITIALIZED); String eol = JAXXCompiler.getLineSeparator(); - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); CompiledObject root = compiler.getRootObject(); code.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED); if (overrideContextInitialized) { @@ -1117,7 +1117,7 @@ protected JavaMethod addCompleteSetupMethod(JAXXCompiler compiler, JavaFile javaFile) { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); code.append(FIELD_NAME_ALL_COMPONENTS_CREATED + " = true;"); String eol = JAXXCompiler.getLineSeparator(); code.append(eol); @@ -1241,7 +1241,7 @@ } protected JavaMethod createProcessDataBindingMethod() { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); // the force parameter forces the update to happen even if it is already in activeBindings. This Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -70,7 +70,7 @@ private List<String> interfaces; - private StringBuffer rawBodyCode = new StringBuffer(); + private StringBuilder rawBodyCode = new StringBuilder(); private boolean superclassIsJAXXObject; @@ -125,8 +125,6 @@ if (CollectionUtils.isNotEmpty(interfaces)) { addInterface(interfaces.toArray(new String[interfaces.size()])); } -// this.superClass = superClass; -// this.interfaces = interfaces; } public String getPackageName() { @@ -188,7 +186,7 @@ return innerClasses; } - public StringBuffer getRawBodyCode() { + public StringBuilder getRawBodyCode() { return rawBodyCode; } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -142,7 +142,7 @@ log.info(f.getName()); } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); String genericType = f.getGenericType(); result.append(f.getModifiersText()); @@ -208,7 +208,7 @@ // generate raw body - StringBuffer rawBodyCode = f.getRawBodyCode(); + StringBuilder rawBodyCode = f.getRawBodyCode(); if (rawBodyCode.length() > 0) { result.append(addIndentation( @@ -288,7 +288,7 @@ log.debug(f.getName()); } } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); generateAnnotations(f, result, eol); result.append(f.getModifiersText()); result.append(f.getType()).append(' ').append(f.getName()); @@ -300,7 +300,7 @@ } protected void generateAnnotations(JavaElement element, - StringBuffer result, + StringBuilder result, String separator) { if (element.hasAnnotations()) { for (String annotation : element.getAnnotations()) { @@ -317,7 +317,7 @@ log.info(m.getName()); } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); generateAnnotations(m, result, eol); result.append(m.getModifiersText()); @@ -367,7 +367,7 @@ log.info(m.getName()); } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); if (m.isOverride()) { m.addAnnotation(Override.class.getSimpleName()); } @@ -442,7 +442,7 @@ } char[] spaces = new char[indentation]; Arrays.fill(spaces, ' '); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); String[] lines = source.split(lineSeparator + "|\n"); for (int i = 0; i < lines.length; i++) { if (i > 0) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -26,10 +26,13 @@ package jaxx.compiler.java.parser; +import java.io.IOException; +import java.io.PrintStream; + public class JavaParserTokenManager implements JavaParserConstants { - public java.io.PrintStream debugStream = System.out; + public PrintStream debugStream = System.out; - public void setDebugStream(java.io.PrintStream ds) { + public void setDebugStream(PrintStream ds) { debugStream = ds; } @@ -162,7 +165,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { return pos + 1; } return jjMoveNfa_0(state, pos + 1); @@ -276,7 +279,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(0, active0, active1); return 1; } @@ -393,7 +396,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(1, active0, active1); return 2; } @@ -468,7 +471,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(2, active0, active1); return 3; } @@ -545,7 +548,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(3, active0, 0L); return 4; } @@ -611,12 +614,12 @@ } private int jjMoveStringLiteralDfa5_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(3, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(4, active0, 0L); return 5; } @@ -674,12 +677,12 @@ } private int jjMoveStringLiteralDfa6_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(4, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(5, active0, 0L); return 6; } @@ -725,12 +728,12 @@ } private int jjMoveStringLiteralDfa7_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(5, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(6, active0, 0L); return 7; } @@ -760,12 +763,12 @@ } private int jjMoveStringLiteralDfa8_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(6, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(7, active0, 0L); return 8; } @@ -793,12 +796,12 @@ } private int jjMoveStringLiteralDfa9_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(7, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(8, active0, 0L); return 9; } @@ -820,12 +823,12 @@ } private int jjMoveStringLiteralDfa10_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(8, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(9, active0, 0L); return 10; } @@ -839,12 +842,12 @@ } private int jjMoveStringLiteralDfa11_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if ((active0 &= old0) == 0L) return jjStartNfa_0(9, old0, 0L); try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { jjStopStringLiteralDfa_0(10, active0, 0L); return 11; } @@ -1580,7 +1583,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { return curPos; } } @@ -1599,7 +1602,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { return 1; } switch (curChar) { @@ -1626,7 +1629,7 @@ try { curChar = input_stream.readChar(); } - catch (java.io.IOException e) { + catch (IOException e) { return 1; } switch (curChar) { @@ -1650,7 +1653,7 @@ private static boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { switch (hiByte) { case 0: - return ((jjbitVec2[i2] & l2) != 0L); + return (jjbitVec2[i2] & l2) != 0L; default: if ((jjbitVec0[i1] & l1) != 0L) return true; @@ -1661,79 +1664,79 @@ private static boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) { switch (hiByte) { case 0: - return ((jjbitVec4[i2] & l2) != 0L); + return (jjbitVec4[i2] & l2) != 0L; case 2: - return ((jjbitVec5[i2] & l2) != 0L); + return (jjbitVec5[i2] & l2) != 0L; case 3: - return ((jjbitVec6[i2] & l2) != 0L); + return (jjbitVec6[i2] & l2) != 0L; case 4: - return ((jjbitVec7[i2] & l2) != 0L); + return (jjbitVec7[i2] & l2) != 0L; case 5: - return ((jjbitVec8[i2] & l2) != 0L); + return (jjbitVec8[i2] & l2) != 0L; case 6: - return ((jjbitVec9[i2] & l2) != 0L); + return (jjbitVec9[i2] & l2) != 0L; case 7: - return ((jjbitVec10[i2] & l2) != 0L); + return (jjbitVec10[i2] & l2) != 0L; case 9: - return ((jjbitVec11[i2] & l2) != 0L); + return (jjbitVec11[i2] & l2) != 0L; case 10: - return ((jjbitVec12[i2] & l2) != 0L); + return (jjbitVec12[i2] & l2) != 0L; case 11: - return ((jjbitVec13[i2] & l2) != 0L); + return (jjbitVec13[i2] & l2) != 0L; case 12: - return ((jjbitVec14[i2] & l2) != 0L); + return (jjbitVec14[i2] & l2) != 0L; case 13: - return ((jjbitVec15[i2] & l2) != 0L); + return (jjbitVec15[i2] & l2) != 0L; case 14: - return ((jjbitVec16[i2] & l2) != 0L); + return (jjbitVec16[i2] & l2) != 0L; case 15: - return ((jjbitVec17[i2] & l2) != 0L); + return (jjbitVec17[i2] & l2) != 0L; case 16: - return ((jjbitVec18[i2] & l2) != 0L); + return (jjbitVec18[i2] & l2) != 0L; case 17: - return ((jjbitVec19[i2] & l2) != 0L); + return (jjbitVec19[i2] & l2) != 0L; case 18: - return ((jjbitVec20[i2] & l2) != 0L); + return (jjbitVec20[i2] & l2) != 0L; case 19: - return ((jjbitVec21[i2] & l2) != 0L); + return (jjbitVec21[i2] & l2) != 0L; case 20: - return ((jjbitVec0[i2] & l2) != 0L); + return (jjbitVec0[i2] & l2) != 0L; case 22: - return ((jjbitVec22[i2] & l2) != 0L); + return (jjbitVec22[i2] & l2) != 0L; case 23: - return ((jjbitVec23[i2] & l2) != 0L); + return (jjbitVec23[i2] & l2) != 0L; case 24: - return ((jjbitVec24[i2] & l2) != 0L); + return (jjbitVec24[i2] & l2) != 0L; case 30: - return ((jjbitVec25[i2] & l2) != 0L); + return (jjbitVec25[i2] & l2) != 0L; case 31: - return ((jjbitVec26[i2] & l2) != 0L); + return (jjbitVec26[i2] & l2) != 0L; case 32: - return ((jjbitVec27[i2] & l2) != 0L); + return (jjbitVec27[i2] & l2) != 0L; case 33: - return ((jjbitVec28[i2] & l2) != 0L); + return (jjbitVec28[i2] & l2) != 0L; case 48: - return ((jjbitVec29[i2] & l2) != 0L); + return (jjbitVec29[i2] & l2) != 0L; case 49: - return ((jjbitVec30[i2] & l2) != 0L); + return (jjbitVec30[i2] & l2) != 0L; case 77: - return ((jjbitVec31[i2] & l2) != 0L); + return (jjbitVec31[i2] & l2) != 0L; case 159: - return ((jjbitVec32[i2] & l2) != 0L); + return (jjbitVec32[i2] & l2) != 0L; case 164: - return ((jjbitVec33[i2] & l2) != 0L); + return (jjbitVec33[i2] & l2) != 0L; case 215: - return ((jjbitVec34[i2] & l2) != 0L); + return (jjbitVec34[i2] & l2) != 0L; case 250: - return ((jjbitVec35[i2] & l2) != 0L); + return (jjbitVec35[i2] & l2) != 0L; case 251: - return ((jjbitVec36[i2] & l2) != 0L); + return (jjbitVec36[i2] & l2) != 0L; case 253: - return ((jjbitVec37[i2] & l2) != 0L); + return (jjbitVec37[i2] & l2) != 0L; case 254: - return ((jjbitVec38[i2] & l2) != 0L); + return (jjbitVec38[i2] & l2) != 0L; case 255: - return ((jjbitVec39[i2] & l2) != 0L); + return (jjbitVec39[i2] & l2) != 0L; default: if ((jjbitVec3[i1] & l1) != 0L) return true; @@ -1744,79 +1747,79 @@ private static boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2) { switch (hiByte) { case 0: - return ((jjbitVec40[i2] & l2) != 0L); + return (jjbitVec40[i2] & l2) != 0L; case 2: - return ((jjbitVec5[i2] & l2) != 0L); + return (jjbitVec5[i2] & l2) != 0L; case 3: - return ((jjbitVec41[i2] & l2) != 0L); + return (jjbitVec41[i2] & l2) != 0L; case 4: - return ((jjbitVec42[i2] & l2) != 0L); + return (jjbitVec42[i2] & l2) != 0L; case 5: - return ((jjbitVec43[i2] & l2) != 0L); + return (jjbitVec43[i2] & l2) != 0L; case 6: - return ((jjbitVec44[i2] & l2) != 0L); + return (jjbitVec44[i2] & l2) != 0L; case 7: - return ((jjbitVec45[i2] & l2) != 0L); + return (jjbitVec45[i2] & l2) != 0L; case 9: - return ((jjbitVec46[i2] & l2) != 0L); + return (jjbitVec46[i2] & l2) != 0L; case 10: - return ((jjbitVec47[i2] & l2) != 0L); + return (jjbitVec47[i2] & l2) != 0L; case 11: - return ((jjbitVec48[i2] & l2) != 0L); + return (jjbitVec48[i2] & l2) != 0L; case 12: - return ((jjbitVec49[i2] & l2) != 0L); + return (jjbitVec49[i2] & l2) != 0L; case 13: - return ((jjbitVec50[i2] & l2) != 0L); + return (jjbitVec50[i2] & l2) != 0L; case 14: - return ((jjbitVec51[i2] & l2) != 0L); + return (jjbitVec51[i2] & l2) != 0L; case 15: - return ((jjbitVec52[i2] & l2) != 0L); + return (jjbitVec52[i2] & l2) != 0L; case 16: - return ((jjbitVec53[i2] & l2) != 0L); + return (jjbitVec53[i2] & l2) != 0L; case 17: - return ((jjbitVec19[i2] & l2) != 0L); + return (jjbitVec19[i2] & l2) != 0L; case 18: - return ((jjbitVec20[i2] & l2) != 0L); + return (jjbitVec20[i2] & l2) != 0L; case 19: - return ((jjbitVec54[i2] & l2) != 0L); + return (jjbitVec54[i2] & l2) != 0L; case 20: - return ((jjbitVec0[i2] & l2) != 0L); + return (jjbitVec0[i2] & l2) != 0L; case 22: - return ((jjbitVec22[i2] & l2) != 0L); + return (jjbitVec22[i2] & l2) != 0L; case 23: - return ((jjbitVec55[i2] & l2) != 0L); + return (jjbitVec55[i2] & l2) != 0L; case 24: - return ((jjbitVec56[i2] & l2) != 0L); + return (jjbitVec56[i2] & l2) != 0L; case 30: - return ((jjbitVec25[i2] & l2) != 0L); + return (jjbitVec25[i2] & l2) != 0L; case 31: - return ((jjbitVec26[i2] & l2) != 0L); + return (jjbitVec26[i2] & l2) != 0L; case 32: - return ((jjbitVec57[i2] & l2) != 0L); + return (jjbitVec57[i2] & l2) != 0L; case 33: - return ((jjbitVec28[i2] & l2) != 0L); + return (jjbitVec28[i2] & l2) != 0L; case 48: - return ((jjbitVec58[i2] & l2) != 0L); + return (jjbitVec58[i2] & l2) != 0L; case 49: - return ((jjbitVec30[i2] & l2) != 0L); + return (jjbitVec30[i2] & l2) != 0L; case 77: - return ((jjbitVec31[i2] & l2) != 0L); + return (jjbitVec31[i2] & l2) != 0L; case 159: - return ((jjbitVec32[i2] & l2) != 0L); + return (jjbitVec32[i2] & l2) != 0L; case 164: - return ((jjbitVec33[i2] & l2) != 0L); + return (jjbitVec33[i2] & l2) != 0L; case 215: - return ((jjbitVec34[i2] & l2) != 0L); + return (jjbitVec34[i2] & l2) != 0L; case 250: - return ((jjbitVec35[i2] & l2) != 0L); + return (jjbitVec35[i2] & l2) != 0L; case 251: - return ((jjbitVec59[i2] & l2) != 0L); + return (jjbitVec59[i2] & l2) != 0L; case 253: - return ((jjbitVec37[i2] & l2) != 0L); + return (jjbitVec37[i2] & l2) != 0L; case 254: - return ((jjbitVec60[i2] & l2) != 0L); + return (jjbitVec60[i2] & l2) != 0L; case 255: - return ((jjbitVec61[i2] & l2) != 0L); + return (jjbitVec61[i2] & l2) != 0L; default: if ((jjbitVec3[i1] & l1) != 0L) return true; @@ -1875,7 +1878,7 @@ protected JavaCharStream input_stream; private final int[] jjrounds = new int[71]; private final int[] jjstateSet = new int[142]; - StringBuffer image; + StringBuilder image; int jjimageLen; int lengthOfMatch; protected char curChar; @@ -1921,7 +1924,7 @@ Token t = Token.newToken(jjmatchedKind); t.kind = jjmatchedKind; String im = jjstrLiteralImages[jjmatchedKind]; - t.image = (im == null) ? input_stream.GetImage() : im; + t.image = im == null ? input_stream.GetImage() : im; t.beginLine = input_stream.getBeginLine(); t.beginColumn = input_stream.getBeginColumn(); t.endLine = input_stream.getEndLine(); @@ -1947,7 +1950,7 @@ try { curChar = input_stream.BeginToken(); } - catch (java.io.IOException e) { + catch (IOException e) { jjmatchedKind = 0; matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; @@ -1986,7 +1989,7 @@ if (jjmatchedKind != 0x7fffffff) { if (jjmatchedPos + 1 < curPos) input_stream.backup(curPos - jjmatchedPos - 1); - if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { + if ((jjtoToken[jjmatchedKind >> 6] & 1L << (jjmatchedKind & 077)) != 0L) { matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; TokenLexicalActions(matchedToken); @@ -1994,14 +1997,14 @@ curLexState = jjnewLexState[jjmatchedKind]; return matchedToken; } else - if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { - if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { + if ((jjtoSkip[jjmatchedKind >> 6] & 1L << (jjmatchedKind & 077)) != 0L) { + if ((jjtoSpecial[jjmatchedKind >> 6] & 1L << (jjmatchedKind & 077)) != 0L) { matchedToken = jjFillToken(); if (specialToken == null) specialToken = matchedToken; else { matchedToken.specialToken = specialToken; - specialToken = (specialToken.next = matchedToken); + specialToken = specialToken.next = matchedToken; } SkipLexicalActions(matchedToken); } else @@ -2019,7 +2022,7 @@ curChar = input_stream.readChar(); continue; } - catch (java.io.IOException e1) { + catch (IOException e1) { } } int error_line = input_stream.getEndLine(); @@ -2030,7 +2033,7 @@ input_stream.readChar(); input_stream.backup(1); } - catch (java.io.IOException e1) { + catch (IOException e1) { EOFSeen = true; error_after = curPos <= 1 ? "" : input_stream.GetImage(); if (curChar == '\n' || curChar == '\r') { @@ -2056,11 +2059,11 @@ } void MoreLexicalActions() { - jjimageLen += (lengthOfMatch = jjmatchedPos + 1); + jjimageLen += lengthOfMatch = jjmatchedPos + 1; switch (jjmatchedKind) { case 1: if (image == null) - image = new StringBuffer(); + image = new StringBuilder(); image.append(input_stream.GetSuffix(jjimageLen)); jjimageLen = 0; input_stream.backup(1); @@ -2074,7 +2077,7 @@ switch (jjmatchedKind) { case 120: if (image == null) - image = new StringBuffer(); + image = new StringBuilder(); image.append(jjstrLiteralImages[120]); matchedToken.kind = GT; ((Token.GTToken) matchedToken).realKind = RUNSIGNEDSHIFT; @@ -2083,7 +2086,7 @@ break; case 121: if (image == null) - image = new StringBuffer(); + image = new StringBuilder(); image.append(jjstrLiteralImages[121]); matchedToken.kind = GT; ((Token.GTToken) matchedToken).realKind = RSIGNEDSHIFT; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -137,7 +137,7 @@ if (!specialConstructor) { return super.getMessage(); } - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int[] expectedTokenSequence : expectedTokenSequences) { if (maxSize < expectedTokenSequence.length) { @@ -194,7 +194,7 @@ * @return the escaped version of text */ protected String add_escapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -134,7 +134,7 @@ } } - private void appendSpecialTokens(StringBuffer s, Token st) { + private void appendSpecialTokens(StringBuilder s, Token st) { if (st != null) { appendSpecialTokens(s, st.specialToken); s.append(st.image); @@ -144,7 +144,7 @@ /** @return the text of the tokens comprising this node. */ public String getText() { - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); Token t = firstToken; while (t != null) { appendSpecialTokens(text, t.specialToken); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -58,7 +58,7 @@ * @return the treated text */ protected static String addEscapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { @@ -112,11 +112,11 @@ * token manager to indicate a lexical error. */ protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { - return ("Lexical error at line " + + return "Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + - (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") + - "after : \"" + addEscapes(errorAfter) + "\""); + (EOFSeen ? "<EOF> " : "\"" + addEscapes(String.valueOf(curChar)) + "\"" + " (" + (int) curChar + "), ") + + "after : \"" + addEscapes(errorAfter) + "\""; } /** Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -79,7 +79,7 @@ public String preprocessScript(String script) throws CompilerException { script = trimScript(script); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); JavaParser p = new JavaParser(new StringReader(script)); while (!p.Line()) { SimpleNode node = p.popNode(); @@ -99,7 +99,7 @@ */ private void scanCompoundSymbol(String symbol) { String[] tokens = symbol.split("\\."); - StringBuffer currentSymbol = new StringBuffer(); + StringBuilder currentSymbol = new StringBuilder(); for (String token : tokens) { if (currentSymbol.length() > 0) { currentSymbol.append('.'); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -1106,8 +1106,8 @@ } } - StringBuffer message = - new StringBuffer("value of '" + + StringBuilder message = + new StringBuilder("value of '" + key + "' must be one of: ["); for (int j = 0; j < values.length - 2; j += 3) { if (j != 0) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -55,7 +55,7 @@ public void compileFirstPass(Element tag, JAXXCompiler compiler) throws IOException { - StringBuffer script = new StringBuffer(); + StringBuilder script = new StringBuilder(); NodeList children = tag.getChildNodes(); for (int i = 0; i < children.getLength(); i++) { Node child = children.item(i); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -85,7 +85,7 @@ } } - StringBuffer script = new StringBuffer(); + StringBuilder script = new StringBuilder(); NodeList children = tag.getChildNodes(); for (int i = 0; i < children.getLength(); i++) { Node child = children.item(i); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -89,7 +89,7 @@ } } - StringBuffer style = new StringBuffer(); + StringBuilder style = new StringBuilder(); NodeList children = tag.getChildNodes(); for (int i = 0; i < children.getLength(); i++) { Node child = children.item(i); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -90,7 +90,7 @@ child.getJavaCode(), delegateCode) { @Override - public void addToAdditionCode(StringBuffer buffer, boolean isRootObject) { + public void addToAdditionCode(StringBuilder buffer, boolean isRootObject) { //TC-20091026 do not prefix if on root object String prefix; if (isRootObject) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -396,7 +396,7 @@ protected void addConstructor(JAXXCompiler compiler, String className, List<String> constructorTypes) throws CompilerException { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); JavaArgument[] arguments = new JavaArgument[constructorTypes.size()]; @@ -435,7 +435,7 @@ String className, List<String> constructorTypes, boolean superclassIsJAXXObject) throws CompilerException { - StringBuffer code = new StringBuffer(); + StringBuilder code = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); JavaArgument firstArgument = JavaElementFactory.newArgument( Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -41,8 +41,8 @@ private CapturedObject parent; private Map<String, String> properties = new LinkedHashMap<String, String>(); private Map<String, Object> additionalData = new HashMap<String, Object>(); - private StringBuffer innerXML = new StringBuffer(); - private StringBuffer script = new StringBuffer(); + private StringBuilder innerXML = new StringBuilder(); + private StringBuilder script = new StringBuilder(); private boolean inlineable = true; private JAXXCapture capture; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -34,6 +34,7 @@ import jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; import jaxx.compiler.tools.jaxxcapture.handlers.TableHandler; import jaxx.compiler.types.TypeManager; +import org.apache.commons.lang.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -169,7 +170,7 @@ } private String getArgumentsCode(ContextNode[] arguments) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append('('); for (int i = 0; i < arguments.length; i++) { if (i != 0) { @@ -182,11 +183,11 @@ } public String getJavaCode(ContextNode node) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); if (node instanceof PropertyNode) { ContextNode[] arguments = node.getArguments(); result.append(arguments.length == 0 ? "get" : "set"); - result.append(org.apache.commons.lang.StringUtils.capitalize(((PropertyNode) node).getProperty())); + result.append(StringUtils.capitalize(((PropertyNode) node).getProperty())); result.append(getArgumentsCode(arguments)); } else if (node instanceof MethodNode) { result.append((((MethodNode) node).getMethodName())); @@ -263,7 +264,7 @@ public String getJavaCode(Stack/*<ContextNode>*/ context) { CapturedObject contextCapturedObject = (CapturedObject) context.get(0); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); int start = 1; for (int i = context.size() - 1; i > 1; i--) { if (context.get(i) instanceof CapturedObject) { @@ -285,7 +286,7 @@ if (node instanceof MethodNode) { methodName = ((MethodNode) node).getMethodName(); } else { - methodName = (argumentNodes.length == 0 ? "get" : "set") + org.apache.commons.lang.StringUtils.capitalize(((PropertyNode) node).getProperty()); + methodName = (argumentNodes.length == 0 ? "get" : "set") + StringUtils.capitalize(((PropertyNode) node).getProperty()); } Object[] arguments = new Object[argumentNodes.length]; Class<?>[] argumentTypes = new Class<?>[argumentNodes.length]; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java 2011-02-19 21:52:54 UTC (rev 2227) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java 2011-02-19 21:56:44 UTC (rev 2228) @@ -272,7 +272,7 @@ public String getXML(CapturedObject object, JAXXCapture capture) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append('<'); String className = object.getClassName(); if (className.startsWith("javax.swing.")) { @@ -337,7 +337,7 @@ protected String getChildXML(CapturedObject object, JAXXCapture capture) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); CapturedObject[] children = object.getChildren(); String lineSeparator = JAXXCompiler.getLineSeparator(); for (CapturedObject aChildren : children) {

1 0