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

r1921 - trunk/jaxx-compiler/src/main/java/jaxx/compiler
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 20:04:03 +0200 (Tue, 18 May 2010) New Revision: 1921 Url: http://nuiton.org/repositories/revision/jaxx/1921 Log: - clean code - Evolution #626: generate generics on overriden object Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-18 17:59:37 UTC (rev 1920) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-18 18:04:03 UTC (rev 1921) @@ -147,18 +147,6 @@ return child; } -// public void setChild(CompiledObject child) { -// this.child = child; -// } -// -// public String getConstraints() { -// return constraints; -// } -// -// public void setConstraints(String constraints) { -// this.constraints = constraints; -// } - public String getChildJavaCode() { return childJavaCode; } @@ -167,14 +155,6 @@ this.childJavaCode = childJavaCode; } -// public String getDelegateCode() { -// return delegateCode; -// } -// -// public void setDelegateCode(String delegateCode) { -// this.delegateCode = delegateCode; -// } - public void addToAdditionCode(StringBuffer buffer, boolean isRootObject) { //TC-20091026 do not prefix if on root object String prefix; @@ -255,7 +235,7 @@ throw new NullPointerException(); } this.objectClass = objectClass; - this.childs = new ArrayList<ChildRef>(); + childs = new ArrayList<ChildRef>(); } public static boolean isValidID(String id) { @@ -397,16 +377,17 @@ String result = javaCode; if (isOverride()) { // handle cases where object is overridden to be a different class - result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; } return result; } public String getJavaCodeForProperty(String property) { - if (!override) { + if (!isOverride()) { return javaCode; } - String result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + String result = "((" + JAXXCompiler.getCanonicalName(this) + ") " + javaCode + ")"; +// String result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; String methodName = StringUtils.capitalize(property); try { @@ -501,8 +482,8 @@ */ public void appendInitializationCode(String code) { if (!code.isEmpty()) { - this.initializationCode.append(code); - this.initializationCode.append(JAXXCompiler.getLineSeparator()); + initializationCode.append(code); + initializationCode.append(JAXXCompiler.getLineSeparator()); } } @@ -515,8 +496,8 @@ */ public void appendAdditionCode(String code) { if (!code.isEmpty()) { - this.additionCode.append(code); - this.additionCode.append(JAXXCompiler.getLineSeparator()); + additionCode.append(code); + additionCode.append(JAXXCompiler.getLineSeparator()); } } @@ -594,7 +575,7 @@ compiler.registerEventHandler(handler); eventHandlers.add(handler); - if (getJavaCode().indexOf(".") != -1) { + if (getJavaCode().contains(".")) { // object lives in another JAXX file and consequently its initialization code won't be output compiler.appendInitializerCode(getInitializationCode(handler, compiler)); } @@ -714,12 +695,12 @@ public void finalizeCompiler(JAXXCompiler compiler) { - List<CompiledObject.ChildRef> refList = getChilds(); + List<ChildRef> refList = getChilds(); if (refList != null && !refList.isEmpty()) { // compute additionCode for all childs StringBuffer buffer = new StringBuffer(); for (ChildRef childRef : refList) { - childRef.addToAdditionCode(buffer, compiler.getRootObject() == this); + childRef.addToAdditionCode(buffer, equals(compiler.getRootObject())); } additionCode = buffer.append(additionCode); }

1 0

r1920 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 19:59:37 +0200 (Tue, 18 May 2010) New Revision: 1920 Url: http://nuiton.org/repositories/revision/jaxx/1920 Log: Anomalie #624: Interface methods are not loaded in ClassDescriptor Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2010-05-18 17:59:04 UTC (rev 1919) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2010-05-18 17:59:37 UTC (rev 1920) @@ -487,6 +487,10 @@ int modifiers = getModifiers(node); + if (isInterface) { + + modifiers = Modifier.PUBLIC; + } if (log.isDebugEnabled()) { log.debug("method [" + name + "] modifiers == " + Modifier.toString(modifiers)); }

1 0

