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

r2207 - trunk
by tchemit＠users.nuiton.org Feb. 15, 2011

Feb. 15, 2011

Author: tchemit Date: 2011-02-15 20:53:57 +0100 (Tue, 15 Feb 2011) New Revision: 2207 Url: http://nuiton.org/repositories/revision/jaxx/2207 Log: Evolution #1322: Updates to i18n 2.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 10:34:44 UTC (rev 2206) +++ trunk/pom.xml 2011-02-15 19:53:57 UTC (rev 2207) @@ -415,7 +415,7 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> - <nuitonI18nVersion>2.3</nuitonI18nVersion> + <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.3</jxLayerVersion>

1 0

r2206 - in trunk/src/site: . rst
by tchemit＠users.nuiton.org Feb. 10, 2011

Feb. 10, 2011

Author: tchemit Date: 2011-02-10 11:34:44 +0100 (Thu, 10 Feb 2011) New Revision: 2206 Url: http://nuiton.org/repositories/revision/jaxx/2206 Log: fix breadcrumbs + add doc for version 2.4 Modified: trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-02-10 10:15:45 UTC (rev 2205) +++ trunk/src/site/rst/index.rst 2011-02-10 10:34:44 UTC (rev 2206) @@ -36,6 +36,45 @@ english translation at the same time. To help you wait, you can have a look to the demo_. + +Nouveautés de la version 2.4 +---------------------------- + +La version 2.4 fait le ménage dans le code généré par JAXX en se rapprochant du +projet eugene_. + +Toute la génération n'est pas encore basée sur Eugene mais cela viendra avant la +version 3. + +JAXX n'utilise plus des imports de paquetaques (import avec *), il est donc +désormais (enfin...) possible d'utiliser dans les scripts directement un import +sur *java.util.List*. + +Le fait de ne plus importer des paquetages a des impacts et pourrait rendre +votre code non compilable. + +Pour reproduire la génération comme en version *2.3*, il suffit de renseigner +dans la configuration du plugin la propriété *extraImportList* avec les valeurs +suivantes : + +:: + + <extraImportList> + java.awt.* + javax.swing.* + javax.swing.event.* + java.util.* + </extraImportList> + +Il est cependant déconseillé de laisser une telle configuration car le fait +d'utiliser des paquetages au lieu de noms de classes précises alourdit les +temps du compilateur JAXX et génère du code de moins bonne qualité... + +D'ici la version *3.0* on écrira une documentation précise de fonctionnement du +compilateur et on va faire une différence entre les namespaces utilisés pour +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. + Nouveautés de la version 2.3 ---------------------------- @@ -276,4 +315,5 @@ .. _NavigationModel: ./NavigationModel.html .. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator +.. _eugene: http://maven-site.nuiton.org/eugene Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-02-10 10:15:45 UTC (rev 2205) +++ trunk/src/site/site_fr.xml 2011-02-10 10:34:44 UTC (rev 2206) @@ -49,7 +49,8 @@ </links> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" + href="http://maven-site.nuiton.org/jaxx/index.html"/> </breadcrumbs> <menu ref="modules"/>

1 0

r2205 - trunk
by tchemit＠users.nuiton.org Feb. 10, 2011

Feb. 10, 2011

Author: tchemit Date: 2011-02-10 11:15:45 +0100 (Thu, 10 Feb 2011) New Revision: 2205 Url: http://nuiton.org/repositories/revision/jaxx/2205 Log: Evolution #1265: Updates to mavenpom 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 11:56:13 UTC (rev 2204) +++ trunk/pom.xml 2011-02-10 10:15:45 UTC (rev 2205) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2204 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags
by tchemit＠users.nuiton.org Feb. 9, 2011

Feb. 9, 2011

Author: tchemit Date: 2011-02-09 12:56:13 +0100 (Wed, 09 Feb 2011) New Revision: 2204 Url: http://nuiton.org/repositories/revision/jaxx/2204 Log: fix font-size regression Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-02-09 09:36:57 UTC (rev 2203) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-02-09 11:56:13 UTC (rev 2204) @@ -235,8 +235,7 @@ return "if (" + id + ".getFont() != null) {\n " + id + ".setFont(new Font(" + valueCode + ", " + id + ".getFont().getStyle(), " + id + ".getFont().getSize()));\n}"; } if (FONT_SIZE_ATTRIBUTE.equals(name)) { - return "if (" + id + ".getFont() != null) {\n " + id + ".setFont(" + id + ".getFont().deriveFont(" + valueCode + "));\n}"; -// return "if (" + id + ".getFont() != null) {\n " + id + ".setFont(" + id + ".getFont().deriveFont((float) " + valueCode + "));\n}"; + return "if (" + id + ".getFont() != null) {\n " + id + ".setFont(" + id + ".getFont().deriveFont((float) " + valueCode + "));\n}"; } if (FONT_WEIGHT_ATTRIBUTE.equals(name)) { if (valueCode.equals("\"bold\"")) {

