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

r149 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 19:22:02 +0000 (Sat, 12 Jan 2008) New Revision: 149 Modified: trunk/jaxx/src/java/jaxx/compiler/JavaField.java Log: suppression ; g?\195?\169n?\195?\169r?\195?\169 inutile + ajout de getter proptected pour les fields private Modified: trunk/jaxx/src/java/jaxx/compiler/JavaField.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaField.java 2008-01-12 19:21:33 UTC (rev 148) +++ trunk/jaxx/src/java/jaxx/compiler/JavaField.java 2008-01-12 19:22:02 UTC (rev 149) @@ -98,9 +98,11 @@ result.append(initializer); } result.append(';'); - result.append(';'); + result.append(' '); if (java.lang.reflect.Modifier.isProtected(modifiers)) { result.append("public ").append(type).append(" get").append(name.substring(0, 1).toUpperCase()).append(name.substring(1)).append("() {return ").append(name).append(";}"); + } else if (java.lang.reflect.Modifier.isPrivate(modifiers)) { + result.append("protected ").append(type).append(" get").append(name.substring(0, 1).toUpperCase()).append(name.substring(1)).append("() {return ").append(name).append(";}"); } return result.toString(); }

1 0

r148 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 19:21:33 +0000 (Sat, 12 Jan 2008) New Revision: 148 Modified: trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java Log: suppresion d'un cast g?\195?\169n?\195?\169r?\195?\169 Modified: trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java 2008-01-12 18:12:06 UTC (rev 147) +++ trunk/jaxx/src/java/jaxx/compiler/CompiledObject.java 2008-01-12 19:21:33 UTC (rev 148) @@ -263,10 +263,11 @@ * @return the Java code for this object */ public String getJavaCode() { - if (isOverride()) // handle cases where object is overridden to be a different class - return "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; - else - return javaCode; + //if (isOverride()) // handle cases where object is overridden to be a different class + // return "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + //else + //TODO Check if this is safe + return javaCode; }

1 0

r147 - trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 18:12:06 +0000 (Sat, 12 Jan 2008) New Revision: 147 Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx Log: use variable in test :) Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx 2008-01-12 16:13:13 UTC (rev 146) +++ trunk/maven-jaxx-plugin/src/test/java/testcases/Initializers/Initializers.jaxx 2008-01-12 18:12:06 UTC (rev 147) @@ -15,7 +15,7 @@ public Initializers(int dummy, String label) { - super("Test 3 worked!"); + super("Test 3 worked! "+dummy); constructorTest2.setText(label); }

1 0