r1919 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 19:59:04 +0200 (Tue, 18 May 2010) New Revision: 1919 Url: http://nuiton.org/repositories/revision/jaxx/1919 Log: remove very old comment code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-18 17:58:27 UTC (rev 1918) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-18 17:59:04 UTC (rev 1919) @@ -448,9 +448,6 @@ javaFile.addBodyCode(compiler.getBodyCode().toString()); -// javaFile.addMethod(REGISTER_DATA_BINDING_METHOD); -// javaFile.addMethod(GET_DATA_BINDING_METHOD); - if (hasDataBindings) { // create the $registerDefaultBindings method @@ -480,9 +477,6 @@ } javaFile.addMethod(createCompleteSetupMethod(compiler, javaFile)); -// javaFile.addMethod(createApplyDataBindingMethod(superclassIsJAXXObject, hasDataBindings)); -// javaFile.addMethod(createProcessDataBindingMethod(superclassIsJAXXObject, hasDataBindings)); -// javaFile.addMethod(createRemoveDataBindingMethod(superclassIsJAXXObject, hasDataBindings)); addEventHandlers(compiler, javaFile); } @@ -495,7 +489,6 @@ protected JavaMethod createRegisterDefaultBindingsMethod(JAXXCompiler compiler) { DataBinding[] bindings = compiler.getBindingHelper().getDataBindings(); StringBuilder initCode = new StringBuilder(); -// if (bindings.legth > 0) { String eol = JAXXCompiler.getLineSeparator(); JavaFileGenerator generator = new JavaFileGenerator(eol, true); @@ -597,10 +590,13 @@ protected void addEventHandlers(JAXXCompiler compiler, JavaFile javaFile) { for (Map.Entry<String, Map<ClassDescriptor, List<EventHandler>>> e1 : compiler.getEventHandlers().entrySet()) { + // outer loop is iterating over different objects (well, technically, different Java expressions) for (Map.Entry<ClassDescriptor, List<EventHandler>> e2 : e1.getValue().entrySet()) { + // iterate over different types of listeners for this particular object (MouseListener, ComponentListener, etc.) for (EventHandler handler : e2.getValue()) { + // iterate over individual event handlers of a single type String methodName = compiler.getEventHandlerMethodName(handler); MethodDescriptor listenerMethod = handler.getListenerMethod(); @@ -763,102 +759,33 @@ return result.toString(); } - // protected JavaMethod createApplyDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) { protected JavaMethod createApplyDataBindingMethod() { StringBuilder buffer = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); -// if (haveBinding) { -// if (superclassIsJAXXObject) buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// else { -// buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();").append(eol); buffer.append("}"); - -// } -// if (superclassIsJAXXObject) { -// -// if (haveBinding) { -// buffer.append(" else {").append(eol).append(" "); -// } -// buffer.append("super." + METHOD_NAME_APPLY_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol); -// -// if (haveBinding) { -// buffer.append(" return;").append(eol).append("}"); -// } -// -// } - -// if (haveBinding) { -// if (superclassIsJAXXObject) -// buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// else { -// buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } -// buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();").append(eol); -// buffer.append("}"); -// -// } -// if (superclassIsJAXXObject) { -// -// if (haveBinding) { -// buffer.append(" else {").append(eol).append(" "); -// } -// buffer.append("super." + METHOD_NAME_APPLY_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol); -// -// if (haveBinding) { -// buffer.append(" return;").append(eol).append("}"); -// } -// -// } buffer.append(eol).append(METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");"); return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_APPLY_DATA_BINDING, buffer.toString(), true, new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING)); } protected JavaMethod createRemoveDataBindingMethod() { -// protected JavaMethod createRemoveDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) { StringBuilder buffer = new StringBuilder(); String eol = JAXXCompiler.getLineSeparator(); buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();").append(eol); buffer.append("}"); - -// if (haveBinding) { -// -// if (superclassIsJAXXObject) { -// buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } else { -// buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } -// buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();").append(eol); -// buffer.append("}"); -// -// -// } -// if (superclassIsJAXXObject) { -// -// if (haveBinding) { -// buffer.append(" else {").append(eol).append(" "); -// } -// buffer.append("super." + METHOD_NAME_REMOVE_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol); -// -// if (haveBinding) { -// buffer.append("}"); -// } -// } return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_REMOVE_DATA_BINDING, buffer.toString(), true, new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING)); } protected JavaMethod createProcessDataBindingMethod() { -// protected JavaMethod createProcessDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) { StringBuffer code = new StringBuffer(); String eol = JAXXCompiler.getLineSeparator(); - //boolean superclassIsJAXXObject = ClassDescriptorHelper.getClassDescriptor(JAXXObject.class).isAssignableFrom(compiler.getRootObject().getObjectClass()); + // the force parameter forces the update to happen even if it is already in activeBindings. This // is used on superclass invocations b/c by the time the call gets to the superclass, it is already // marked active and would otherwise be skipped @@ -874,33 +801,6 @@ code.append("} finally {").append(eol); code.append(" " + FIELD_NAME_$ACTIVE_BINDINGS + ".remove(" + PARAMETER_NAME_$BINDING + ");").append(eol); code.append("}").append(eol); - -// if (haveBinding) { -// code.append(" if (!$force && " + FIELD_NAME_$ACTIVE_BINDINGS + ".contains(" + PARAMETER_NAME_$BINDING + ")) { "); -// code.append(eol); -// code.append(" return;").append(eol); -// code.append("}").append(eol); -// code.append(FIELD_NAME_$ACTIVE_BINDINGS + ".add(" + PARAMETER_NAME_$BINDING + ");").append(eol); -// code.append("try {").append(eol); -// if (superclassIsJAXXObject) { -// code.append(" if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } else { -// code.append(" if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol); -// } -// code.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_PROCESS_DATA_BINDING + "();").append(eol); -// code.append(" }"); -// if (superclassIsJAXXObject) { -// code.append(" else {").append(eol); -// code.append(" super." + METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ", true);").append(eol); -// code.append(" }"); -// } -// code.append(eol); -// code.append("} finally {").append(eol); -// code.append(" " + FIELD_NAME_$ACTIVE_BINDINGS + ".remove(" + PARAMETER_NAME_$BINDING + ");").append(eol); -// code.append("}").append(eol); -// } else if (superclassIsJAXXObject) { -// code.append("super." + METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ", true);").append(eol); -// } return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_PROCESS_DATA_BINDING, code.toString(), true, new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING), new JavaArgument(TYPE_BOOLEAN, "$force")); }