1 0

r2203 - trunk
by tchemit＠users.nuiton.org Feb. 9, 2011

Feb. 9, 2011

Author: tchemit Date: 2011-02-09 10:36:57 +0100 (Wed, 09 Feb 2011) New Revision: 2203 Url: http://nuiton.org/repositories/revision/jaxx/2203 Log: use eugene last stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:10:04 UTC (rev 2202) +++ trunk/pom.xml 2011-02-09 09:36:57 UTC (rev 2203) @@ -416,7 +416,7 @@ <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.3</nuitonI18nVersion> - <eugeneVersion>2.3.2-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.3</jxLayerVersion> <javaHelpVersion>2.0.02</javaHelpVersion>

1 0

r2202 - trunk
by tchemit＠users.nuiton.org Feb. 9, 2011

Feb. 9, 2011

Author: tchemit Date: 2011-02-09 09:10:04 +0100 (Wed, 09 Feb 2011) New Revision: 2202 Url: http://nuiton.org/repositories/revision/jaxx/2202 Log: Evolution #1265: Updates mavenpom to 2.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-02 15:28:11 UTC (rev 2201) +++ trunk/pom.xml 2011-02-09 08:10:04 UTC (rev 2202) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2201 - in trunk: jaxx-compiler maven-jaxx-plugin
by tchemit＠users.nuiton.org Feb. 2, 2011

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 16:28:11 +0100 (Wed, 02 Feb 2011) New Revision: 2201 Url: http://nuiton.org/repositories/revision/jaxx/2201 Log: optimize dependencies Modified: trunk/jaxx-compiler/pom.xml trunk/maven-jaxx-plugin/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-02-02 13:55:13 UTC (rev 2200) +++ trunk/jaxx-compiler/pom.xml 2011-02-02 15:28:11 UTC (rev 2201) @@ -62,6 +62,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> </dependency> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-02-02 13:55:13 UTC (rev 2200) +++ trunk/maven-jaxx-plugin/pom.xml 2011-02-02 15:28:11 UTC (rev 2201) @@ -55,6 +55,7 @@ <groupId>${project.groupId}</groupId> <artifactId>jaxx-validator</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency>

1 0

r2200 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org Feb. 2, 2011

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 14:55:13 +0100 (Wed, 02 Feb 2011) New Revision: 2200 Url: http://nuiton.org/repositories/revision/jaxx/2200 Log: fix error dialog widget code Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx 2011-02-02 13:54:33 UTC (rev 2199) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx 2011-02-02 13:55:13 UTC (rev 2200) @@ -47,7 +47,7 @@ public ErrorDialogUI(Frame frame) { super(frame); - if (frame!=null) { + if (frame != null) { setContextValue(frame); setContextValue(frame,"parent"); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java 2011-02-02 13:54:33 UTC (rev 2199) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java 2011-02-02 13:55:13 UTC (rev 2200) @@ -30,7 +30,7 @@ public static void init(Frame frame) { disposeUI(); - ErrorDialogUI.instance = new ErrorDialogUI(); + ErrorDialogUI.instance = new ErrorDialogUI(frame); ErrorDialogUI.instance.setModalityType(Dialog.ModalityType.TOOLKIT_MODAL); } @@ -71,6 +71,4 @@ inputMap.put(KeyStroke.getKeyStroke("ESCAPE"), "close"); rootPane.getActionMap().put("close", close.getAction()); } - - }

1 0

r2199 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags
by tchemit＠users.nuiton.org Feb. 2, 2011

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 14:54:33 +0100 (Wed, 02 Feb 2011) New Revision: 2199 Url: http://nuiton.org/repositories/revision/jaxx/2199 Log: use generic types when available Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 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-02 12:17:37 UTC (rev 2198) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-02-02 13:54:33 UTC (rev 2199) @@ -672,6 +672,11 @@ compiler.setGenericType(value); } else { object.setGenericTypes(value.split(",")); + if (object.getSimpleType() != null) { + + // reload the simpleType + object.setSimpleType(object.getSimpleType() + "<" + value + ">"); + } } continue; }

