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

r159 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:31:05 +0000 (Sat, 12 Jan 2008) New Revision: 159 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.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 TODO : r?\195?\169gler le probl?\195?\168me de compilation javac lorsque interd?\195?\169pendances entre source g?\195?\169n?\195?\169r?\195?\169... Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 19:30:22 UTC (rev 158) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-01-12 19:31:05 UTC (rev 159) @@ -12,9 +12,10 @@ protected JaxxGeneratorGoal goal; - protected static File srcDir; protected static final String PREFIX_PACKAGE = "testcases"; + protected static File srcDir; + protected static File getSrcDir() { if (srcDir == null) { srcDir = new File("src" + File.separator + "test" + File.separator + "java"); @@ -22,41 +23,68 @@ return srcDir; } + protected static File outDir; + + protected static File getOutDir() { + if (outDir == null) { + outDir = new File("target" + File.separator + "test-gen-java"); + outDir.mkdirs(); + } + return outDir; + } + + protected static File ClassOutDir; + + protected static File getClassOutDir() { + if (ClassOutDir == null) { + ClassOutDir = new File("target" + File.separator + "test-classes"); + ClassOutDir.mkdirs(); + } + return ClassOutDir; + } + @Override public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); final File srcDir = getSrcDir(); assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); + final File outDir = getOutDir(); + assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); + final File classOutDir = getClassOutDir(); + assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); String packageName = anno.packageName(); goal = new JaxxGeneratorGoal(); goal.setSrc(srcDir); - goal.setOut(srcDir); + goal.setOut(outDir); + goal.setClassOut(classOutDir); goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); goal.setRunJavac(anno.runJavac()); goal.setJavaOpts(anno.javaOpts()); + System.out.println(getName()); } - @Override - protected void tearDown() throws Exception { - String[] files = goal.getFiles(); - if (files != null) { - for (String s : files) { + @CompileConfig(packageName = "InnerClasses", runJavac = true) + public void testInnerClasses() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + - File file = new File(getSrcDir(), s.substring(0, s.length() - 4) + "java"); - System.out.println("delete file " + file); - boolean b = file.delete(); - assertTrue("could not delete file " + file, b); - } - super.tearDown(); + @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) + public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); } + goal.execute(); } - - @CompileConfig(packageName = "CssTests") public void testCssTests() throws MojoExecutionException, MojoFailureException { goal.execute(); @@ -66,29 +94,28 @@ public void testErrors() throws MojoExecutionException, MojoFailureException { } - @CompileConfig(packageName = "Initializers") + @CompileConfig(packageName = "Initializers", runJavac = true) public void testInitializers() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "InnerClasses") - public void testInnerClasses() throws MojoExecutionException, MojoFailureException { - System.out.println("hum"); - goal.execute(); - } - @CompileConfig(packageName = "OverridingDataBindings") + @CompileConfig(packageName = "OverridingDataBindings", runJavac = true) public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "SpecialSubclassing") - public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + @CompileConfig(packageName = "ClassReferences", runJavac = true) + public void testClassReferences() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); + } goal.execute(); } - @CompileConfig(packageName = "ClassReferences") - public void testClassReferences() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } + } \ No newline at end of file

1 0

r158 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:30:22 +0000 (Sat, 12 Jan 2008) New Revision: 158 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java Log: par d?\195?\169fault le compilateur jaxx est silencieux Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java 2008-01-12 19:29:50 UTC (rev 157) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompileConfig.java 2008-01-12 19:30:22 UTC (rev 158) @@ -36,7 +36,7 @@ public boolean runJavac() default false; - public boolean verbose() default true; + public boolean verbose() default false; public String javaOpts() default ""; }

1 0