1 0

r1918 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 19:58:27 +0200 (Tue, 18 May 2010) New Revision: 1918 Url: http://nuiton.org/repositories/revision/jaxx/1918 Log: improve logs (and prepare form mojo showClassLoading flga) Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java 2010-05-18 12:41:06 UTC (rev 1917) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java 2010-05-18 17:58:27 UTC (rev 1918) @@ -62,6 +62,8 @@ /** Logger */ private static final Log log = LogFactory.getLog(ClassDescriptorHelper.class); + private static boolean SHOW_LOADING = log.isDebugEnabled(); + private static Map<String, ClassDescriptor> descriptors = new HashMap<String, ClassDescriptor>(); @@ -97,6 +99,16 @@ } } + public static URL getURL(ClassLoader classLoader, String className, String clasifier) { + String relativePath = className.replaceAll("\\.", "/"); + String path = relativePath + "." + clasifier; + if (log.isDebugEnabled()) { + log.debug("Path to search : " + path); + } + URL url = classLoader.getResource(path); + return url; + } + public static ClassDescriptor getClassDescriptor( String className, ClassLoader classLoader) throws ClassNotFoundException { @@ -107,12 +119,19 @@ ClassDescriptor result = descriptors.get(className); if (result != null) { + + // found in cache + if (log.isTraceEnabled()) { + log.trace("resolved " + result + " from cache."); + } return result; } JAXXEngine engine = JAXXFactory.isEngineRegistred() ? JAXXFactory.getEngine() : null; + String relativePathPattern = ".*";// + className + ".*"; // used to ensure that the located resource has the right character cases + if (engine != null) { JAXXCompilerFile file = engine.getJAXXCompilerFile(className); @@ -121,6 +140,9 @@ // use the symbole table of this jaxx file on computation + if (SHOW_LOADING) { + log.info("from JAXXFile " + file.getJaxxFile()); + } result = getClassDescriptor0( ClassDescriptorResolverFromJaxxFile.class, className, @@ -128,6 +150,10 @@ classLoader ); + if (log.isDebugEnabled()) { + log.debug("[" + className + "] loaded"); + } + return result; } } @@ -135,12 +161,9 @@ // the class is not in this compile set, try to have it from java // sources or classes. - String relativePath = className.replaceAll("\\.", "/"); - String relativePathPattern = ".*";// + className + ".*"; // used to ensure that the located resource has the right character cases - // find the most recently updated source for the class -- Java source, JAXX source, or compiled class file long javaLastModified = -1; - URL javaFile = classLoader.getResource(relativePath + ".java"); + URL javaFile = getURL(classLoader, className, "java"); if (javaFile != null && javaFile.toString().startsWith("file:") && javaFile.toString().matches(relativePathPattern)) { @@ -151,7 +174,7 @@ } long classLastModified = -1; - URL classFile = classLoader.getResource(relativePath + ".class"); + URL classFile = getURL(classLoader, className, "class"); if (classFile != null && classFile.toString().startsWith("file:") && classFile.toString().matches(relativePathPattern)) { @@ -166,6 +189,10 @@ // java file exist and it is the last modified file, so use it + if (SHOW_LOADING) { + log.info("from JavaFile " + javaFile); + } + result = getClassDescriptor0( ClassDescriptorResolverFromJavaFile.class, className, @@ -173,11 +200,18 @@ classLoader ); + if (log.isDebugEnabled()) { + log.debug("[" + className + "] loaded"); + } return result; } // use the class ... + if (SHOW_LOADING) { + log.info("from class " + className); + } + result = getClassDescriptor0( ClassDescriptorResolverFromJavaClass.class, className, @@ -185,11 +219,14 @@ classLoader ); + if (log.isDebugEnabled()) { + log.debug("[" + className + "] loaded"); + } + if (result != null) { return result; } - // can NOT come here, means could not find result... throw new IllegalStateException(