1 0

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

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 13:17:37 +0100 (Wed, 02 Feb 2011) New Revision: 2198 Url: http://nuiton.org/repositories/revision/jaxx/2198 Log: introduce a new property on overridden compiled object : simpleType to have the simpliest type to use in cast Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-02 12:16:34 UTC (rev 2197) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-02 12:17:37 UTC (rev 2198) @@ -32,6 +32,7 @@ import jaxx.compiler.tags.TagHandler; import jaxx.compiler.tags.TagManager; import jaxx.compiler.types.TypeManager; +import jaxx.runtime.JAXXUtil; import org.apache.commons.lang.StringUtils; import java.awt.Container; @@ -69,6 +70,14 @@ private boolean override; /** + * The type of the object without fqn if possible. + * <p/> + * This is used when casting on an overridden object and only available if + * {@link #override} is set to {@code true}. + */ + private String simpleType; + + /** * Comma-separated Java code snippets representing the parameters that * should be passed to the object's constructor. */ @@ -118,6 +127,10 @@ /** initializer of the object */ private String initializer; + public String getSimpleType() { + return simpleType; + } + public class ChildRef { CompiledObject child; @@ -302,6 +315,19 @@ } /** + * Sets the simple type of the object. + * <p/> + * Used when castin an overridden object. + * + * @param simpleType the simple type to use (or the fqn if there is a + * conflict with already imported types of the compiler). + * @since 2.4 + */ + public void setSimpleType(String simpleType) { + this.simpleType = simpleType; + } + + /** * Returns this object's CSS style class. * * @return the value of the <code>styleClass</code> attribute @@ -395,16 +421,24 @@ String result = javaCode; if (isOverride()) { // handle cases where object is overridden to be a different class - result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; + if (simpleType == null) { + + // means overridden but stil on the same type + result = javaCode; + } else { + result = "((" + simpleType + ") " + javaCode + ")"; +// result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; + } } return result; } public String getJavaCodeForProperty(String property) { - if (!isOverride()) { + if (!isOverride() || simpleType == null) { return javaCode; } - String result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; + String result = "((" + simpleType + ") " + javaCode + ")"; +// String result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; // String result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; String methodName = StringUtils.capitalize(property); @@ -474,9 +508,11 @@ MethodDescriptor addMethod = handler.getAddMethod(); ClassDescriptor listenerClass = addMethod.getParameterTypes()[0]; String type = compiler.getImportManager().getType(listenerClass.getName()); + String prefix = compiler.getImportManager().getType(JAXXUtil.class); + //TC-20091026 use 'this' instead of root object javaCode //TC-20091105 JAXXUtil.getEventListener is generic, no more need cast and use simple name - return getJavaCode() + '.' + addMethod.getName() + "(JAXXUtil.getEventListener(" + type + ".class, " + + return getJavaCode() + '.' + addMethod.getName() + "(" + prefix + ".getEventListener(" + type + ".class, " + TypeManager.getJavaCode(handler.getListenerMethod().getName()) + ", this, " + TypeManager.getJavaCode(compiler.getEventHandlerMethodName(handler)) + "));" + JAXXCompiler.getLineSeparator(); } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-02 12:16:34 UTC (rev 2197) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-02 12:17:37 UTC (rev 2198) @@ -780,6 +780,19 @@ } object.setOverride(true); object.setOverrideType(f.getType()); + if (!getCanonicalName(f.getType()).equals(getCanonicalName(object))) { + + // types are not the same + String simpleType = + getImportManager().getType(getCanonicalName(object)); + if (log.isDebugEnabled()) { + log.debug("Simple type for " + object.getId() + + " : " + getCanonicalName(object) + + " against : " + + getCanonicalName(f.getType())); + } + object.setSimpleType(simpleType); + } break; } catch (NoSuchFieldException e) { if (log.isDebugEnabled()) { 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-02 12:16:34 UTC (rev 2197) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2011-02-02 12:17:37 UTC (rev 2198) @@ -206,19 +206,11 @@ } public void addImport(String importString) { -// if (GeneratorUtil.isPrimitiveType(importString)) { -// // do nothing -// return; -// } try { - boolean wasAdded = importManager.addImport(importString); -// if (!wasAdded) { -// return; -// } + importManager.addImport(importString); } catch (Exception e) { - log.info("Could not determine simple name of import " + importString); + log.error("Could not determine simple name of import " + importString); } - imports.add(importString); } public void addImport(Class<?> importString) { @@ -350,7 +342,7 @@ "property" + capitalizedName); addSimpleField(JavaElementFactory.newField( Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, - String.class.getSimpleName(), + JAXXCompilerFinalizer.TYPE_STRING, constantId, false, "\"" + id + "\"") );

1 0