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

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

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

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 13:16:34 +0100 (Wed, 02 Feb 2011) New Revision: 2197 Url: http://nuiton.org/repositories/revision/jaxx/2197 Log: remove JAXXUtil.assignment code on scripts it does nothing good...+ clean code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 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-02 12:15:37 UTC (rev 2196) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2011-02-02 12:16:34 UTC (rev 2197) @@ -27,7 +27,6 @@ import jaxx.compiler.CompilerException; import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.AbstractFinalizer; import jaxx.compiler.java.parser.JavaParser; import jaxx.compiler.java.parser.JavaParserTreeConstants; import jaxx.compiler.java.parser.SimpleNode; @@ -37,7 +36,6 @@ import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; import java.io.StringReader; import java.lang.reflect.Modifier; @@ -136,28 +134,31 @@ id == JavaParserTreeConstants.JJTCLASSORINTERFACETYPE) { scanCompoundSymbol(node.getText()); } - if (!staticContext) { - String lhs = null; - if (id == JavaParserTreeConstants.JJTASSIGNMENTEXPRESSION || - id == JavaParserTreeConstants.JJTPOSTFIXEXPRESSION && node.jjtGetNumChildren() == 2) { - lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); - } else if (id == JavaParserTreeConstants.JJTPREINCREMENTEXPRESSION || - id == JavaParserTreeConstants.JJTPREDECREMENTEXPRESSION) { - lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); - } - if (lhs != null) { - FieldDescriptor[] fields = compiler.getScriptFields(); - for (FieldDescriptor field : fields) { - if (field.getName().equals(lhs)) { - //lhs.substring(lhs.lastIndexOf(".") + 1); - compiler.addImport(JAXXUtil.class); - node.firstToken.image = "JAXXUtil.assignment(" + node.firstToken.image; - String outputClassName = compiler.getOutputClassName(); - node.lastToken.image = node.lastToken.image + ", \"" + lhs + "\", " + outputClassName + ".this)"; - } - } - } - } + //tchemit 2011-02-02 I never understand this code + //Doing at each assignment a ifre with a called "dummy value" is a none sense + // Since JAXX can handle pretty well with javaBeans I remove this code +// if (!staticContext) { +// String lhs = null; +// if (id == JavaParserTreeConstants.JJTASSIGNMENTEXPRESSION || +// id == JavaParserTreeConstants.JJTPOSTFIXEXPRESSION && node.jjtGetNumChildren() == 2) { +// lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); +// } else if (id == JavaParserTreeConstants.JJTPREINCREMENTEXPRESSION || +// id == JavaParserTreeConstants.JJTPREDECREMENTEXPRESSION) { +// lhs = ((SimpleNode) node.jjtGetChild(0)).getText().trim(); +// } +// if (lhs != null) { +// FieldDescriptor[] fields = compiler.getScriptFields(); +// for (FieldDescriptor field : fields) { +// if (field.getName().equals(lhs)) { +// //lhs.substring(lhs.lastIndexOf(".") + 1); +// String prefix = compiler.getImportManager().getType(JAXXUtil.class); +// node.firstToken.image = prefix + ".assignment(" + node.firstToken.image; +// String outputClassName = compiler.getImportManager().getType(compiler.getOutputClassName()); +// node.lastToken.image = node.lastToken.image + ", \"" + lhs + "\", " + outputClassName + ".this)"; +// } +// } +// } +// } } /** @@ -347,13 +348,11 @@ "Could not find type of " + className + " for expression " + text); } -// className = className.trim(); -// if (!AbstractFinalizer.TYPE_STRING.equals(className) && -// !GeneratorUtil.isPrimitiveType(className)) { -// log.info("[" + compiler.getJavaFile().getName() + "] : Import " + type + " from a script..."); -// compiler.getJavaFile().addImport(type); -// } - compiler.addScriptField(new FieldDescriptor(name, Modifier.PUBLIC, type, compiler.getClassLoader())); + compiler.addScriptField(new FieldDescriptor(name, + Modifier.PUBLIC, + type, + compiler.getClassLoader()) + ); // TODO: determine the actual modifiers if (equals != -1 && !isFinal && !isStatic) { @@ -368,7 +367,8 @@ @Override public void run() { - compiler.registerCompiledObject(new ScriptInitializer(finalInitializer, compiler)); + compiler.registerCompiledObject(new ScriptInitializer( + finalInitializer, compiler)); } }); } else {