1 0

r1917 - trunk/jaxx-demo/src/main/java/jaxx/demo
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 14:41:06 +0200 (Tue, 18 May 2010) New Revision: 1917 Url: http://nuiton.org/repositories/revision/jaxx/1917 Log: show log when error before going in ErrorDialogUI Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-05-18 05:49:08 UTC (rev 1916) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-05-18 12:41:06 UTC (rev 1917) @@ -143,8 +143,8 @@ handler.displayUI(ui, config.getDemoPath()); } catch (Exception e) { + log.error(e.getMessage(), e); ErrorDialogUI.showError(e); - log.error(e.getMessage(), e); System.exit(1); } }

1 0

r1916 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 07:49:08 +0200 (Tue, 18 May 2010) New Revision: 1916 Url: http://nuiton.org/repositories/revision/jaxx/1916 Log: Anomalie #622: Register bindings when all components are initialized Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-18 05:45:39 UTC (rev 1915) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-18 05:49:08 UTC (rev 1916) @@ -662,12 +662,12 @@ code.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " || !" + FIELD_NAME_CONTEXT_INITIALIZED + ") {").append(eol); code.append(" return;").append(eol); code.append("}").append(eol); - // register bindings before anything else - if (nbBindings > 0) { - // ajout invocation a la methode d'enregistrement des bindings - code.append("// registers ").append(nbBindings).append(" data bindings").append(eol); - code.append(METHOD_NAME_$REGISTER_DEFAULT_BINDINGS + "();").append(eol); - } +// // register bindings before anything else +// if (nbBindings > 0) { +// // ajout invocation a la methode d'enregistrement des bindings +// code.append("// registers ").append(nbBindings).append(" data bindings").append(eol); +// code.append(METHOD_NAME_$REGISTER_DEFAULT_BINDINGS + "();").append(eol); +// } // String dataBindingsCode = createRegisterDefaultBindingsMethod(compiler); // if (dataBindingsCode != null && !dataBindingsCode.isEmpty()) { // code.append(dataBindingsCode).append(eol); @@ -691,6 +691,12 @@ if (compiler.getInitializer().length() > 0) { code.append(compiler.getInitializer()); } + // register bindings before anything else + if (nbBindings > 0) { + // ajout invocation a la methode d'enregistrement des bindings + code.append("// registers ").append(nbBindings).append(" data bindings").append(eol); + code.append(METHOD_NAME_$REGISTER_DEFAULT_BINDINGS + "();").append(eol); + } code.append(METHOD_NAME_$COMPLETE_SETUP + "();").append(eol); return newMethod(PRIVATE, TYPE_VOID, METHOD_NAME_$INITIALIZE, code.toString(), false); }

1 0

r1915 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/script
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 07:45:39 +0200 (Tue, 18 May 2010) New Revision: 1915 Url: http://nuiton.org/repositories/revision/jaxx/1915 Log: change log level 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 2010-05-18 05:45:17 UTC (rev 1914) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 05:45:39 UTC (rev 1915) @@ -326,8 +326,8 @@ name = name.substring(0, name.length() - 1).trim(); } String className = declarationTokens[declarationTokens.length - 2]; - if (log.isInfoEnabled()) { - log.info("Found type : "+className +": ()"+ Arrays.toString(declarationTokens)); + if (log.isDebugEnabled()) { + log.debug("Found type : " + className +" : "+ Arrays.toString(declarationTokens)); } String type = TagManager.resolveClassName(className, compiler); if (type == null) {

1 0

