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

r1090 - in lutinjaxx/trunk/maven-jaxx-plugin: . src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Dec. 23, 2008

Dec. 23, 2008

Author: tchemit Date: 2008-12-23 10:31:56 +0000 (Tue, 23 Dec 2008) New Revision: 1090 Modified: lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java Log: add addProjectClassPath property to add project compile class-path in plugin class-path Modified: lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt 2008-12-18 10:05:15 UTC (rev 1089) +++ lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt 2008-12-23 10:31:56 UTC (rev 1090) @@ -1,4 +1,5 @@ 0.8 chemit 200812?? + * 20081219 [chemit] - add addProjectClassPath property to add project compile class-path in plugin class-path * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path 0.7 chemit 20081210 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-18 10:05:15 UTC (rev 1089) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-23 10:31:56 UTC (rev 1090) @@ -24,6 +24,7 @@ import jaxx.runtime.JAXXContext; import jaxx.tags.TagManager; import jaxx.tags.swing.SwingInitializer; +import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -76,6 +77,15 @@ protected boolean addSourcesToClassPath; /** + * flag to include in compiler classpath the project compile classpath. + * <p/> + * By default, false. + * + * @parameter expression="${jaxx.addProjectClassPath}" default-value="false" + */ + protected boolean addProjectClassPath; + + /** * chemin du repertoire de generation des resources. * * @parameter expression="${jaxx.outResource}" default-value="${basedir}/target/generated-sources/resources" @@ -253,7 +263,7 @@ fixCompileSourceRoots(); - if (addSourcesToClassPath) { + if (addSourcesToClassPath || addProjectClassPath) { cl = initClassLoader(project, getLog()); Thread.currentThread().setContextClassLoader(cl); } @@ -323,7 +333,7 @@ result.setJaxxContextImplementorClass(jaxxContextImplementorClass); result.setExtraImports(extraImports); result.setDefaultErrorUI(defaultErrorUIClass); - if (cl!=null) { + if (cl != null) { result.setClassLoader(cl); } @@ -395,7 +405,7 @@ URLClassLoader result; try { - + List<URL> lUrls = new ArrayList<URL>(); List<String> sources = project.getCompileSourceRoots(); @@ -404,14 +414,28 @@ lUrls.add(new File(source).toURI().toURL()); } } - lUrls.add(outClass.toURI().toURL()); + if (addProjectClassPath) { + getLog().info("use project compile scope class-path"); + // add also all dependency of the project in compile scope + for (Object o : project.getCompileClasspathElements()) { + String url = (String) o; + File f = new File(url); + if (!f.exists()) { + continue; + } + lUrls.add(f.toURI().toURL()); + } + } + result = new URLClassLoader(lUrls.toArray(new URL[lUrls.size()]), getClass().getClassLoader()); } catch (MalformedURLException eee) { throw new RuntimeException("Can't create ClassLoader for script, bad directory: " + outClass + " for reason " + eee.getMessage(), eee); } catch (IOException e) { throw new RuntimeException("Can't create ClassLoader for script, bad directory: " + outClass + " for reason " + e.getMessage(), e); + } catch (DependencyResolutionRequiredException e) { + throw new RuntimeException(e); } loader = result; }

1 0

r1089 - in lutinjaxx/trunk/jaxx-core/src: main/java/jaxx/compiler test/java/jaxx/junit
by tchemit＠users.labs.libre-entreprise.org Dec. 18, 2008

Dec. 18, 2008

Author: tchemit Date: 2008-12-18 10:05:15 +0000 (Thu, 18 Dec 2008) New Revision: 1089 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java Log: improve generation of methods (for the moment does not rename methods from css, to be done...) Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:41:18 UTC (rev 1088) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 10:05:15 UTC (rev 1089) @@ -289,10 +289,11 @@ }, otherPublic(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + - "/*-- other public methods ---------------------------------------------------------*/\n" + + "/*-- public mutator methods -------------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") { - public boolean accept(JavaMethod method) { - return (method.name.startsWith("set")); + @Override + public boolean accept(int mod) { + return super.accept(mod) && !Modifier.isStatic(mod); } }, @@ -330,14 +331,6 @@ privates(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + "/*-- Private methods --------------------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") { - }, - others(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + - "/*-- Other methods ----------------------------------------------------------------*/\n" + - "/*---------------------------------------------------------------------------------*/") { - @Override - public boolean accept(int mod) { - return true; - } }; private final String header; Modified: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java 2008-12-18 09:41:18 UTC (rev 1088) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java 2008-12-18 10:05:15 UTC (rev 1089) @@ -24,7 +24,7 @@ constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PUBLIC); - Assert.assertEquals(7, constants.size()); + Assert.assertEquals(8, constants.size()); Assert.assertTrue(constants.contains(MethodOrder.constructors)); Assert.assertTrue(constants.contains(MethodOrder.JAXXObject)); Assert.assertTrue(constants.contains(MethodOrder.JAXXContext)); @@ -32,6 +32,7 @@ Assert.assertTrue(constants.contains(MethodOrder.events)); Assert.assertTrue(constants.contains(MethodOrder.publicGetters)); Assert.assertTrue(constants.contains(MethodOrder.publicSetters)); + Assert.assertTrue(constants.contains(MethodOrder.otherPublic)); constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PROTECTED); @@ -40,11 +41,12 @@ Assert.assertTrue(constants.contains(MethodOrder.protecteds)); Assert.assertTrue(constants.contains(MethodOrder.createMethod)); + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PRIVATE); Assert.assertEquals(3, constants.size()); Assert.assertTrue(constants.contains(MethodOrder.createMethod)); Assert.assertTrue(constants.contains(MethodOrder.packageLocal)); - Assert.assertTrue(constants.contains(MethodOrder.privates)); + Assert.assertTrue(constants.contains(MethodOrder.privates)); } }