r157 - trunk/maven-jaxx-plugin/src/main/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:29:50 +0000 (Sat, 12 Jan 2008) New Revision: 157 Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.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/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 19:29:09 UTC (rev 156) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-01-12 19:29:50 UTC (rev 157) @@ -21,6 +21,7 @@ import jaxx.compiler.CompilerOptions; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.JavaCCompiler; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -49,6 +50,11 @@ */ protected File out; /** + * @description R�pertoire de destination des fichiers � compiler. + * @parameter expression="${jaxx.classOut}" default-value="${basedir}/target/test-classes" + */ + protected File classOut; + /** * @description pour optimizer le code compil� ou g�n�r� ? * @parameter expression="${jaxx.optimize}" default-value="false" */ @@ -61,9 +67,9 @@ /** * @description les options de la compilation - * @parameter expression="${jaxx.javaOpts}" default-value="" + * @parameter expression="${jaxx.javaOpts}" */ - protected String javaOpts=""; + protected String javaOpts = null; /** * @description pour filter @@ -81,20 +87,23 @@ private static final String[] INCLUDES = {"**\\/*.jaxx"}; + private static final String[] INCLUDES_JAVA = {"**\\/*.java"}; + public void execute() throws MojoExecutionException, MojoFailureException { - // init(); - - DirectoryScanner ds = new DirectoryScanner(); + DirectoryScanner ds; + ds = new DirectoryScanner(); ds.setBasedir(getSrc()); - ds.setIncludes(includes==null|| includes.length==0?INCLUDES:includes); + boolean noIncludes = includes == null || includes.length == 0; + ds.setIncludes(noIncludes ? INCLUDES : includes); ds.scan(); files = ds.getIncludedFiles(); log.info("jaxx - found " + files.length + " file(s) to generate. "); CompilerOptions options = toCompilerOptions(); if (verbose) { log.debug("classPath: " + options.getClassPath()); - log.debug("out : " + options.getTargetDirectory()); + log.debug("javaOut : " + options.getTargetDirectory()); + log.debug("classOut : " + options.getJavacTargetDirectory()); log.debug("javacOpts: " + options.getJavacOpts()); log.debug("runJavac : " + options.getRunJavac()); log.debug("optiomize: " + options.getOptimize()); @@ -102,18 +111,48 @@ log.debug(file); } } + if (!JAXXCompiler.compile(src, files, options)) { throw new MojoFailureException("Aborting due to errors reported by jaxxc"); } + + if (options.getRunJavac()) { + // compile also non generated java sources + ds = new DirectoryScanner(); + ds.setBasedir(getSrc()); + if (noIncludes) { + ds.setIncludes(INCLUDES_JAVA); + } else { + String[] includesJava = new String[includes.length]; + for (int i = 0; i < includes.length; i++) { + String include = includes[i]; + if (include.endsWith(".jaxx")) { + includesJava[i] = include.substring(0, include.length() - "jaxx".length()) + "java"; + } else { + includesJava[i] = include; + } + } + ds.setIncludes(includesJava); + } + ds.scan(); + for (String file : ds.getIncludedFiles()) { + // compile + JavaCCompiler.runJavac(getClassOut().getPath(), options.getJavacOpts(), getSrc().getPath() + File.separator + file); + } + } + } public CompilerOptions toCompilerOptions() { CompilerOptions result = new CompilerOptions(); result.setClassPath(getSrc().getPath()); - result.setJavacOpts(getJavaOpts()); + if (getJavaOpts() != null && !"".equals(getJavaOpts())) { + result.setJavacOpts(getJavaOpts()); + } result.setKeepJavaFiles(true); result.setRunJavac(isRunJavac()); result.setOptimize(isOptimize()); + result.setJavacTargetDirectory(getClassOut()); result.setTargetDirectory(getOut()); return result; } @@ -136,6 +175,10 @@ return javaOpts; } + public File getClassOut() { + return classOut; + } + public boolean isRunJavac() { return runJavac; } @@ -156,6 +199,10 @@ this.out = out; } + public void setClassOut(File classOut) { + this.classOut = classOut; + } + public void setRunJavac(boolean runJavac) { this.runJavac = runJavac; }

1 0

r156 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:29:09 +0000 (Sat, 12 Jan 2008) New Revision: 156 Modified: trunk/jaxx/build.xml Log: modification buil ant pour s'adapter au projet maven 2 Modified: trunk/jaxx/build.xml =================================================================== --- trunk/jaxx/build.xml 2008-01-12 19:28:30 UTC (rev 155) +++ trunk/jaxx/build.xml 2008-01-12 19:29:09 UTC (rev 156) @@ -2,7 +2,7 @@ <property name="src.dir" location="src"/> <property name="jaxx.version" value="1.0.3-beta3"/> <property name="java.src.dir" location="${src.dir}/java"/> - <property name="docs.src.dir" location="${src.dir}/docs"/> + <property name="docs.src.dir" location="${basedir}/doc"/> <property name="build.dir" location="target"/> <property name="java.build.dir" location="${build.dir}/classes"/> <property name="lib.build.dir" location="${build.dir}/lib"/> @@ -12,7 +12,7 @@ <property name="bin.build.dir" location="${build.dir}/bin"/> <property name="examples.dir" value="examples"/> <property name="examples.build.dir" value="${build.dir}/java/examples"/> - <property name="testcases.dir" value="testcases"/> + <property name="testcases.dir" value="src/test/"/> <property name="junit.src.dir" location="${testcases.dir}/unittests"/> <property name="junit.build.dir" location="${build.dir}/test-classes"/>

1 0

r155 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:28:30 +0000 (Sat, 12 Jan 2008) New Revision: 155 Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java Log: extraction du compilateur javac du compilateur jaxxc Modified: trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 19:27:52 UTC (rev 154) +++ trunk/jaxx/src/java/jaxx/compiler/JAXXCompiler.java 2008-01-12 19:28:30 UTC (rev 155) @@ -47,14 +47,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; -import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectOutputStream; -import java.io.PrintStream; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.net.URL; @@ -259,18 +256,6 @@ for (String s : INITIALIZER_CLASSES) { ((Initializer) Class.forName(s).newInstance()).initialize(); } - -// Enumeration/*<URL>*/ e = JAXXCompiler.class.getClassLoader().getResources("jaxx.properties"); -// while (e.hasMoreElements()) { -// Properties p = new Properties(); -// InputStream in = ((URL) e.nextElement()).openConnection().getInputStream(); -// p.load(in); -// in.close(); -// -// String initializer = p.getProperty("jaxx.initializer"); -// if (initializer != null) -// ((Initializer) Class.forName(initializer).newInstance()).initialize(); -// } } @@ -394,86 +379,6 @@ out.close(); } - - private void runJavac() { - try { - URL jaxxURL = getClass().getResource("/jaxx/compiler/JAXXCompiler.class"); - if (jaxxURL == null) { - throw new InternalError("Can't-happen error: could not find /jaxx/compiler/JAXXCompiler.class on class path"); - } - String classpath = jaxxURL.toString(); - if (classpath.startsWith("jar:")) { - classpath = classpath.substring("jar:".length()); - classpath = classpath.substring(0, classpath.indexOf("!")); - classpath = URLtoFile(classpath).getPath(); - } - URL runtimeURL = getClass().getResource("/jaxx/runtime/JAXXObject.class"); - if (runtimeURL == null) { - throw new InternalError("Can't-happen error: could not find /jaxx/runtime/JAXXObject.class on class path"); - } - String runtime = runtimeURL.toString(); - if (runtime.startsWith("jar:")) { - runtime = runtime.substring("jar:".length()); - runtime = runtime.substring(0, runtime.indexOf("!")); - runtime = URLtoFile(runtime).getPath(); - } - classpath += File.pathSeparator + runtime + File.pathSeparator + options.getClassPath() + File.pathSeparator + "."; - Class<?> javac = Class.forName("com.sun.tools.javac.Main"); - Method main = javac.getMethod("compile", new Class[]{String[].class}); - final PrintStream oldErr = System.err; - System.setErr(new PrintStream(new FilterOutputStream(oldErr) { - @Override - public void write(byte[] b, int off, int len) throws IOException { - String stringValue = new String(b, off, len).trim(); - if (stringValue.startsWith("Error:") || stringValue.startsWith("Usage:") || stringValue.endsWith("error") || - stringValue.endsWith("errors")) { - failed = true; - } - if (stringValue.endsWith("uses unchecked or unsafe operations.") || - stringValue.endsWith("with -Xlint:unchecked for details.")) { - return; - } - super.write(b, off, len); - } - })); - List<String> javacOpts = new ArrayList<String>(); - if (options.getJavacOpts() != null) { - javacOpts.addAll(Arrays.asList(options.getJavacOpts().split("\\s+"))); - } - if (options.getTargetDirectory() != null) { - String destRoot = options.getTargetDirectory().getPath(); - javacOpts.add("-d"); - javacOpts.add(destRoot); - classpath += File.pathSeparator + destRoot; - } - javacOpts.add("-classpath"); - javacOpts.add(classpath); - javacOpts.add(dest.getPath()); - main.invoke(null, new Object[]{javacOpts.toArray(new String[javacOpts.size()])}); - System.setErr(oldErr); - } - catch (ClassNotFoundException e) { - System.err.println("Unable to find javac (com.sun.tools.javac.Main) on class path."); - System.err.println("jaxxc launch script is responsible for adding javac (typically"); - System.err.println("located in tools.jar) to the class path; it either added the"); - System.err.println("wrong path or tools.jar does not exist."); - System.err.println(); - System.err.println("Check to make sure that JAVA_HOME points to a valid JDK"); - System.err.println("installation."); - failed = true; - } - catch (Exception e) { - System.err.println("An error occurred while invoking javac:"); - e.printStackTrace(); - failed = true; - } - - if (!options.getKeepJavaFiles()) { - dest.delete(); - } - } - - private void createJavaSource(PrintWriter out) throws IOException { int dotPos = outputClassName.lastIndexOf("."); String packageName = dotPos != -1 ? outputClassName.substring(0, dotPos) : null; @@ -999,7 +904,8 @@ result.append(" = "); String constructorParams = object.getConstructorParams(); if (constructorParams != null) { - result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + result.append(" new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + //result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); } else { result.append("new ").append(getCanonicalName(object.getObjectClass())).append("();"); } @@ -1932,9 +1838,12 @@ if (compiler == null) { throw new CompilerException("Internal error: could not find compiler for " + className + " during compilation"); } - compiler.runJavac(); + boolean keepJavaFiles = compiler.getOptions().getKeepJavaFiles(); + JavaCCompiler.runJavac(compiler); if (compiler.failed) { success = false; + } else if (!keepJavaFiles) { + compiler.getDest().delete(); } } } @@ -2051,4 +1960,12 @@ System.exit(success ? 0 : 1); } -} + + public File getDest() { + return dest; + } + + public void setFailed(boolean failed) { + this.failed = failed; + } +}