r1914 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 07:45:17 +0200 (Tue, 18 May 2010) New Revision: 1914 Url: http://nuiton.org/repositories/revision/jaxx/1914 Log: improve error when type is not found Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java 2010-05-18 03:48:55 UTC (rev 1913) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java 2010-05-18 05:45:17 UTC (rev 1914) @@ -44,7 +44,9 @@ try { return ClassDescriptorHelper.getClassDescriptor(type, getClassLoader()); } catch (ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("Type not found for field " + this, e); + } catch (Exception e) { + throw new RuntimeException("Type not found for field " + this, e); } }

1 0

r1913 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/script
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 05:48:55 +0200 (Tue, 18 May 2010) New Revision: 1913 Url: http://nuiton.org/repositories/revision/jaxx/1913 Log: fix log 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 2010-05-18 03:48:28 UTC (rev 1912) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 03:48:55 UTC (rev 1913) @@ -299,7 +299,7 @@ // generic declaration detected if (log.isDebugEnabled()) { - log.info("Found a declaration with generics : " + declaration); + log.debug("Found a declaration with generics : " + declaration); } int last = declaration.lastIndexOf('>'); @@ -313,7 +313,7 @@ } if (log.isDebugEnabled()) { - log.info("==> declaration without generics : " + newDeclaration); + log.debug("==> declaration without generics : " + newDeclaration); } declaration = newDeclaration; }

1 0

r1912 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/script
by tchemit＠users.nuiton.org 18 May '10

18 May '10

Author: tchemit Date: 2010-05-18 05:48:28 +0200 (Tue, 18 May 2010) New Revision: 1912 Url: http://nuiton.org/repositories/revision/jaxx/1912 Log: Anomalie #620: Improve error when fail to load a script Anomalie #621: Make script parse correctly field declaration with generics 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 2010-05-17 10:31:06 UTC (rev 1911) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 03:48:28 UTC (rev 1912) @@ -32,6 +32,8 @@ import jaxx.compiler.reflect.FieldDescriptor; import jaxx.compiler.reflect.MethodDescriptor; import jaxx.compiler.tags.TagManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.StringReader; import java.lang.reflect.Modifier; @@ -213,9 +215,14 @@ compiler.appendBodyCode(modifiers + " " + node.getText().substring(0, node.getText().length() - 1) + code + "}"); } + + /** Logger */ + static private final Log log = LogFactory.getLog(ScriptManager.class); + private void scanScriptNode(SimpleNode node) throws CompilerException { int nodeType = getLineType(node); - if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { // have to handle imports early so the preprocessing takes them into account + if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { + // have to handle imports early so the preprocessing takes them into account String text = node.getChild(0).getText().trim(); if (text.startsWith("import")) { text = text.substring("import".length()).trim(); @@ -287,6 +294,30 @@ declaration = declaration.substring(0, equals); } declaration = declaration.trim(); + if (declaration.contains("<")) { + + // generic declaration detected + + if (log.isDebugEnabled()) { + log.info("Found a declaration with generics : " + declaration); + } + + int last = declaration.lastIndexOf('>'); + + // copy everything before first '<' + String newDeclaration = declaration.substring(0, declaration.indexOf('<')); + if (last < declaration.length()) { + + // copy everithing after last '>' + newDeclaration += declaration.substring(last + 1); + } + + if (log.isDebugEnabled()) { + log.info("==> declaration without generics : " + newDeclaration); + } + declaration = newDeclaration; + } + String[] declarationTokens = declaration.split("\\s"); boolean isFinal = Arrays.asList(declarationTokens).contains("final"); boolean isStatic = Arrays.asList(declarationTokens).contains("static"); @@ -295,10 +326,19 @@ name = name.substring(0, name.length() - 1).trim(); } String className = declarationTokens[declarationTokens.length - 2]; + if (log.isInfoEnabled()) { + log.info("Found type : "+className +": ()"+ Arrays.toString(declarationTokens)); + } String type = TagManager.resolveClassName(className, compiler); + if (type == null) { + + throw new CompilerException("Could not find type of " + className+" for expression " + text); + } compiler.addScriptField(new FieldDescriptor(name, Modifier.PUBLIC, type, compiler.getClassLoader())); // TODO: determine the actual modifiers - if (equals != -1 && !isFinal && !isStatic) { // declare the field in the class body, but wait to actually initialize it + if (equals != -1 && !isFinal && !isStatic) { + + // declare the field in the class body, but wait to actually initialize it compiler.appendBodyCode(text.substring(0, equals).trim() + ";"); String initializer = text.substring(equals + 1).trim(); if (type.endsWith("[]")) {

1 0