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); }