1 0

r2196 - 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 13:15:37 +0100 (Wed, 02 Feb 2011) New Revision: 2196 Url: http://nuiton.org/repositories/revision/jaxx/2196 Log: reformat 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-02 12:15:10 UTC (rev 2195) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-02-02 12:15:37 UTC (rev 2196) @@ -82,7 +82,8 @@ public static final String Y_ATTRIBUTE = "y"; /** Logger */ - protected static final Log log = LogFactory.getLog(DefaultComponentHandler.class); + protected static final Log log = + LogFactory.getLog(DefaultComponentHandler.class); public static final String BORDER_FACTORY_PREFIX = BorderFactory.class.getSimpleName() + ".";

1 0

r2195 - 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 13:15:10 +0100 (Wed, 02 Feb 2011) New Revision: 2195 Url: http://nuiton.org/repositories/revision/jaxx/2195 Log: improve code + do not add a ; on event scripts if a it ends by a } 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:14:24 UTC (rev 2194) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-02-02 12:15:10 UTC (rev 2195) @@ -642,8 +642,9 @@ } continue; } + CompiledObject rootObject = compiler.getRootObject(); if (name.equals(IMPLEMENTS_ATTRIBUTE)) { - if (object != compiler.getRootObject()) { + if (object != rootObject) { // can ony be apply to root object compiler.reportError("'" + IMPLEMENTS_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag); return; @@ -656,7 +657,7 @@ } if (name.equals(ABSTRACT_ATTRIBUTE)) { - if (object != compiler.getRootObject()) { + if (object != rootObject) { // can ony be apply to root object compiler.reportError("'" + ABSTRACT_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag); return; @@ -667,7 +668,7 @@ if (name.equals(GENERICTYPE_ATTRIBUTE)) { //TC-20090313 check after all atributes been processed - if (object == compiler.getRootObject()) { + if (object == rootObject) { compiler.setGenericType(value); } else { object.setGenericTypes(value.split(",")); @@ -676,7 +677,7 @@ } if (name.equals(SUPER_GENERIC_TYPE_ATTRIBUTE)) { - if (object != compiler.getRootObject()) { + if (object != rootObject) { // can ony be apply to root object compiler.reportError("'" + SUPER_GENERIC_TYPE_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag); return; @@ -696,7 +697,7 @@ if (isEventHandlerName(name)) { // event handler - if (!value.endsWith(";")) { + if (!value.endsWith(";") && !value.endsWith("}")) { value += ";"; } addEventHandler(object,

1 0

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

Feb. 2, 2011

Author: tchemit Date: 2011-02-02 13:14:24 +0100 (Wed, 02 Feb 2011) New Revision: 2194 Url: http://nuiton.org/repositories/revision/jaxx/2194 Log: clean code + use simple type from importManager Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2011-02-02 12:13:48 UTC (rev 2193) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2011-02-02 12:14:24 UTC (rev 2194) @@ -752,8 +752,9 @@ } String beanClassName = beanInfo.getJAXXBeanDescriptor().getClassDescriptor().getName(); + String type = compiler.getImportManager().getType(beanClassName); // contextName must be in constructor to able to init validator with his correct contextName - String constructorParams = beanClassName + ".class, " + + String constructorParams = type + ".class, " + TypeManager.getJavaCode(contextName); // setConstructorParams(constructorParams); String prefix = compiler.getImportManager().getType(SwingValidatorUtil.class); @@ -762,7 +763,7 @@ ); // add generic type to validator - setGenericTypes(new String[]{beanClassName}); + setGenericTypes(beanClassName); if (getAutoField()) { registerAutoFieldBean(tag, compiler, beanInfo);

1 0