1 0

r1088 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Dec. 18, 2008

Dec. 18, 2008

Author: tchemit Date: 2008-12-18 09:41:18 +0000 (Thu, 18 Dec 2008) New Revision: 1088 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java Log: improve generation of methods (for the moment does not rename methods from css, to be done...) Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:39:01 UTC (rev 1087) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:41:18 UTC (rev 1088) @@ -288,6 +288,14 @@ } }, + otherPublic(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- other public methods ---------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return (method.name.startsWith("set")); + } + }, + protectedGetters(Modifier.PROTECTED, "/*---------------------------------------------------------------------------------*/\n" + "/*-- protected acessors methods ---------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") {

1 0

r1087 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Dec. 18, 2008

Dec. 18, 2008

Author: tchemit Date: 2008-12-18 09:39:01 +0000 (Thu, 18 Dec 2008) New Revision: 1087 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java Log: improve generation of methods (for the moment does not rename methods from css, to be done...) Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:17:52 UTC (rev 1086) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:39:01 UTC (rev 1087) @@ -322,6 +322,14 @@ privates(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + "/*-- Private methods --------------------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") { + }, + others(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Other methods ----------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + @Override + public boolean accept(int mod) { + return true; + } }; private final String header;

1 0

r1086 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/compiler src/test/java/jaxx/junit
by tchemit＠users.labs.libre-entreprise.org Dec. 18, 2008

Dec. 18, 2008

Author: tchemit Date: 2008-12-18 09:17:52 +0000 (Thu, 18 Dec 2008) New Revision: 1086 Added: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java Modified: lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaFile.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java Log: improve generation of methods Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-15 01:29:43 UTC (rev 1085) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-18 09:17:52 UTC (rev 1086) @@ -1,4 +1,5 @@ 0.8 ??? 2009???? + * 20081218 [chemit] - improve generation of methods * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaFile.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaFile.java 2008-12-15 01:29:43 UTC (rev 1085) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaFile.java 2008-12-18 09:17:52 UTC (rev 1086) @@ -4,10 +4,14 @@ */ package jaxx.compiler; +import jaxx.compiler.JavaMethod.MethodOrder; + import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; +import java.util.EnumMap; import java.util.List; +import java.util.Map.Entry; /** * A Java source file being generated for output. Once the class is completely initialized, use the @@ -185,42 +189,53 @@ public String getClassBody() { StringBuffer result = new StringBuffer(); + String lineSeparator = JAXXCompiler.getLineSeparator(); if (fields.size() > 0) { java.util.Collections.sort(fields); // sort fields for (JavaField field : fields) { result.append(addIndentation(field.toString(), 4)); - result.append(JAXXCompiler.getLineSeparator()); + result.append(lineSeparator); } - result.append(JAXXCompiler.getLineSeparator()); + result.append(lineSeparator); } if (rawBodyCode.length() > 0) { result.append(addIndentation("/* begin raw body code */\n", 4)); String s = rawBodyCode.toString(); - if (!s.startsWith("\n")) { - result.append('\n'); + if (!s.startsWith(lineSeparator)) { + result.append(lineSeparator); } result.append(addIndentation(s, 4)); - result.append('\n'); + result.append(lineSeparator); result.append(addIndentation("/* end raw body code */", 4)); - result.append("\n"); + result.append(lineSeparator); } for (JavaFile innerClass : innerClasses) { result.append(addIndentation(innerClass.toString(), 4)); - result.append(JAXXCompiler.getLineSeparator()); - result.append(JAXXCompiler.getLineSeparator()); + result.append(lineSeparator).append(lineSeparator); } - java.util.Collections.sort(methods); // sort methods - for (JavaMethod method : methods) { - result.append(addIndentation(method.toString(), 4)); - result.append(JAXXCompiler.getLineSeparator()); - result.append(JAXXCompiler.getLineSeparator()); + /* + java.util.Collections.sort(methods); // sort methods + + for (JavaMethod method : methods) { + result.append(addIndentation(method.toString(), 4)); + result.append(lineSeparator); + result.append(lineSeparator); } + */ + EnumMap<MethodOrder, List<JavaMethod>> map = JavaMethod.getSortedMethods(methods); + for (Entry<MethodOrder, List<JavaMethod>> entry : map.entrySet()) { + List<JavaMethod> list = entry.getValue(); + entry.getKey().generate(result, list, lineSeparator); + list.clear(); + } + map.clear(); + return result.toString(); } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-15 01:29:43 UTC (rev 1085) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:17:52 UTC (rev 1086) @@ -5,7 +5,13 @@ package jaxx.compiler; import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; /** * Represents a method in a Java source file being generated for output. <code>JavaMethods</code> are created @@ -214,11 +220,210 @@ return COMPARATOR.compare(this, o); } + public enum MethodOrder { + + statics(Modifier.STATIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Statics methods --------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + }, + + constructors(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Constructors -----------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return method.returnType == null; + } + }, + + JAXXObject(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- JAXXObject implementation ----------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + private List<String> methods = Arrays.asList("applyDataBinding", "firePropertyChange", "getObjectById", "get$objectMap", "processDataBinding", "removeDataBinding"); + + public boolean accept(JavaMethod method) { + return methods.contains(method.name); + } + }, + + JAXXContext(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- JAXXContext implementation ---------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + private List<String> methods = Arrays.asList("getContextValue", "getDelegateContext", "getParentContainer", "removeContextValue", "setContextValue"); + public boolean accept(JavaMethod method) { + return methods.contains(method.name); + } + }, + + JAXXValidation(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- JAXXValidation implementation ------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + private List<String> methods = Arrays.asList("getValidator", "getValidatorIds"); + + public boolean accept(JavaMethod method) { + return methods.contains(method.name); + } + }, + + events(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Event methods ----------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return (method.name.startsWith("do") && method.name.indexOf("__") > -1); + } + }, + + publicGetters(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- public acessor methods -------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return (method.name.startsWith("get") || method.name.startsWith("is")); + } + }, + + publicSetters(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- public mutator methods -------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return (method.name.startsWith("set")); + } + }, + + protectedGetters(Modifier.PROTECTED, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- protected acessors methods ---------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return (method.name.startsWith("get") || method.name.startsWith("is")); + } + }, + + createMethod(Modifier.PROTECTED | Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- ui creation methods ----------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + public boolean accept(JavaMethod method) { + return method.name.startsWith("create") || method.name.startsWith("add") || + method.name.equals("$completeSetup") || + method.name.equals("$initialize"); + } + }, + + protecteds(Modifier.PROTECTED, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Other protected methods ------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + }, + + packageLocal(0, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Package methods --------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + @Override + public boolean accept(int mod) { + return !Modifier.isStatic(mod) && !Modifier.isPublic(mod) && !Modifier.isProtected(mod); + }}, + + privates(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + + "/*-- Private methods --------------------------------------------------------------*/\n" + + "/*---------------------------------------------------------------------------------*/") { + }; + + private final String header; + + private int modifier; + + MethodOrder(int modifier, String header) { + this.header = header; + this.modifier = modifier; + } + + public String getHeader() { + return header; + } + + public boolean accept(JavaMethod method) { + return true; + } + + public boolean accept(int mod) { + return (mod & modifier) != 0; + } + + public boolean accept(int mod, JavaMethod method) { + return accept(mod) && accept(method); + } + + public static MethodOrder valueOf(JavaMethod method, int scope) { + for (MethodOrder o : values()) { + if (o.accept(scope, method)) { + return o; + } + } + throw new IllegalArgumentException("could not find a " + MethodOrder.class + " for method " + method); + } + + public void generate(StringBuffer buffer, List<JavaMethod> methods, String lineSeparator) { + if (methods.isEmpty()) { + return; + } + buffer.append(JavaFile.addIndentation(header, 4)); + buffer.append(lineSeparator).append(lineSeparator); + for (JavaMethod method : methods) { + buffer.append(JavaFile.addIndentation(method.toString(), 4)); + buffer.append(lineSeparator).append(lineSeparator); + } + } + } + + public static EnumMap<MethodOrder, List<JavaMethod>> getSortedMethods(List<JavaMethod> methods) { + + EnumMap<MethodOrder, List<JavaMethod>> result = new EnumMap<MethodOrder, List<JavaMethod>>(MethodOrder.class); + for (MethodOrder methodOrder : MethodOrder.values()) { + result.put(methodOrder, new ArrayList<JavaMethod>()); + } + + EnumSet<MethodOrder> allConstants = EnumSet.allOf(MethodOrder.class); + List<JavaMethod> allMethods = new ArrayList<JavaMethod>(methods); + int[] scopes = new int[]{Modifier.STATIC, Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE}; + for (int scope : scopes) { + EnumSet<MethodOrder> constants = getMethodOrderScope(allConstants, scope); + + Iterator<JavaMethod> itMethods = allMethods.iterator(); + while (itMethods.hasNext()) { + JavaMethod method = itMethods.next(); + for (MethodOrder constant : constants) { + if (constant.accept(method.getModifiers(), method)) { + result.get(constant).add(method); + itMethods.remove(); + break; + } + } + } + constants.clear(); + } + + if (!allMethods.isEmpty()) { + throw new IllegalArgumentException("could not find a " + MethodOrder.class + " for method " + allMethods); + } + + for (MethodOrder methodOrder : MethodOrder.values()) { + // sort methods + java.util.Collections.sort(result.get(methodOrder)); + } + return result; + } + + public static EnumSet<MethodOrder> getMethodOrderScope(EnumSet<MethodOrder> allConstants, int scope) { + EnumSet<MethodOrder> constants = EnumSet.noneOf(MethodOrder.class); + for (MethodOrder order : allConstants) { + if (order.accept(scope)) { + constants.add(order); + } + } + return constants; + } + public static final Comparator<JavaMethod> COMPARATOR = new Comparator<JavaMethod>() { public int compare(JavaMethod o1, JavaMethod o2) { - int result; + /*int result; if ((result = compareStatic(o1, o2)) != 0) { return result; } @@ -227,7 +432,7 @@ } if ((result = compareVisibility(o1, o2)) != 0) { return result; - } + }*/ return o1.name.compareTo(o2.name); } Added: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java 2008-12-18 09:17:52 UTC (rev 1086) @@ -0,0 +1,50 @@ +package jaxx.junit; + +import jaxx.compiler.JavaMethod; +import jaxx.compiler.JavaMethod.MethodOrder; +import org.junit.Assert; +import org.junit.Test; + +import java.lang.reflect.Modifier; +import java.util.EnumSet; + +/** @author chemit */ +public class JavaMethodTest { + + @Test + public void testGetMethodOrderScope() { + EnumSet<MethodOrder> allConstants = EnumSet.allOf(MethodOrder.class); + + EnumSet<MethodOrder> constants; + + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.STATIC); + + Assert.assertEquals(1, constants.size()); + Assert.assertTrue(constants.contains(MethodOrder.statics)); + + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PUBLIC); + + Assert.assertEquals(7, constants.size()); + Assert.assertTrue(constants.contains(MethodOrder.constructors)); + Assert.assertTrue(constants.contains(MethodOrder.JAXXObject)); + Assert.assertTrue(constants.contains(MethodOrder.JAXXContext)); + Assert.assertTrue(constants.contains(MethodOrder.JAXXValidation)); + Assert.assertTrue(constants.contains(MethodOrder.events)); + Assert.assertTrue(constants.contains(MethodOrder.publicGetters)); + Assert.assertTrue(constants.contains(MethodOrder.publicSetters)); + + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PROTECTED); + + Assert.assertEquals(3, constants.size()); + Assert.assertTrue(constants.contains(MethodOrder.protectedGetters)); + Assert.assertTrue(constants.contains(MethodOrder.protecteds)); + Assert.assertTrue(constants.contains(MethodOrder.createMethod)); + + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PRIVATE); + Assert.assertEquals(3, constants.size()); + Assert.assertTrue(constants.contains(MethodOrder.createMethod)); + Assert.assertTrue(constants.contains(MethodOrder.packageLocal)); + Assert.assertTrue(constants.contains(MethodOrder.privates)); + + } +}

1 0

r1085 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 01:29:43 +0000 (Mon, 15 Dec 2008) New Revision: 1085 Modified: lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/ErrorTableRenderer.java Log: can now in validation, put error with args (all args must be separated by a ##) Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-15 00:20:39 UTC (rev 1084) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-15 01:29:43 UTC (rev 1085) @@ -1,5 +1,6 @@ 0.8 ??? 2009???? - * 20081214 [chemit] - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - add addSourcesToClassPath property to add sources directories in class-path - improve classloader managment Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/ErrorTableRenderer.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/ErrorTableRenderer.java 2008-12-15 00:20:39 UTC (rev 1084) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/ErrorTableRenderer.java 2008-12-15 01:29:43 UTC (rev 1085) @@ -9,6 +9,9 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; /** @author chemit */ public class ErrorTableRenderer extends DefaultTableCellRenderer { @@ -38,7 +41,18 @@ break; } } else if (value instanceof BeanValidatorError) { - text = _(((BeanValidatorError) value).getError()); + String error = ((BeanValidatorError) value).getError(); + if (error.indexOf("##") == -1) { + text = _(error); + } else { + StringTokenizer stk = new StringTokenizer(error,"##"); + String errorName = stk.nextToken(); + List<String> args = new ArrayList<String>(); + while (stk.hasMoreTokens()) { + args.add(stk.nextToken()); + } + text = _(errorName, args.toArray(new String[args.size()])); + } } else { // keep text rendered text = rendererComponent.getText();

1 0

r1084 - in lutinjaxx/trunk: jaxx-core jaxx-core/src/main/java/jaxx/compiler jaxx-core/src/main/java/jaxx/css maven-jaxx-plugin/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Dec. 15, 2008

Dec. 15, 2008

Author: tchemit Date: 2008-12-15 00:20:39 +0000 (Mon, 15 Dec 2008) New Revision: 1084 Modified: lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/css/Stylesheet.java lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java Log: - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - better classLoader in plugin (no need to repush in our ClassLoader url from parent classloader) Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-14 20:06:57 UTC (rev 1083) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-15 00:20:39 UTC (rev 1084) @@ -1,5 +1,6 @@ 0.8 ??? 2009???? - * 20081214 [chemit] - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + * 20081214 [chemit] - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - add addSourcesToClassPath property to add sources directories in class-path - improve classloader managment - keep in DataSource objetCode Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-12-14 20:06:57 UTC (rev 1083) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-12-15 00:20:39 UTC (rev 1084) @@ -525,7 +525,12 @@ public String getEventHandlerMethodName(EventHandler handler) { String result = eventHandlerMethodNames.get(handler); if (result == null) { - result = "$ev" + eventHandlerMethodNames.size(); + if (getOptions().isOptimize()) { + result = "$ev" + eventHandlerMethodNames.size(); + } + else { + result = "do" + capitalize(handler.getListenerMethod().getName()) + "__on__" + handler.getObjectCode(); + } eventHandlerMethodNames.put(handler, result); } return result; Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/css/Stylesheet.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/css/Stylesheet.java 2008-12-14 20:06:57 UTC (rev 1083) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/css/Stylesheet.java 2008-12-15 00:20:39 UTC (rev 1084) @@ -382,7 +382,7 @@ String valueCode; if (dataBinding != null) { valueCode = "new jaxx.runtime.css.DataBinding(" + TypeManager.getJavaCode(object.getId() + "." + property + "." + priority) + ")"; - new jaxx.compiler.DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(), + new DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(), property, "(" + JAXXCompiler.getCanonicalName(type) + ") " + dataBinding, compiler), compiler).compile(false); } else { try { Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-14 20:06:57 UTC (rev 1083) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-15 00:20:39 UTC (rev 1084) @@ -24,7 +24,6 @@ import jaxx.runtime.JAXXContext; import jaxx.tags.TagManager; import jaxx.tags.swing.SwingInitializer; -import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -43,7 +42,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Set; /** * Classe permettant de transformer des sources jaxx vers du source java. @@ -394,37 +392,22 @@ protected URLClassLoader initClassLoader(MavenProject project, Log log) { URLClassLoader loader = null; if (project != null) { - List plugins = project.getBuildPlugins(); - //((Plugin)project.getBuildPlugins().get(3)).getDependencies(); URLClassLoader result; try { - Set<Artifact> compileClasspathElements = project.getArtifacts(); - ClassLoader l = getClass().getClassLoader(); - int urlClSize = 1; - URL[] url; - if (addSourcesToClassPath) { - urlClSize+=2; - } - if (l instanceof URLClassLoader) { - urlClSize += (((URLClassLoader) l).getURLs().length); - } - url = new URL[urlClSize]; - url[0] = outClass.toURI().toURL(); + + List<URL> lUrls = new ArrayList<URL>(); + List<String> sources = project.getCompileSourceRoots(); - if (l instanceof URLClassLoader) { - URL[] urls = ((URLClassLoader) l).getURLs(); - System.arraycopy(urls, 0, url, 1, urls.length); - } if (addSourcesToClassPath) { - url[url.length - 2] = src.toURI().toURL(); - url[url.length - 1] = outJava.toURI().toURL(); + for (String source : sources) { + lUrls.add(new File(source).toURI().toURL()); + } } - if (compileClasspathElements.size() == 0) { - result = new URLClassLoader(url, l); - } else { - result = new URLClassLoader(url, l); - } + lUrls.add(outClass.toURI().toURL()); + + result = new URLClassLoader(lUrls.toArray(new URL[lUrls.size()]), getClass().getClassLoader()); + } catch (MalformedURLException eee) { throw new RuntimeException("Can't create ClassLoader for script, bad directory: " + outClass + " for reason " + eee.getMessage(), eee); } catch (IOException e) { @@ -432,7 +415,7 @@ } loader = result; } - if (loader != null) { + if (loader != null && isVerbose()) { for (URL entry : loader.getURLs()) { log.info("classpath : " + entry); }

1 0

r1083 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Dec. 14, 2008

Dec. 14, 2008

Author: tchemit Date: 2008-12-14 20:06:57 +0000 (Sun, 14 Dec 2008) New Revision: 1083 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java Log: always reselect objet since addElement change this property Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java 2008-12-14 19:31:48 UTC (rev 1082) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java 2008-12-14 20:06:57 UTC (rev 1083) @@ -101,9 +101,7 @@ } // attach the model model.addListDataListener(combo); - if (select != null) { - model.setSelectedItem(select); - } + model.setSelectedItem(select); } }

1 0

r1082 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Dec. 14, 2008

Dec. 14, 2008

Author: tchemit Date: 2008-12-14 19:31:48 +0000 (Sun, 14 Dec 2008) New Revision: 1082 Modified: lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java Log: add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-14 18:42:16 UTC (rev 1081) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-14 19:31:48 UTC (rev 1082) @@ -1,5 +1,6 @@ 0.8 ??? 2009???? - * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path + * 20081214 [chemit] - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path - improve classloader managment - keep in DataSource objetCode - fix bug when processDataBinding on a null objectCode Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java 2008-12-14 18:42:16 UTC (rev 1081) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/Utils.java 2008-12-14 19:31:48 UTC (rev 1082) @@ -4,11 +4,14 @@ */ package jaxx.runtime.swing; +import javax.swing.DefaultComboBoxModel; import javax.swing.ImageIcon; +import javax.swing.JComboBox; import javax.swing.SwingUtilities; import javax.swing.text.AbstractDocument; import javax.swing.text.JTextComponent; import java.lang.reflect.Field; +import java.util.Collection; public class Utils { private static Field numReaders; @@ -34,7 +37,7 @@ return; } - if (((Integer) numReaders.get(document)).intValue() > 0) { + if ((Integer) numReaders.get(document) > 0) { SwingUtilities.invokeLater(new Runnable() { public void run() { if (!c.getText().equals(text)) { @@ -78,4 +81,29 @@ return createImageIcon("i18n/" + name + ".png"); } + /** + * Fill a combo box model with some datas, and select after all the given object + * + * @param combo the combo to fill + * @param data data ot inject in combo + * @param select the object to select in combo after reflling his model + */ + public static void fillComboBox(JComboBox combo, Collection<?> data, Object select) { + if (!(combo.getModel() instanceof DefaultComboBoxModel)) { + throw new IllegalArgumentException("this method need a DefaultComboBoxModel for this model but was " + combo.getModel().getClass()); + } + DefaultComboBoxModel model = (DefaultComboBoxModel) combo.getModel(); + // evince the model + model.removeListDataListener(combo); + model.removeAllElements(); + for (Object o : data) { + model.addElement(o); + } + // attach the model + model.addListDataListener(combo); + if (select != null) { + model.setSelectedItem(select); + } + } + }

1 0

r1081 - in lutinjaxx/trunk: . jaxx-core jaxx-core/src/main/java/jaxx/compiler jaxx-core/src/main/java/jaxx/reflect jaxx-core/src/main/java/jaxx/runtime jaxx-core/src/main/java/jaxx/runtime/swing/navigation maven-jaxx-plugin maven-jaxx-plugin/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Dec. 14, 2008

Dec. 14, 2008

Author: tchemit Date: 2008-12-14 18:42:16 +0000 (Sun, 14 Dec 2008) New Revision: 1081 Modified: lutinjaxx/trunk/changelog.txt lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataBinding.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java Log: add addSourcesToClassPath property to add sources directories in class-path improve classloader managment keep in DataSource objetCode fix bug when processDataBinding on a null objectCode always clean node cached values when selected it add usefull databinding method in Util Modified: lutinjaxx/trunk/changelog.txt =================================================================== --- lutinjaxx/trunk/changelog.txt 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/changelog.txt 2008-12-14 18:42:16 UTC (rev 1081) @@ -1,3 +1,5 @@ -0.7 chemit 200812?? +0.8 chemit 200812?? + +0.7 chemit 20081210 * 20081210 [chemit] use lutinutil 1.0 and lutinproject 3.2 * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-14 18:42:16 UTC (rev 1081) @@ -1,4 +1,11 @@ 0.8 ??? 2009???? + * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util + * 20081213 [chemit] - improve navigation tree node rendering with some caches - introduce a ChildBuilder to simplify building of child nodes from a collection or array Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -31,6 +31,8 @@ /** default error ui */ private Class<?> defaultErrorUI; + + private ClassLoader classLoader; /** * Returns the target directory, generally specified with the "-d" option on the command line. @@ -239,4 +241,12 @@ public Class<?> getDefaultErrorUI() { return defaultErrorUI; } + + public ClassLoader getClassLoader() { + return classLoader; + } + + public void setClassLoader(ClassLoader classLoader) { + this.classLoader = classLoader; + } } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataBinding.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataBinding.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataBinding.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -76,7 +76,17 @@ } else { compiler.appendProcessDataBinding(" "); } - compiler.appendProcessDataBinding("if (" + TypeManager.getJavaCode(id) + ".equals($dest)) {" + JAXXCompiler.getLineSeparator() +" "+ assignment + JAXXCompiler.getLineSeparator() + " }"); + compiler.appendProcessDataBinding("if (" + TypeManager.getJavaCode(id) + ".equals($dest)) {" + JAXXCompiler.getLineSeparator()); + String objectCode = dataSource.getObjectCode(); + if (objectCode != null) { + compiler.appendProcessDataBinding(" if (" + objectCode + " != null) {" + JAXXCompiler.getLineSeparator()); + compiler.appendProcessDataBinding(" "); + } + compiler.appendProcessDataBinding(" " + assignment.trim()); + if (objectCode != null) { + compiler.appendProcessDataBinding(JAXXCompiler.getLineSeparator() + " }"); + } + compiler.appendProcessDataBinding(JAXXCompiler.getLineSeparator() + " }"); return true; } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -52,6 +52,8 @@ private StringBuffer removeListenerCode = new StringBuffer(); private boolean compiled; + /** the delegate of property to be required */ + private String objectCode; /** * Creates a new data source. After creating a <code>DataSource</code>, use {@link #compile} @@ -76,6 +78,10 @@ return source; } + public String getObjectCode() { + return objectCode; + } + /** * Compiles the data source expression and listener. This method calls methods in <code>JAXXCompiler</code> * to add the Java code that performs the data source setup. Adding listeners to <code>DataSource</code> is @@ -270,8 +276,7 @@ int type = prefix.getChild(0).getId(); if (type == JavaParserTreeConstants.JJTLITERAL || type == JavaParserTreeConstants.JJTEXPRESSION) { prefix.setJavaType(prefix.getChild(0).getJavaType()); - } else - if (type == JavaParserTreeConstants.JJTNAME && expression.jjtGetNumChildren() == 1) // name with no arguments after it + } else if (type == JavaParserTreeConstants.JJTNAME && expression.jjtGetNumChildren() == 1) // name with no arguments after it { prefix.setJavaType(scanCompoundSymbol(prefix.getText().trim(), compiler.getRootObject().getObjectClass(), false, listenerId)); } @@ -393,6 +398,7 @@ } private void addListener(String dependencySymbol, String objectCode, String addCode, String removeCode) { + this.objectCode = objectCode; if (!dependencySymbols.contains(dependencySymbol)) { dependencySymbols.add(dependencySymbol); if (objectCode != null) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -830,21 +830,25 @@ */ public ClassLoader getClassLoader() { if (classLoader == null) { - String classPath = options.getClassPath(); - if (classPath == null) { - classPath = "."; - } - String[] paths = classPath.split(File.pathSeparator); - URL[] urls = new URL[paths.length]; - for (int i = 0; i < paths.length; i++) { - try { - urls[i] = new File(paths[i]).toURI().toURL(); + if (options.getClassLoader() != null) { + classLoader = options.getClassLoader(); + } else { + String classPath = options.getClassPath(); + if (classPath == null) { + classPath = "."; } - catch (MalformedURLException e) { - throw new RuntimeException(e); + String[] paths = classPath.split(File.pathSeparator); + URL[] urls = new URL[paths.length]; + for (int i = 0; i < paths.length; i++) { + try { + urls[i] = new File(paths[i]).toURI().toURL(); + } + catch (MalformedURLException e) { + throw new RuntimeException(e); + } } + classLoader = new URLClassLoader(urls, getClass().getClassLoader()); } - classLoader = new URLClassLoader(urls, getClass().getClassLoader()); } return classLoader; Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -85,9 +85,15 @@ if (dest.exists() && !dest.setLastModified(System.currentTimeMillis())) { log.warn("could not touch file " + dest); } - PrintWriter out = new PrintWriter(new FileWriter(dest)); - createJavaSource(out); - out.close(); + try { + PrintWriter out = new PrintWriter(new FileWriter(dest)); + createJavaSource(out); + out.close(); + } catch (RuntimeException e) { + // file could not be generated, so delete it... + dest.delete(); + throw e; + } } protected void createJavaSource(PrintWriter out) throws IOException { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -39,7 +39,8 @@ public static synchronized ClassDescriptor getClassDescriptor(String className) throws ClassNotFoundException { - return getClassDescriptor(className, ClassDescriptorLoader.class.getClassLoader()); + return getClassDescriptor(className, Thread.currentThread().getContextClassLoader()); + //return getClassDescriptor(className, ClassDescriptorLoader.class.getClassLoader()); } public static synchronized ClassDescriptor getClassDescriptor(String className, ClassLoader classLoader) throws ClassNotFoundException { @@ -228,7 +229,7 @@ private static ClassDescriptor createClassDescriptorFromJavaSource(URL javaSource, ClassLoader classLoader) throws ClassNotFoundException { try { InputStream in = javaSource.openStream(); - Reader reader = new InputStreamReader(in); + Reader reader = new InputStreamReader(in,"utf-8"); ClassDescriptor result = JavaFileParser.parseJavaFile(javaSource.toString(), reader, classLoader); reader.close(); return result; Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -7,6 +7,8 @@ import jaxx.parser.ParseException; import jaxx.parser.SimpleNode; import jaxx.tags.TagManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Reader; import java.lang.reflect.Modifier; @@ -17,6 +19,11 @@ // TODO: need to unify this implementation with the parsing in ScriptManager public class JavaFileParser { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(JavaFileParser.class); + + private JAXXCompiler compiler; private String className; private String packageName = null; @@ -34,7 +41,15 @@ // undefined, and doesn't report interfaces. It's safe to leave those the way they are for now, because // JAXX doesn't look at any of those for non-JAXX classes. JavaFileParser parser = new JavaFileParser(classLoader); - parser.doParse(displayName, src); + if (log.isInfoEnabled()) { + log.info("starting parsing : "+displayName); + } + try { + parser.doParse(displayName, src); + } catch (Exception e) { + log.error(e.getMessage()); + throw new RuntimeException(e); + } List<MethodDescriptor> publicMethods = parser.methods; List<FieldDescriptor> publicFields = parser.fields; Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -451,6 +451,18 @@ } /** + * Convinient method to apply more than one binding on a JAXX ui. + * + * @param src the ui to treate + * @param bindings the list of binding to process. + */ + public static void applyDataBinding(JAXXObject src, String... bindings) { + for (String binding : bindings) { + src.applyDataBinding(binding); + } + } + + /** * Convinient method to process more than one binding on a JAXX ui. * * @param src the ui to treate @@ -463,6 +475,18 @@ } /** + * Convinient method to remove more than one binding on a JAXX ui. + * + * @param src the ui to treate + * @param bindings the list of binding to process. + */ + public static void removeDataBinding(JAXXObject src, String... bindings) { + for (String binding : bindings) { + src.removeDataBinding(binding); + } + } + + /** * Convinient method to attach a bean to all validators of an JAXXObject. * <p/> * It is possible to exclude some validator to be treated. @@ -524,5 +548,5 @@ } }; } - + } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeSelectionAdapter.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -163,6 +163,11 @@ // now, we are free to open the ui associated with the selected node in navigation + // always clean cache on the node before all + node.cachedBean = null; + if (node.renderer != null) { + node.renderer.setRendererCachedValue(null); + } // before all, attach bean in context associated with the selected node in naivgation tree Object data = getNavigationTreeModel().getJAXXContextValue(context, path); Modified: lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/maven-jaxx-plugin/changelog.txt 2008-12-14 18:42:16 UTC (rev 1081) @@ -1,4 +1,7 @@ -0.7 chemit 200812?? +0.8 chemit 200812?? + * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path + +0.7 chemit 20081210 * 20081208 [chemit] - javabBean attribute use to initialize bean * 20081207 [chemit] use lutinproject 3.1 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-13 09:36:23 UTC (rev 1080) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-12-14 18:42:16 UTC (rev 1081) @@ -68,6 +68,14 @@ * @parameter expression="${jaxx.outJava}" default-value="${basedir}/target/generated-sources/java" */ protected File outJava; + /** + * flag to include in compiler classpath the java sources directories (src and outJava). + * <p/> + * By default, false. + * + * @parameter expression="${jaxx.addSourcesToClassPath}" default-value="false" + */ + protected boolean addSourcesToClassPath; /** * chemin du repertoire de generation des resources. @@ -199,7 +207,6 @@ * If not given, will use the one defined in validator * * @parameter expression="${jaxx.defaultErrorUIFQN}" - * * @see jaxx.runtime.validator.BeanValidator#DEFAULT_UI_CLASS */ protected String defaultErrorUIFQN; @@ -216,6 +223,8 @@ private Class<?> defaultErrorUIClass; + protected ClassLoader cl; + protected void init() throws ClassNotFoundException { if (project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging()))) { @@ -246,6 +255,10 @@ fixCompileSourceRoots(); + if (addSourcesToClassPath) { + cl = initClassLoader(project, getLog()); + Thread.currentThread().setContextClassLoader(cl); + } DirectoryScanner ds; ds = new DirectoryScanner(); ds.setBasedir(src); @@ -312,6 +325,11 @@ result.setJaxxContextImplementorClass(jaxxContextImplementorClass); result.setExtraImports(extraImports); result.setDefaultErrorUI(defaultErrorUIClass); + if (cl!=null) { + result.setClassLoader(cl); + } + + return result; } @@ -376,26 +394,36 @@ protected URLClassLoader initClassLoader(MavenProject project, Log log) { URLClassLoader loader = null; if (project != null) { + List plugins = project.getBuildPlugins(); + + //((Plugin)project.getBuildPlugins().get(3)).getDependencies(); URLClassLoader result; try { Set<Artifact> compileClasspathElements = project.getArtifacts(); - URL[] url = new URL[compileClasspathElements.size() + 1]; + ClassLoader l = getClass().getClassLoader(); + int urlClSize = 1; + URL[] url; + if (addSourcesToClassPath) { + urlClSize+=2; + } + if (l instanceof URLClassLoader) { + urlClSize += (((URLClassLoader) l).getURLs().length); + } + url = new URL[urlClSize]; url[0] = outClass.toURI().toURL(); - int i = 1; - for (Artifact artifact : compileClasspathElements) { - File file = new File(artifact.getFile().getAbsolutePath()); - if (file.getName().endsWith(".jar")) { - url[i] = new URL("jar", "", file.toURI().toURL().toString() + "!/"); - } else { - url[i] = file.toURI().toURL(); - } - i++; + + if (l instanceof URLClassLoader) { + URL[] urls = ((URLClassLoader) l).getURLs(); + System.arraycopy(urls, 0, url, 1, urls.length); } - //ClassLoader parent = Thread.currentThread().getContextClassLoader(); + if (addSourcesToClassPath) { + url[url.length - 2] = src.toURI().toURL(); + url[url.length - 1] = outJava.toURI().toURL(); + } if (compileClasspathElements.size() == 0) { - result = new URLClassLoader(url, getClass().getClassLoader()); + result = new URLClassLoader(url, l); } else { - result = new URLClassLoader(url, getClass().getClassLoader()); + result = new URLClassLoader(url, l); } } catch (MalformedURLException eee) { throw new RuntimeException("Can't create ClassLoader for script, bad directory: " + outClass + " for reason " + eee.getMessage(), eee); @@ -404,9 +432,9 @@ } loader = result; } - if (verbose && loader != null) { + if (loader != null) { for (URL entry : loader.getURLs()) { - log.info("outClass url " + entry); + log.info("classpath : " + entry); } } return loader;

1 0