r146 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 16:13:13 +0000 (Sat, 12 Jan 2008) New Revision: 146 Modified: trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java Log: on doit permettre de diff?\195?\169rencer le r?\195?\169pertoire de g?\195?\169n?\195?\169ration du r?\195?\169pertoire de compilation Modified: trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java 2008-01-12 16:12:30 UTC (rev 145) +++ trunk/jaxx/src/java/jaxx/compiler/CompilerOptions.java 2008-01-12 16:13:13 UTC (rev 146) @@ -8,6 +8,7 @@ */ public class CompilerOptions { private File targetDirectory; + private File javacTargetDirectory; private String classPath; private String javacOpts; private boolean runJavac; @@ -20,6 +21,21 @@ * @return the target directory * @see #setTargetDirectory */ + public File getJavacTargetDirectory() { + if (javacTargetDirectory==null) { + // to use the old way : if javacTargetDirectory not specified, + // use same directory as targetDirectory (says where the java sources + // are generated) + return targetDirectory; + } + return javacTargetDirectory; + } + /** + * Returns the target directory, generally specified with the "-d" option on the command line. + * + * @return the target directory + * @see #setTargetDirectory + */ public File getTargetDirectory() { return targetDirectory; } @@ -35,6 +51,9 @@ this.targetDirectory = targetDirectory; } + public void setJavacTargetDirectory(File javacTargetDirectory) { + this.javacTargetDirectory = javacTargetDirectory; + } /** * Returns the class path to be used during compilation.

1 0

r145 - trunk/jaxx/src/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 16:12:30 +0000 (Sat, 12 Jan 2008) New Revision: 145 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java Log: g?\195?\169n?\195?\169ration de code 1.5 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -49,7 +49,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO ajout du bon typage g�n�rique - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JListHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -47,7 +47,7 @@ if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO Add the correct generic type - list.appendAdditionCode("java.util.List<Object> " + listName + " = new java.util.ArrayList<Object>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 13:39:18 UTC (rev 144) +++ trunk/jaxx/src/java/jaxx/tags/swing/JTreeHandler.java 2008-01-12 16:12:30 UTC (rev 145) @@ -58,7 +58,7 @@ List<Item> items = tree.getItems(); if (items != null && !items.isEmpty()) { String listName = tree.getId() + "$items"; - tree.appendAdditionCode("java.util.List " + listName + " = new java.util.ArrayList();"); + tree.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); createItems(tree, items, listName + ".add", compiler); tree.appendAdditionCode(tree.getId() + ".setItems(" + listName + ");"); }

1 0

r144 - trunk/jaxx/src/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 13:39:18 +0000 (Sat, 12 Jan 2008) New Revision: 144 Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java Log: generify Modified: trunk/jaxx/src/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-12 13:34:53 UTC (rev 143) +++ trunk/jaxx/src/java/jaxx/tags/TagManager.java 2008-01-12 13:39:18 UTC (rev 144) @@ -40,7 +40,7 @@ * TagHandler instances, because subclasses of the bean class should be handled by the same TagHandler * (assuming no more specific mappings exist), which requires creating a new instance of the TagHandler. */ - private static ClassMap<Class> registeredBeans = new ClassMap<Class>(); + private static ClassMap<Class<? extends TagHandler>> registeredBeans = new ClassMap<Class<? extends TagHandler>>(); // still targeting 1.4, so I can't use javax.xml.namespace.QName private static class QName { @@ -99,9 +99,10 @@ * @param handler the <code>TagHandler</code> class, which must descend from <code>DefaultObjectHandler</code> * @throws IllegalArgumentException if the handler class does not descend from <code>DefaultObjectHandler</code> */ - public static void registerBean(ClassDescriptor beanClass, Class handler) { - if (!DefaultObjectHandler.class.isAssignableFrom(handler)) + public static <T extends TagHandler> void registerBean(ClassDescriptor beanClass, Class<T> handler) { + if (!DefaultObjectHandler.class.isAssignableFrom(handler)) { throw new IllegalArgumentException("handler class must be a subclass of DefaultObjectHandler"); + } registeredBeans.put(beanClass, handler); String name = beanClass.getName(); int dotPos = name.lastIndexOf("."); @@ -147,7 +148,7 @@ * @param tag the simple name of the tag * @param handler the <code>TagHandler</code> which should process the tag */ - public static void registerTag(String namespace, String tag, TagHandler handler) { + public static <T extends TagHandler> void registerTag(String namespace, String tag, T handler) { if (namespace == null) { namespace = "*"; } @@ -196,24 +197,24 @@ * are considered. * @throws jaxx.CompilerException ? */ - public static DefaultObjectHandler getTagHandler(ClassDescriptor beanClass) throws CompilerException { + public static DefaultObjectHandler getTagHandler(ClassDescriptor beanClass) throws CompilerException { try { if (beanClass == null) { throw new NullPointerException(); } String namespace = getNamespace(beanClass); String tag = getSimpleName(beanClass); - TagHandler handler = registeredTags.get(new QName(namespace, tag)); + DefaultObjectHandler handler = (DefaultObjectHandler) registeredTags.get(new QName(namespace, tag)); if (handler == null) { - Class<?> handlerClass = registeredBeans.get(beanClass); + Class<? extends TagHandler> handlerClass = registeredBeans.get(beanClass); if (handlerClass == null) { throw new CompilerException("unable to find handler for " + beanClass); } - Constructor<?> constructor = handlerClass.getConstructor(ClassDescriptor.class); + Constructor<? extends TagHandler> constructor = handlerClass.getConstructor(ClassDescriptor.class); handler = (DefaultObjectHandler) constructor.newInstance(beanClass); registerTag(namespace, tag, handler); } - return (DefaultObjectHandler) handler; + return handler; } catch (InstantiationException e) { throw new RuntimeException(e);

1 0

r143 - trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 13:34:53 +0000 (Sat, 12 Jan 2008) New Revision: 143 Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx Log: un test ne fonctionne plus : une classe compil?\195?\169e est requise ClassTest, elle doit ?\195?\170tre compil?\195?\169e ? Modified: trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx 2008-01-12 12:39:50 UTC (rev 142) +++ trunk/maven-jaxx-plugin/src/test/java/testcases/ClassReferences/ClassReferences.jaxx 2008-01-12 13:34:53 UTC (rev 143) @@ -10,7 +10,8 @@ </script> <VBox id='box'> - <ClassTest customProperty='Compiled class file worked'/> +  +  <JAXXTest customProperty='Uncompiled JAXX file worked'/> <JavaTest customProperty='Uncompiled Java file worked'/> </VBox>

1 0

r142 - in trunk/maven-jaxx-plugin/src/test: . java
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 12:39:50 +0000 (Sat, 12 Jan 2008) New Revision: 142 Added: trunk/maven-jaxx-plugin/src/test/java/testcases/ Removed: trunk/maven-jaxx-plugin/src/test/testcases/ Log: rajout des propri?\195?\169t?\195?\169s includes et celles pour utiliser javac Copied: trunk/maven-jaxx-plugin/src/test/java/testcases (from rev 141, trunk/maven-jaxx-plugin/src/test/testcases)

1 0

r141 - in trunk: jaxx/src/test maven-jaxx-plugin/src/test
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 12:39:21 +0000 (Sat, 12 Jan 2008) New Revision: 141 Added: trunk/maven-jaxx-plugin/src/test/testcases/ Removed: trunk/jaxx/src/test/testcases/ Log: d?\195?\169placement des tests de g?\195?\169n?\195?\169rations de code dans le plugin Copied: trunk/maven-jaxx-plugin/src/test/testcases (from rev 140, trunk/jaxx/src/test/testcases)

1 0

r140 - trunk/maven-jaxx-plugin/src/main/java/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Jan '08

12 Jan '08

Author: tchemit Date: 2008-01-12 12:37:15 +0000 (Sat, 12 Jan 2008) New Revision: 140 Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java Log: rajout des propri?\195?\169t?\195?\169s includes et celles pour utiliser javac Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 12:35:39 UTC (rev 139) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 12:37:15 UTC (rev 140) @@ -53,13 +53,32 @@ * @parameter expression="${jaxx.optimize}" default-value="false" */ protected boolean optimize; + /** + * @description pour demander la compilation via javac des sources g�n�r�s + * @parameter expression="${jaxx.runJavac}" default-value="false" + */ + protected boolean runJavac; /** + * @description les options de la compilation + * @parameter expression="${jaxx.javaOpts}" default-value="" + */ + protected String javaOpts=""; + + /** + * @description pour filter + * @parameter expression="${jaxx.includes}" + */ + protected String[] includes; + + /** * @description verbose * @parameter expression="${jaxx.verbose}" default-value="${maven.verbose}" */ protected boolean verbose; + protected String[] files; + private static final String[] INCLUDES = {"**\\/*.jaxx"}; public void execute() throws MojoExecutionException, MojoFailureException { @@ -68,9 +87,9 @@ DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(getSrc()); - ds.setIncludes(INCLUDES); + ds.setIncludes(includes==null|| includes.length==0?INCLUDES:includes); ds.scan(); - String[] files = ds.getIncludedFiles(); + files = ds.getIncludedFiles(); log.info("jaxx - found " + files.length + " file(s) to generate. "); CompilerOptions options = toCompilerOptions(); if (verbose) { @@ -91,9 +110,9 @@ public CompilerOptions toCompilerOptions() { CompilerOptions result = new CompilerOptions(); result.setClassPath(getSrc().getPath()); - result.setJavacOpts(""); + result.setJavacOpts(getJavaOpts()); result.setKeepJavaFiles(true); - result.setRunJavac(false); + result.setRunJavac(isRunJavac()); result.setOptimize(isOptimize()); result.setTargetDirectory(getOut()); return result; @@ -112,4 +131,48 @@ public File getOut() { return out; } + + public String getJavaOpts() { + return javaOpts; + } + + public boolean isRunJavac() { + return runJavac; + } + + public String[] getIncludes() { + return includes; + } + + public void setJavaOpts(String javaOpts) { + this.javaOpts = javaOpts; + } + + public void setOptimize(boolean optimize) { + this.optimize = optimize; + } + + public void setOut(File out) { + this.out = out; + } + + public void setRunJavac(boolean runJavac) { + this.runJavac = runJavac; + } + + public void setSrc(File src) { + this.src = src; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public String[] getFiles() { + return files; + } } \ No newline at end of file

1 0