1 0

r154 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:27:52 +0000 (Sat, 12 Jan 2008) New Revision: 154 Added: trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java Log: extraction du compilateur javac du compilateur jaxxc Added: trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java (rev 0) +++ trunk/jaxx/src/java/jaxx/compiler/JavaCCompiler.java 2008-01-12 19:27:52 UTC (rev 154) @@ -0,0 +1,130 @@ +/* + * Copyright 2006 Ethan Nicholas. All rights reserved. + * Use is subject to license terms. + */ +package jaxx.compiler; + +import static jaxx.compiler.JAXXCompiler.URLtoFile; + +import java.io.File; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + + +/** + * Compiles java files into Java classes. + * + * @author chemit + */ +public class JavaCCompiler { + + static JAXXCompiler compiler; + static String classpath; + + public static void runJavac(final JAXXCompiler compiler) { + + CompilerOptions options = compiler.getOptions(); + JavaCCompiler.compiler = compiler; + runJavac( + options.getJavacTargetDirectory().getPath(), + options.getJavacOpts(), + compiler.getDest().getPath() + ); + } + + public static void runJavac(String destRoot, String options, String... destJavas) { + + PrintStream oldErr = System.err; + + String classpath = getClassPath(); + + try { + + initOutStream(oldErr); + + for (String destJava : destJavas) { + + String[] javacOpts = initOptions(classpath, destRoot, destJava, options==null?null:options.split("\\s+")); + //System.out.println("launch javac : "+ Arrays.toString(javacOpts)); + com.sun.tools.javac.Main.compile(javacOpts); + } + + } + catch (Exception e) { + System.err.println("An error occurred while invoking javac: "); + e.printStackTrace(); + if (compiler != null) { + compiler.setFailed(true); + } + } finally { + System.setErr(oldErr); + compiler = null; + } + } + + private static String getClassPath() { + if (classpath == null) { + // we do actually use a single jar for jaxx (core + runtime + swing +...) + String PATH = "/jaxx/compiler/JAXXCompiler.class"; + URL jaxxURL = JavaCCompiler.class.getResource(PATH); + if (jaxxURL == null) { + throw new InternalError("Can't-happen error: could not find /jaxx/compiler/JAXXCompiler.class on class path"); + } + String classpath = jaxxURL.toString(); + if (classpath.startsWith("jar:")) { + classpath = classpath.substring("jar:".length()); + classpath = classpath.substring(0, classpath.indexOf("!")); + classpath = URLtoFile(classpath).getPath(); + } else if (classpath.startsWith("file:")) { + // fix-bug : we must take the classpath and not the entire location to class + classpath = classpath.substring(0, classpath.length() - PATH.length()); + classpath = URLtoFile(classpath).getPath(); + } + JavaCCompiler.classpath = classpath; + } + return classpath; + } + + private static String[] initOptions(String classpath, String destRoot, String destJava, String... options) { + List<String> javacOpts = new ArrayList<String>(); + + if (options != null) { + javacOpts.addAll(Arrays.asList(options)); + } + if (destRoot != null) { + javacOpts.add("-d"); + javacOpts.add(destRoot); + classpath += File.pathSeparator + destRoot; + } + javacOpts.add("-classpath"); + javacOpts.add(classpath); + javacOpts.add(destJava); + return javacOpts.toArray(new String[javacOpts.size()]); + } + + private static void initOutStream(final PrintStream oldErr) { + System.setErr(new PrintStream(new FilterOutputStream(oldErr) { + @Override + public void write(byte[] b, int off, int len) throws IOException { + String stringValue = new String(b, off, len).trim(); + if (stringValue.startsWith("Error:") || stringValue.startsWith("Usage:") || stringValue.endsWith("error") || + stringValue.endsWith("errors")) { + if (compiler != null) { + compiler.setFailed(true); + } + } + if (stringValue.endsWith("uses unchecked or unsafe operations.") || + stringValue.endsWith("with -Xlint:unchecked for details.")) { + return; + } + super.write(b, off, len); + } + })); + } + +} \ No newline at end of file

1 0

r153 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:25:23 +0000 (Sat, 12 Jan 2008) New Revision: 153 Modified: trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java Log: am?\195?\169lioration code de scriptlet g?\195?\169n?\195?\169r?\195?\169 (suppression ; inutiles) Modified: trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 19:23:55 UTC (rev 152) +++ trunk/jaxx/src/java/jaxx/compiler/ScriptManager.java 2008-01-12 19:25:23 UTC (rev 153) @@ -51,7 +51,8 @@ public String preprocessScript(String script) throws CompilerException { script = trimScript(script); StringBuffer result = new StringBuffer(); - JavaParser p = new JavaParser(new StringReader(script + ";")); + JavaParser p = new JavaParser(new StringReader(script)); + //JavaParser p = new JavaParser(new StringReader(script + ";")); while (!p.Line()) { SimpleNode node = p.popNode(); if (node != null) { @@ -111,7 +112,7 @@ FieldDescriptor[] fields = compiler.getScriptFields(); for (FieldDescriptor field : fields) { if (field.getName().equals(lhs)) { - lhs.substring(lhs.lastIndexOf(".") + 1); + //lhs.substring(lhs.lastIndexOf(".") + 1); node.firstToken.image = "jaxx.runtime.Util.assignment(" + node.firstToken.image; String outputClassName = compiler.getOutputClassName(); node.lastToken.image = node.lastToken.image + ", \"" + lhs + "\", " + outputClassName + ".this)"; @@ -181,7 +182,7 @@ } compiler.bodyCode.append(modifiers).append(" ").append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); } @@ -235,13 +236,13 @@ } } compiler.bodyCode.append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); compiler.addScriptMethod(new MethodDescriptor(name, Modifier.PUBLIC, returnType, parameterTypes.toArray(new String[parameterTypes.size()]), compiler.getClassLoader())); } else if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEDECLARATION || nodeType == JavaParserTreeConstants.JJTINITIALIZER) { compiler.bodyCode.append(node.getText()); - compiler.bodyCode.append(";\n"); + //compiler.bodyCode.append(";\n"); } else if (nodeType == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION) { processConstructor(node.getChild(0).getChild(0).getText(), node.getChild(0).getChild(1)); @@ -260,16 +261,19 @@ boolean isFinal = Arrays.asList(declarationTokens).contains("final"); boolean isStatic = Arrays.asList(declarationTokens).contains("static"); String name = declarationTokens[declarationTokens.length - 1]; - if (name.endsWith(";")) + if (name.endsWith(";")) { name = name.substring(0, name.length() - 1).trim(); + } String className = declarationTokens[declarationTokens.length - 2]; String type = TagManager.resolveClassName(className, compiler); 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 + //compiler.bodyCode.append(text.substring(0, equals).trim()); compiler.bodyCode.append(text.substring(0, equals).trim()).append(";"); String initializer = text.substring(equals + 1).trim(); - if (type.endsWith("[]")) + if (type.endsWith("[]")) { initializer = "new " + type + " " + initializer; + } final String finalInitializer = name + " = " + initializer; compiler.registerInitializer(new Runnable() { public void run() { @@ -279,19 +283,21 @@ } else { compiler.bodyCode.append(text); } - compiler.bodyCode.append(";\n"); + compiler.bodyCode.append("\n"); + //compiler.bodyCode.append(";\n"); } else { String text = node.getText().trim(); if (text.length() > 0) { compiler.initializer.append(text); - compiler.initializer.append(";\n"); + //compiler.initializer.append(";\n"); } } } public void registerScript(String script) throws CompilerException { - JavaParser p = new JavaParser(new StringReader(script + ";")); + JavaParser p = new JavaParser(new StringReader(script)); + //JavaParser p = new JavaParser(new StringReader(script + ";")); while (!p.Line()) { SimpleNode node = p.popNode(); if (node != null) {

1 0

r152 - trunk/jaxx/src/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:23:55 +0000 (Sat, 12 Jan 2008) New Revision: 152 Modified: trunk/jaxx/src/java/jaxx/compiler/JavaFile.java Log: am?\195?\169lioration g?\195?\169n?\195?\169ration code raw (formatage) Modified: trunk/jaxx/src/java/jaxx/compiler/JavaFile.java =================================================================== --- trunk/jaxx/src/java/jaxx/compiler/JavaFile.java 2008-01-12 19:23:03 UTC (rev 151) +++ trunk/jaxx/src/java/jaxx/compiler/JavaFile.java 2008-01-12 19:23:55 UTC (rev 152) @@ -156,9 +156,15 @@ } if (rawBodyCode.length() > 0) { - result.append(" /* begin raw body code */"); - result.append(rawBodyCode); - result.append(" /* end raw body code */"); + result.append(addIndentation("/* begin raw body code */\n", 4)); + String s = rawBodyCode.toString(); + if (!s.startsWith("\n")) { + result.append('\n'); + } + result.append(addIndentation(s, 4)); + result.append('\n'); + result.append(addIndentation("/* end raw body code */", 4)); + result.append("\n"); } for (JavaFile innerClass : innerClasses) {

1 0

r151 - trunk/jaxx/src/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:23:03 +0000 (Sat, 12 Jan 2008) New Revision: 151 Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java Log: suppression TODO r?\195?\169alis?\195?\169 (typer les listes d'items) Modified: trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java =================================================================== --- trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 19:22:32 UTC (rev 150) +++ trunk/jaxx/src/java/jaxx/tags/swing/JComboBoxHandler.java 2008-01-12 19:23:03 UTC (rev 151) @@ -48,7 +48,6 @@ List<Item> items = list.getItems(); if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; - //TODO ajout du bon typage g�n�rique 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();

1 0

r150 - trunk/jaxx/src/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org Jan. 12, 2008

Jan. 12, 2008

Author: tchemit Date: 2008-01-12 19:22:32 +0000 (Sat, 12 Jan 2008) New Revision: 150 Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java Log: javadoc Modified: trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java =================================================================== --- trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java 2008-01-12 19:22:02 UTC (rev 149) +++ trunk/jaxx/src/java/jaxx/runtime/JAXXObject.java 2008-01-12 19:22:32 UTC (rev 150) @@ -10,6 +10,7 @@ * Retrieves an object defined in an XML tag by its ID. * * @param id the id of the component to retrieve + * @return the object */ public Object getObjectById(String id);

1 0