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

r229 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 04:01:29 +0000 (Sat, 15 Mar 2008) New Revision: 229 Modified: trunk/maven-jaxx-plugin/pom.xml Log: generate source Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-03-11 00:04:52 UTC (rev 228) +++ trunk/maven-jaxx-plugin/pom.xml 2008-03-15 04:01:29 UTC (rev 229) @@ -58,7 +58,21 @@  <packaging>maven-plugin</packaging> - + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build>

1 0

r228 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org March 11, 2008

March 11, 2008

Author: tchemit Date: 2008-03-11 00:04:52 +0000 (Tue, 11 Mar 2008) New Revision: 228 Modified: trunk/jaxx/ Log: svn ignore target Property changes on: trunk/jaxx ___________________________________________________________________ Name: svn:ignore + target

1 0

r227 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org March 10, 2008

March 10, 2008

Author: tchemit Date: 2008-03-10 23:30:28 +0000 (Mon, 10 Mar 2008) New Revision: 227 Modified: trunk/maven-jaxx-plugin/ Log: svn ignore target Property changes on: trunk/maven-jaxx-plugin ___________________________________________________________________ Name: svn:ignore + target

1 0

r226 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 24, 2008

Feb. 24, 2008

Author: tchemit Date: 2008-02-24 21:34:35 +0000 (Sun, 24 Feb 2008) New Revision: 226 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: permettred'avoir la main sur l'init des modeles Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-24 18:53:03 UTC (rev 225) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-24 21:34:35 UTC (rev 226) @@ -29,6 +29,7 @@ import java.lang.reflect.Field; import java.util.Map; import java.util.TreeMap; +import java.util.Set; /** * Une usine pour les Tabs, leur configs et leur mod�les @@ -86,6 +87,10 @@ } } + public Set<String> keySet() { + return cache.keySet(); + } + public TabContentConfig getConfig(String tabName) { checkRegistredConfig(tabName); return configs.get(tabName); @@ -95,7 +100,7 @@ return cache.get(tabName); } - public TabModel getModel(String tabName) { + public TabModel getModel(String tabName,Object... params) { if (models.containsKey(tabName)) { return models.get(tabName); @@ -103,7 +108,7 @@ TabContentConfig config = getConfig(tabName); TabModel tabModel; try { - tabModel = config.model().newInstance(); + tabModel = initTabModel(config,params); if (log.isDebugEnabled()) { log.debug("new tab model : " + tabModel); } @@ -114,6 +119,12 @@ return tabModel; } + protected TabModel initTabModel(TabContentConfig config, Object... params) throws InstantiationException, IllegalAccessException { + TabModel tabModel; + tabModel = config.model().newInstance(); + return tabModel; + } + public void showTab(final JTabbedPane container, String tabName) { TabContentConfig config = getConfig(tabName); @@ -157,6 +168,7 @@ public void resetCache() { cache.clear(); + models.clear(); }

1 0

r225 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 24, 2008

Feb. 24, 2008

Author: tchemit Date: 2008-02-24 18:53:03 +0000 (Sun, 24 Feb 2008) New Revision: 225 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: modification recuperation hideActionText TODO a revoir car cela ne sert pas a grand chose puisque la valeur par defaut est false dans swing... Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-24 18:51:57 UTC (rev 224) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-24 18:53:03 UTC (rev 225) @@ -121,7 +121,6 @@ } Boolean value = (Boolean) action.getValue("hideActionText"); - component.setHideActionText(value != null && value); action.setEnabled(true); result.add(action); @@ -325,8 +324,12 @@ } //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - - result.putValue("hideActionText", anno.hideActionText()); + if (component == null) { + result.putValue("hideActionText", anno.hideActionText()); + } else { + boolean actionText = component.getHideActionText(); + result.putValue("hideActionText", anno.hideActionText() || actionText); + } result.putValue(Action.SELECTED_KEY, anno.selected()); result.setEnabled(anno.enabled());

1 0

r224 - in trunk/jaxx/src/main/java/jaxx: . util
by tchemit＠users.labs.libre-entreprise.org Feb. 24, 2008

Feb. 24, 2008

Author: tchemit Date: 2008-02-24 18:51:57 +0000 (Sun, 24 Feb 2008) New Revision: 224 Added: trunk/jaxx/src/main/java/jaxx/util/ trunk/jaxx/src/main/java/jaxx/util/SimplePaginationEnum.java Log: ajout d'une enum pour definir une suite d'entiers (utilise sur un composant Paginationpar exemple) Added: trunk/jaxx/src/main/java/jaxx/util/SimplePaginationEnum.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/util/SimplePaginationEnum.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/util/SimplePaginationEnum.java 2008-02-24 18:51:57 UTC (rev 224) @@ -0,0 +1,47 @@ +/* +* ##% Copyright (C) 2007, 2008 Code Lutin, Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.util; + +/** + * Une enumration pour definir les tailles de liste + * + * @author chemit + */ +public enum SimplePaginationEnum { + _5, + _10, + _20, + _50, + _100; + + int intValue; + + SimplePaginationEnum() { + intValue = Integer.valueOf(toString()); + } + + @Override + public String toString() { + return super.toString().substring(1); + } + + public int intValue() { + return intValue; + } + +}

1 0

r223 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 22, 2008

Feb. 22, 2008

Author: tchemit Date: 2008-02-22 14:33:49 +0000 (Fri, 22 Feb 2008) New Revision: 223 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: changement log Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-22 00:16:10 UTC (rev 222) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-22 14:33:49 UTC (rev 223) @@ -71,7 +71,9 @@ JAXXTab instance; try { instance = config.impl().newInstance(); - log.info("new tab : " + instance); + if (log.isDebugEnabled()) { + log.debug("new tab : " + instance); + } cache.put(tabName, instance); @@ -102,7 +104,9 @@ TabModel tabModel; try { tabModel = config.model().newInstance(); - log.info("new tab model : " + tabModel); + if (log.isDebugEnabled()) { + log.debug("new tab model : " + tabModel); + } models.put(tabName, tabModel); } catch (Exception e) { throw new RuntimeException(e); @@ -133,7 +137,9 @@ int index = getTabIndex(container, comp); if (index != -1) { container.removeTabAt(index); - log.debug(config + " index " + index); + if (log.isDebugEnabled()) { + log.debug(config + " index " + index); + } } }

1 0

r222 - in trunk/maven-jaxx-plugin: . src/main/java/jaxx src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org Feb. 22, 2008

Feb. 22, 2008

Author: tchemit Date: 2008-02-22 00:16:10 +0000 (Fri, 22 Feb 2008) New Revision: 222 Removed: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxcAntTask.java Modified: trunk/maven-jaxx-plugin/pom.xml trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: suppression tache ant Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-02-22 00:12:22 UTC (rev 221) +++ trunk/maven-jaxx-plugin/pom.xml 2008-02-22 00:16:10 UTC (rev 222) @@ -25,12 +25,6 @@ <version>1.0.4-SNAPSHOT</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - <scope>compile</scope> - </dependency> </dependencies>  Modified: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-02-22 00:12:22 UTC (rev 221) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-02-22 00:16:10 UTC (rev 222) @@ -21,7 +21,6 @@ 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; @@ -59,11 +58,6 @@ * @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 @@ -87,8 +81,6 @@ private static final String[] INCLUDES = {"**\\/*.jaxx"}; - private static final String[] INCLUDES_JAVA = {"**\\/*.java"}; - public void execute() throws MojoExecutionException, MojoFailureException { DirectoryScanner ds; @@ -105,7 +97,6 @@ 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()); for (String file : files) { log.debug(file); @@ -115,32 +106,6 @@ 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() { @@ -150,7 +115,6 @@ result.setJavacOpts(getJavaOpts()); } result.setKeepJavaFiles(true); - result.setRunJavac(isRunJavac()); result.setOptimize(isOptimize()); result.setJavacTargetDirectory(getClassOut()); result.setTargetDirectory(getOut()); @@ -179,10 +143,6 @@ return classOut; } - public boolean isRunJavac() { - return runJavac; - } - public String[] getIncludes() { return includes; } @@ -203,10 +163,6 @@ this.classOut = classOut; } - public void setRunJavac(boolean runJavac) { - this.runJavac = runJavac; - } - public void setSrc(File src) { this.src = src; } Deleted: trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxcAntTask.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxcAntTask.java 2008-02-22 00:12:22 UTC (rev 221) +++ trunk/maven-jaxx-plugin/src/main/java/jaxx/JaxxcAntTask.java 2008-02-22 00:16:10 UTC (rev 222) @@ -1,188 +0,0 @@ -/* - * Copyright 2006 Ethan Nicholas. All rights reserved. - * Use is subject to license terms. - */ -package jaxx; - -import jaxx.compiler.CompilerOptions; -import jaxx.compiler.JAXXCompiler; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.util.GlobPatternMapper; -import org.apache.tools.ant.util.SourceFileScanner; - -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -public class JaxxcAntTask extends MatchingTask { - private File srcDir; - private File destDir; - private String classPath; - private boolean keepJavaFiles; - private boolean optimize; - private boolean runJavac = true; - private String javacOpts; - protected File[] compileList = new File[0]; - - // add dt.jar to the system class path so Introspector will find the JAXXBeanInfos - @Override - public void init() { - URL resourceURL = JaxxcAntTask.class.getClassLoader().getResource("javax/swing/JButtonBeanInfo.class"); - String resourceString = resourceURL != null ? resourceURL.toString() : null; - if (resourceURL == null || !resourceString.startsWith("jar:")) - throw new BuildException("could not find dt.jar on classpath"); - try { - URL jarURL = new URL(resourceString.substring("jar:".length(), resourceString.indexOf("!"))); - URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader(); - Method addURL = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class}); - addURL.setAccessible(true); - addURL.invoke(classLoader, jarURL); - } - catch (Exception e) { - throw new BuildException(e); - } - } - - @Override - public void execute() { - checkParameters(); - resetFileLists(); - DirectoryScanner ds = getDirectoryScanner(srcDir); - String[] files = ds.getIncludedFiles(); - scanDir(srcDir, destDir != null ? destDir : srcDir, files); - if (compileList.length > 0) { - log("Compiling " + compileList.length + " source file" - + (compileList.length == 1 ? "" : "s") - + (destDir != null ? " to " + destDir : "")); - compile(); - } - } - - private void checkParameters() { - if (srcDir == null) { - throw new BuildException("srcdir attribute must be set!", - getLocation()); - } - - if (!srcDir.isDirectory()) { - throw new BuildException("source directory \"" - + srcDir - + "\" does not exist " - + "or is not a directory", getLocation()); - } - - if (destDir != null && !destDir.isDirectory()) { - throw new BuildException("destination directory \"" - + destDir - + "\" does not exist " - + "or is not a directory", getLocation()); - } - } - - - private void compile() { - CompilerOptions options = new CompilerOptions(); - if (classPath == null) - classPath = srcDir.getPath(); - else - classPath = srcDir + File.pathSeparator + classPath; - options.setClassPath(classPath); - options.setTargetDirectory(destDir); - options.setKeepJavaFiles(keepJavaFiles); - options.setOptimize(optimize); - options.setRunJavac(runJavac); - options.setJavacOpts(javacOpts); - String[] files = new String[compileList.length]; - for (int i = 0; i < compileList.length; i++) - if (compileList[i].getPath().startsWith(srcDir.getPath())) { - files[i] = compileList[i].getPath().substring(srcDir.getPath().length()); - if (files[i].startsWith(File.separator)) - files[i] = files[i].substring(1); - } else - files[i] = compileList[i].getPath(); - if (!JAXXCompiler.compile(srcDir, files, options)) - throw new BuildException("Aborting due to errors reported by jaxxc"); - } - - public void setSrcDir(File srcDir) { - this.srcDir = srcDir; - } - - public void setDestDir(File destDir) { - this.destDir = destDir; - } - - public void setClassPath(String classPath) { - this.classPath = classPath; - } - - public void setKeepJavaFiles(boolean keepJavaFiles) { - this.keepJavaFiles = keepJavaFiles; - } - - public void setOptimize(boolean optimize) { - this.optimize = optimize; - } - - public void setRunJavac(boolean runJavac) { - this.runJavac = runJavac; - } - - public void setJavacOptions(String javacOpts) { - this.javacOpts = javacOpts; - } - - /** Clear the list of files to be compiled and copied.. */ - protected void resetFileLists() { - compileList = new File[0]; - } - - - /** - * Scans the directory looking for source files to be compiled. - * The results are returned in the class variable compileList - * - * @param srcDir The source directory - * @param destDir The destination directory - * @param files An array of filenames - */ - protected void scanDir(File srcDir, File destDir, String[] files) { - GlobPatternMapper m = new GlobPatternMapper(); - m.setFrom("*.jaxx"); - m.setTo("*.class"); - SourceFileScanner sfs = new SourceFileScanner(this); - File[] jaxxFiles = sfs.restrictAsFiles(files, srcDir, destDir, m); - m.setFrom("*.css"); - File[] cssFiles = sfs.restrictAsFiles(files, srcDir, destDir, m); - m.setFrom("*.script"); - File[] scriptFiles = sfs.restrictAsFiles(files, srcDir, destDir, m); - - Set<File> newFiles = new HashSet<File>(Arrays.asList(jaxxFiles)); - // if we find an updated .css or .script file, check for a corresponding .jaxx file - for (File cssFile : cssFiles) { - String path = cssFile.getPath(); - File jaxxFile = new File(path.substring(0, path.length() - ".css".length()) + ".jaxx"); - if (jaxxFile.exists()) - newFiles.add(jaxxFile); - } - for (File scriptFile : scriptFiles) { - String path = scriptFile.getPath(); - File jaxxFile = new File(path.substring(0, path.length() - ".script".length()) + ".jaxx"); - if (jaxxFile.exists()) - newFiles.add(jaxxFile); - } - - if (newFiles.size() > 0) { - File[] newCompileList = new File[compileList.length + newFiles.size()]; - System.arraycopy(compileList, 0, newCompileList, 0, compileList.length); - System.arraycopy(newFiles.toArray(), 0, newCompileList, compileList.length, newFiles.size()); - compileList = newCompileList; - } - } -} Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-22 00:12:22 UTC (rev 221) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-22 00:16:10 UTC (rev 222) @@ -61,9 +61,7 @@ goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); - //TODO Use the maven plexus TestCase inorder to include dependencies - goal.setRunJavac(false); - //goal.setRunJavac(anno.runJavac()); + //TODO Use the maven plexus TestCase inorder to include dependencies goal.setJavaOpts(anno.javaOpts()); System.out.println(getName()); @@ -96,17 +94,23 @@ public void testErrors() throws MojoExecutionException, MojoFailureException { } - @CompileConfig(packageName = "Initializers", runJavac = true) + @CompileConfig(packageName = "Initializers", runJavac = false) public void testInitializers() throws MojoExecutionException, MojoFailureException { goal.execute(); } - @CompileConfig(packageName = "Script", runJavac = true) + @CompileConfig(packageName = "Script", runJavac = false) public void testScript() throws MojoExecutionException, MojoFailureException { - goal.execute(); + 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); + } } - @CompileConfig(packageName = "OverridingDataBindings", runJavac = true) + @CompileConfig(packageName = "OverridingDataBindings", runJavac = false) public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { goal.execute(); }

1 0

r221 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Feb. 22, 2008

Feb. 22, 2008

Author: tchemit Date: 2008-02-22 00:12:22 +0000 (Fri, 22 Feb 2008) New Revision: 221 Modified: trunk/jaxx/pom.xml Log: suppression dependance lutinwidget a ce niveau Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-21 23:49:41 UTC (rev 220) +++ trunk/jaxx/pom.xml 2008-02-22 00:12:22 UTC (rev 221) @@ -16,15 +16,8 @@ <artifactId>jaxx</artifactId> <dependencies> -  <dependency> <groupId>lutinlib</groupId> - <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>lutinlib</groupId> <artifactId>lutinutil</artifactId> <version>0.29-SNAPSHOT</version> <scope>compile</scope>

1 0

r220 - in trunk/jaxx: . src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Feb. 21, 2008

Feb. 21, 2008

Author: tchemit Date: 2008-02-21 23:49:41 +0000 (Thu, 21 Feb 2008) New Revision: 220 Removed: trunk/jaxx/src/main/java/jaxx/compiler/JavaCCompiler.java Modified: trunk/jaxx/pom.xml trunk/jaxx/src/main/java/jaxx/compiler/CompilerOptions.java trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java Log: suppression fonctionnalit?\195?\169 javac du generateur jaxx Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-21 21:03:46 UTC (rev 219) +++ trunk/jaxx/pom.xml 2008-02-21 23:49:41 UTC (rev 220) @@ -29,13 +29,6 @@ <version>0.29-SNAPSHOT</version> <scope>compile</scope> </dependency> -  - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.6.0</version> - <scope>compile</scope> - </dependency>  <dependency> <groupId>com.sun</groupId> Modified: trunk/jaxx/src/main/java/jaxx/compiler/CompilerOptions.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/CompilerOptions.java 2008-02-21 21:03:46 UTC (rev 219) +++ trunk/jaxx/src/main/java/jaxx/compiler/CompilerOptions.java 2008-02-21 23:49:41 UTC (rev 220) @@ -11,7 +11,6 @@ private File javacTargetDirectory; private String classPath; private String javacOpts; - private boolean runJavac; private boolean keepJavaFiles; private boolean optimize; @@ -121,31 +120,6 @@ /** - * Returns whether or not <code>javac</code> should be run against the generated Java files. - * - * @return <code>true</code> if generated Java files should be compiled using <code>javac</code> - * @see #setRunJavac - */ - public boolean getRunJavac() { - return runJavac; - } - - - /** - * Sets whether or not <code>javac</code> is run against the generated Java files. Setting - * runJavac to <code>false</code> implies a <code>true</code> value for keepJavaFiles. - * - * @param runJavac <code>true</code> to compile generated Java files using <code>javac</code> - * @see #getRunJavac - */ - public void setRunJavac(boolean runJavac) { - this.runJavac = runJavac; - if (!runJavac) - setKeepJavaFiles(true); - } - - - /** * Returns whether or not optimization should be performed. * * @return whether or not optimizations should be performed Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-21 21:03:46 UTC (rev 219) +++ trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-21 23:49:41 UTC (rev 220) @@ -1871,24 +1871,6 @@ } } - // javac - if (success && options.getRunJavac()) { - assert jaxxFiles.size() == jaxxFileClassNames.size(); - for (String className : jaxxFileClassNames) { - JAXXCompiler compiler = compilers.get(className); - if (compiler == null) { - throw new CompilerException("Internal error: could not find compiler for " + className + " during compilation"); - } - boolean keepJavaFiles = compiler.getOptions().getKeepJavaFiles(); - JavaCCompiler.runJavac(compiler); - if (compiler.failed) { - success = false; - } else if (!keepJavaFiles) { - compiler.getDest().delete(); - } - } - } - if (warningCount == 1) { System.err.println("1 warning"); } else if (warningCount > 0) { @@ -1926,7 +1908,6 @@ System.out.println(" -classpath <paths> paths to search for user classes"); System.out.println(" -cp <paths> same as -classpath"); System.out.println(" -d <directory> target directory for generated class files"); - System.out.println(" -javac_opts <opts> options to pass to javac"); System.out.println(" -java or -j produce .java files, but do not compile them"); System.out.println(" -keep or -k preserve generated .java files after compilation"); System.out.println(" -optimize or -o optimize during compilation"); @@ -1979,7 +1960,6 @@ options.setKeepJavaFiles(true); else if (arg[i].equals("-j") || arg[i].equals("-java")) { options.setKeepJavaFiles(true); - options.setRunJavac(false); } else if (arg[i].equals("-o") || arg[i].equals("-optimize")) options.setOptimize(true); else if (arg[i].equals("-version")) { Deleted: trunk/jaxx/src/main/java/jaxx/compiler/JavaCCompiler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/JavaCCompiler.java 2008-02-21 21:03:46 UTC (rev 219) +++ trunk/jaxx/src/main/java/jaxx/compiler/JavaCCompiler.java 2008-02-21 23:49:41 UTC (rev 220) @@ -1,130 +0,0 @@ -/* - * 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

r219 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Feb. 21, 2008

Feb. 21, 2008

Author: tchemit Date: 2008-02-21 21:03:46 +0000 (Thu, 21 Feb 2008) New Revision: 219 Removed: trunk/maven-jaxx-plugin/profiles.xml Modified: trunk/maven-jaxx-plugin/pom.xml Log: on utilisepasle profiles.xml positionnement phase Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-02-21 18:45:15 UTC (rev 218) +++ trunk/maven-jaxx-plugin/pom.xml 2008-02-21 21:03:46 UTC (rev 219) @@ -75,4 +75,38 @@ <scm> <url>${maven.scm.url}</url> </scm> + + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>user.locale</name> + <value>ISO-8859-15</value> + </property> + </activation> + <properties> + +  + <labs.id>38</labs.id> + +  + <labs.project>buix</labs.project> + +  + <maven.test.skip>false</maven.test.skip> + +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> + +  + <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> + +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> + + </properties> + </profile> + </profiles> </project> Deleted: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-02-21 18:45:15 UTC (rev 218) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-02-21 21:03:46 UTC (rev 219) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings> - <profiles> - <profile> - <id>project</id> - <properties> - -  - <labs.id>38</labs.id> - -  - <labs.project>buix</labs.project> - -  - <maven.test.skip>false</maven.test.skip> - -  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> - -  - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> - -  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> - - </properties> - </profile> - </profiles> -</settings>

1 0

r218 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 21, 2008

Feb. 21, 2008

Author: tchemit Date: 2008-02-21 18:45:15 +0000 (Thu, 21 Feb 2008) New Revision: 218 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: supression log + i18n Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-21 12:33:59 UTC (rev 217) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-21 18:45:15 UTC (rev 218) @@ -151,7 +151,9 @@ if (cache.containsKey(actionKey)) { // use cached action AbstractAction action = cache.get(actionKey); - log.info("use cache action "+action); + if (log.isDebugEnabled()) { + log.debug("use cache action " + action); + } return action; } return null; @@ -176,7 +178,9 @@ result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - log.info("create action "+actionKey + " : " + result); + if (log.isDebugEnabled()) { + log.debug("create action " + actionKey + " : " + result); + } // recherche de l'annotation de configuration ActionConfig anno = initActionConfig(component, result);

1 0

r217 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org Feb. 21, 2008

Feb. 21, 2008

Author: tchemit Date: 2008-02-21 12:33:59 +0000 (Thu, 21 Feb 2008) New Revision: 217 Removed: trunk/jaxx/profiles.xml Modified: trunk/jaxx/pom.xml Log: on utilise plus le fichier profiles.xmlcar il n'est pas bien detecte dans les ide, de plus nous n'avons qu'un seul profile toujours active... suppression lutin-processor car rien a processer! Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-19 15:09:24 UTC (rev 216) +++ trunk/jaxx/pom.xml 2008-02-21 12:33:59 UTC (rev 217) @@ -80,6 +80,37 @@ <packaging>jar</packaging> + <profiles> + <profile> + <id>project</id> + + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <properties> + +  + <labs.id>38</labs.id> + +  + <labs.project>buix</labs.project> + +  +  + +  + <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> + +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection> + +  + <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class> + + </properties> + </profile> + </profiles>    Deleted: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-02-19 15:09:24 UTC (rev 216) +++ trunk/jaxx/profiles.xml 2008-02-21 12:33:59 UTC (rev 217) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings> - <profiles> - <profile> - <id>project</id> - - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> - -  - <labs.id>38</labs.id> - -  - <labs.project>buix</labs.project> - -  -  - -  - <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> - -  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection> - -  - <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class> - - </properties> - </profile> - </profiles> -</settings>

1 0

r216 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 19, 2008

Feb. 19, 2008

Author: tchemit Date: 2008-02-19 15:09:24 +0000 (Tue, 19 Feb 2008) New Revision: 216 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: add a simple ActionFactory implementation with a properties file as source Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-14 06:17:57 UTC (rev 215) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-19 15:09:24 UTC (rev 216) @@ -51,7 +51,7 @@ */ public abstract class ActionFactory { - private static Log log = LogFactory.getLog(ActionFactory.class); + protected static Log log = LogFactory.getLog(ActionFactory.class); /** dictionary of known actions implementations */ private Map<String, Class<? extends AbstractAction>> impls; @@ -123,6 +123,7 @@ Boolean value = (Boolean) action.getValue("hideActionText"); component.setHideActionText(value != null && value); + action.setEnabled(true); result.add(action); continue; } @@ -142,6 +143,19 @@ return result.toArray(new AbstractAction[result.size()]); } + public AbstractAction newAction0(String actionKey) { + // on v�rifie que l'action existe bien + checkRegistredAction(actionKey); + + // try in cache + if (cache.containsKey(actionKey)) { + // use cached action + AbstractAction action = cache.get(actionKey); + log.info("use cache action "+action); + return action; + } + return null; + } /** * @param actionKey le nom de l'action tel que d�finie dans le fichier * de mapping (sans le prefix action.) @@ -150,22 +164,19 @@ */ public AbstractAction newAction(String actionKey, AbstractButton component) { - // on v�rifie que l'action existe bien - checkRegistredAction(actionKey); - - // try in cache - if (cache.containsKey(actionKey)) { - // use cached action - return cache.get(actionKey); + // try first in cache + AbstractAction result =newAction0(actionKey); + if (result!=null) { + return result; } // on r�cup�re la classe d'implantation de l'action Class<? extends AbstractAction> klazz = impls.get(actionKey); try { - AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - log.debug(actionKey + " : " + result); + log.info("create action "+actionKey + " : " + result); // recherche de l'annotation de configuration ActionConfig anno = initActionConfig(component, result); @@ -216,20 +227,17 @@ */ public AbstractAction newAction(String actionKey, JComboBox component) { - // on v�rifie que l'action existe bien - checkRegistredAction(actionKey); - - // try in cache - if (cache.containsKey(actionKey)) { - // use cached action - return cache.get(actionKey); + // try first in cache + AbstractAction result =newAction0(actionKey); + if (result!=null) { + return result; } // on r�cup�re la classe d'implantation de l'action Class<? extends AbstractAction> klazz = impls.get(actionKey); try { - AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); log.debug(actionKey + " : " + result); @@ -316,7 +324,7 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(component!=null && (component.isEnabled() || anno.enabled())); + result.setEnabled(anno.enabled()); } return anno; Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java 2008-02-19 15:09:24 UTC (rev 216) @@ -0,0 +1,118 @@ +/* +* ##% Copyright (C) 2007, 2008 Code Lutin, Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import static org.codelutin.i18n.I18n._; +import org.codelutin.util.Resource; + +import javax.swing.AbstractAction; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.TreeMap; + +/** + * A simple implementation of {@link ActionFactory} using a properties file to + * load action mapping. + * + * An entry is in that form : <code>action.actionName=fqn</code> where + * + * <code>actionName</code> is the key of action used in factory, and + * <code>fqn</code> is the fully qualified name of the implemented action class. + * + * @author chemit + */ +public class SimpleActionFactoryImpl extends ActionFactory { + /** default file where to load action mapping */ + protected static final String ACTIONS_FILE_PATH = "/actions.properties"; + + /** default prefix for an entryin mapping file. */ + protected static final String ACTION_KEY_PREFIX = "action."; + + /** real file where to load actions mapping */ + protected String actionFilePath; + + public SimpleActionFactoryImpl() { + this(ACTIONS_FILE_PATH); + } + + public SimpleActionFactoryImpl(String actionFilePath) { + this.actionFilePath = actionFilePath; + } + + @SuppressWarnings({"unchecked"}) + protected Map<String, Class<? extends AbstractAction>> init() { + Properties properties = new Properties(); + List<URL> urls = Resource.getURLs(".*jaxx/.+-actions\\.properties"); + for (URL url : urls) { + InputStream inputStream=null; + try { + inputStream = url.openStream(); + log.info("load " + url); + properties.load(inputStream); + } catch (IOException e) { + log.warn(_("jaxx.error.load.actions.file", e.getMessage())); + //throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } finally { + if (inputStream!=null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn(_("jaxx.error.close.actions.file", e.getMessage())); + //throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } + } + } + } + Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); + int prefix = ACTION_KEY_PREFIX.length(); + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + String key = objectObjectEntry.getKey() + ""; + String qfn = objectObjectEntry.getValue() + ""; + try { + Class<? extends AbstractAction> implCass; + implCass = (Class<? extends AbstractAction>) Class.forName(qfn); + log.debug("found action " + implCass); + cache.put(key.substring(prefix), implCass); + } catch (ClassNotFoundException e) { + throw new RuntimeException(_("jaxx.error.load.actions.class", key, qfn)); + } + } + return cache; + } + + String[] getFilenames(Locale l) { + String prefix = ".*jaxx/.+"; + String postfix = "actions\\.properties"; + java.util.List<String> result = new ArrayList<String>(); + if (!"".equals(l.getLanguage())) { + if (!"".equals(l.getCountry())) { + result.add(prefix + "-" + l.getLanguage() + "_" + + l.getCountry() + postfix); + } + result.add(prefix + "-" + l.getLanguage() + postfix); + } + result.add(prefix + postfix); + return result.toArray(new String[result.size()]); + } +}

1 0

r215 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 14, 2008

Feb. 14, 2008

Author: tchemit Date: 2008-02-14 06:17:57 +0000 (Thu, 14 Feb 2008) New Revision: 215 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: les contenus de tab sont des JAXXTab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 21:31:13 UTC (rev 214) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-14 06:17:57 UTC (rev 215) @@ -89,7 +89,7 @@ return configs.get(tabName); } - public JComponent getUI(String tabName) { + public JAXXTab getUI(String tabName) { return cache.get(tabName); }

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 21:31:13 +0000 (Tue, 12 Feb 2008) New Revision: 214 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: pour le moment, il n'est pas possible de lancer la compilation sur les fichier g?\195?\169n?\195?\169r?\195?\169 car il nous faut lutinutil en dependance. TODO : utiliser un vrai test maven PlexusTestCase ou equivalent afin de pouvoir inclure facilement des dependances (ici lutinutil) Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-12 21:12:54 UTC (rev 213) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-12 21:31:13 UTC (rev 214) @@ -61,7 +61,9 @@ goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); - goal.setRunJavac(anno.runJavac()); + //TODO Use the maven plexus TestCase inorder to include dependencies + goal.setRunJavac(false); + //goal.setRunJavac(anno.runJavac()); goal.setJavaOpts(anno.javaOpts()); System.out.println(getName());

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 21:12:54 +0000 (Tue, 12 Feb 2008) New Revision: 213 Modified: trunk/jaxx/pom.xml Log: ajout dependance sur javaHelp 2 Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:46:18 UTC (rev 212) +++ trunk/jaxx/pom.xml 2008-02-12 21:12:54 UTC (rev 213) @@ -44,6 +44,12 @@ <scope>system</scope> <systemPath>${java.home}/../lib/dt.jar</systemPath> </dependency> +  + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + <version>2.0.02</version> + </dependency> </dependencies>

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 16:46:18 +0000 (Tue, 12 Feb 2008) New Revision: 212 Modified: trunk/jaxx/pom.xml Log: rendez moi les accents... Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:40:30 UTC (rev 211) +++ trunk/jaxx/pom.xml 2008-02-12 16:46:18 UTC (rev 212) @@ -36,7 +36,7 @@ <version>1.6.0</version> <scope>compile</scope> </dependency> -  +  <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId>

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 16:40:30 +0000 (Tue, 12 Feb 2008) New Revision: 211 Modified: trunk/jaxx/pom.xml Log: retour en arri?\195?\168re c maven qui changera la version tout seul Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:23:10 UTC (rev 210) +++ trunk/jaxx/pom.xml 2008-02-12 16:40:30 UTC (rev 211) @@ -1,7 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +36,7 @@ <version>1.6.0</version> <scope>compile</scope> </dependency> -  +  <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> @@ -54,7 +51,7 @@  <name>Jaxx core library</name> - <version>1.0.5</version> + <version>1.0.4-SNAPSHOT</version> <description>Library of framework jaxx</description> <inceptionYear>2008</inceptionYear>

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 16:23:10 +0000 (Tue, 12 Feb 2008) New Revision: 210 Modified: trunk/jaxx/pom.xml Log: modification configuration pour permettre les realese maven Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:21:51 UTC (rev 209) +++ trunk/jaxx/pom.xml 2008-02-12 16:23:10 UTC (rev 210) @@ -54,7 +54,7 @@  <name>Jaxx core library</name> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5</version> <description>Library of framework jaxx</description> <inceptionYear>2008</inceptionYear>

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 16:21:51 +0000 (Tue, 12 Feb 2008) New Revision: 209 Modified: trunk/jaxx/pom.xml trunk/jaxx/profiles.xml Log: modification configuration pour permettre les realese maven Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 15:42:33 UTC (rev 208) +++ trunk/jaxx/pom.xml 2008-02-12 16:21:51 UTC (rev 209) @@ -85,7 +85,8 @@ this property (see in the parent pom for more explanation) --> <scm> - <url>${maven.scm.url}</url> + <developerConnection>${maven.scm.developerConnection}</developerConnection> +  </scm> </project> Modified: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-02-12 15:42:33 UTC (rev 208) +++ trunk/jaxx/profiles.xml 2008-02-12 16:21:51 UTC (rev 209) @@ -17,10 +17,10 @@ <labs.project>buix</labs.project>  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project}</maven.scm.url> +   - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> + <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection>  <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection>

1 0

r208 - trunk/jaxx/src/main/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 15:42:33 +0000 (Tue, 12 Feb 2008) New Revision: 208 Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java Log: ajout support i18n dans jaxx :) les attributs text, title et toolTipText sont automatiquement encapsul?\195?\169s par un I18n._("XXX"), sauf si cela est d?\195?\169j?\195?\160 fait dans quel cas, on affiche un warning. Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-02-12 15:39:54 UTC (rev 207) +++ trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-02-12 15:42:33 UTC (rev 208) @@ -20,15 +20,19 @@ import java.beans.IntrospectionException; import java.io.IOException; import java.lang.reflect.Field; +import java.util.List; +import java.util.Arrays; public class DefaultComponentHandler extends DefaultObjectHandler { private String containerDelegate; + private static final List<String> I18N_ATTRIBUTES = Arrays.asList("text","title","toolTipText"); public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); - if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, Component.class); + /*if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { throw new IllegalArgumentException(getClass().getName() + " does not support the class " + beanClass.getName()); - } + }*/ } @Override @@ -82,10 +86,11 @@ protected void openComponent(CompiledObject object, Element tag, JAXXCompiler compiler) throws CompilerException { String constraints = tag.getAttribute("constraints"); - if (constraints != null && constraints.length() > 0) + if (constraints != null && constraints.length() > 0) { compiler.openComponent(object, constraints); - else + } else { compiler.openComponent(object); + } } protected void closeComponent(CompiledObject object, Element tag, JAXXCompiler compiler) throws CompilerException { @@ -100,32 +105,39 @@ @Override public ClassDescriptor getPropertyType(CompiledObject object, String propertyName, JAXXCompiler compiler) throws CompilerException { if (propertyName.equals("x") || propertyName.equals("y") || propertyName.equals("width") || propertyName.equals("height") || - propertyName.equals("font-size")) + "font-size".equals(propertyName)) return ClassDescriptorLoader.getClassDescriptor(Integer.class); - if (propertyName.equals("font-face") || propertyName.equals("font-style") || propertyName.equals("font-weight")) + if (propertyName.equals("font-face") || propertyName.equals("font-style") || propertyName.equals("font-weight")) { return ClassDescriptorLoader.getClassDescriptor(String.class); + } return super.getPropertyType(object, propertyName, compiler); } @Override public String getGetPropertyCode(String id, String name, JAXXCompiler compiler) throws CompilerException { - if (name.equals("font-face")) + if (name.equals("font-face")) { return id + ".getFont().getFontName()"; - if (name.equals("font-size")) + } + if (name.equals("font-size")) { return id + ".getFont().getSize()"; - if (name.equals("font-weight")) + } + if (name.equals("font-weight")) { return "(" + id + ".getFont().getStyle() & Font.BOLD) != 0 ? \"bold\" : \"normal\""; - if (name.equals("font-style")) + } + if (name.equals("font-style")) { return "(" + id + ".getFont().getStyle() & Font.ITALIC) != 0 ? \"italic\" : \"normal\""; + } return super.getGetPropertyCode(id, name, compiler); } @Override public String getSetPropertyCode(String id, String name, String valueCode, JAXXCompiler compiler) throws CompilerException { - if (name.equals("x")) + if (name.equals("x")) { return id + ".setLocation(" + valueCode + ", " + id + ".getY());"; - if (name.equals("y")) + } + if (name.equals("y")) { return id + ".setLocation(" + id + ".getX(), " + valueCode + ");"; + } if (name.equals("width")) { // need to optimize case when both width and height are being assigned return "jaxx.runtime.Util.setComponentWidth(" + id + "," + valueCode + ");\n"; } @@ -139,34 +151,49 @@ return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont((float) " + valueCode + "));"; } if (name.equals("font-weight")) { - if (valueCode.equals("\"bold\"")) + if (valueCode.equals("\"bold\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.BOLD));"; - if (valueCode.equals("\"normal\"")) + } + if (valueCode.equals("\"normal\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.BOLD));"; - if (!valueCode.startsWith("\"")) + } + if (!valueCode.startsWith("\"")) { return "if (" + id + ".getFont() != null) { if ((" + valueCode + ").equals(\"bold\")) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.BOLD)); else " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.BOLD)); }"; + } compiler.reportError("font-weight must be either \"normal\" or \"bold\", found " + valueCode); return ""; } if (name.equals("font-style")) { - if (valueCode.equals("\"italic\"")) + if (valueCode.equals("\"italic\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.ITALIC));"; - if (valueCode.equals("\"normal\"")) + } + if (valueCode.equals("\"normal\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.ITALIC));"; - if (!valueCode.startsWith("\"")) + } + if (!valueCode.startsWith("\"")) { return "if (" + id + ".getFont() != null) { if ((" + valueCode + ").equals(\"italic\")) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.ITALIC)); else " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.ITALIC)); }"; + } compiler.reportError("font-style must be either \"normal\" or \"italic\", found " + valueCode); return ""; } if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass()) && name.equals("layout")) { // handle containerDelegate (e.g. contentPane on JFrame) String containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); - if (containerDelegate != null) + if (containerDelegate != null) { return id + '.' + containerDelegate + "().setLayout(" + valueCode + ");"; + } } + // ajout du support i18n + if (I18N_ATTRIBUTES.contains(name)) { + if (valueCode.contains("_(") || valueCode.contains(")")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '"+name+"' in component '"+id+"'"); + } else { + valueCode = "_(" + valueCode + ")"; + } + } return super.getSetPropertyCode(id, name, valueCode, compiler); } @@ -187,23 +214,19 @@ */ protected int constantValue(String key, String value) { if ((key.equals("mnemonic") || key.equals("displayedMnemonic"))) { - if (value.length() == 1) + if (value.length() == 1) { return value.charAt(0); - else { - try { - Field vk = java.awt.event.KeyEvent.class.getField(value); - return (Integer) vk.get(null); - } - catch (NoSuchFieldException e) { - throw new IllegalArgumentException("mnemonics must be either a single character or the name of a field in KeyEvent (found: '" + value + "')"); - } - catch (IllegalAccessException e) { - throw new RuntimeException(e); - } } - } else { - return super.constantValue(key, value); + try { + Field vk = java.awt.event.KeyEvent.class.getField(value); + return (Integer) vk.get(null); + } catch (NoSuchFieldException e) { + throw new IllegalArgumentException("mnemonics must be either a single character or the name of a field in KeyEvent (found: '" + value + "')"); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } } + return super.constantValue(key, value); } @@ -219,12 +242,12 @@ if (container) { try { init(); - } - catch (IntrospectionException e) { + if (Boolean.FALSE.equals(getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("isContainer"))) { + container = false; + } + } catch (IntrospectionException e) { throw new RuntimeException(e); } - if (Boolean.FALSE.equals(getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("isContainer"))) - container = false; } return container; } @@ -233,11 +256,10 @@ public String getContainerDelegate() { try { init(); - } - catch (IntrospectionException e) { + return containerDelegate; + } catch (IntrospectionException e) { throw new RuntimeException(e); } - return containerDelegate; } } \ No newline at end of file

1 0

r207 - tags
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 15:39:54 +0000 (Tue, 12 Feb 2008) New Revision: 207 Added: tags/jaxx-1.0.4-avant-i18n/ Log: tag avant support i18n Copied: tags/jaxx-1.0.4-avant-i18n (from rev 206, trunk/jaxx)

1 0

r206 - trunk/jaxx/src/main/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 14:32:02 +0000 (Tue, 12 Feb 2008) New Revision: 206 Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultObjectHandler.java Log: formattage code Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/DefaultObjectHandler.java 2008-02-12 13:52:27 UTC (rev 205) +++ trunk/jaxx/src/main/java/jaxx/tags/DefaultObjectHandler.java 2008-02-12 14:32:02 UTC (rev 206) @@ -163,8 +163,7 @@ public JAXXBeanInfo getJAXXBeanInfo() { try { init(); - } - catch (IntrospectionException e) { + } catch (IntrospectionException e) { throw new RuntimeException(e); } return jaxxBeanInfo; @@ -197,16 +196,15 @@ public ClassDescriptor getPropertyType(CompiledObject object, String propertyName, JAXXCompiler compiler) { try { init(); - } - catch (IntrospectionException e) { + } catch (IntrospectionException e) { throw new RuntimeException(e); } JAXXPropertyDescriptor property = properties.get(propertyName); - if (property != null) + if (property != null) { return property.getPropertyType(); - else - throw new UnsupportedAttributeException("property '" + propertyName + "' not found in " + object); + } + throw new UnsupportedAttributeException("property '" + propertyName + "' not found in " + object); } @@ -223,34 +221,34 @@ public boolean isMemberBound(String name) throws UnsupportedAttributeException { try { init(); - } - catch (IntrospectionException e) { + } catch (IntrospectionException e) { throw new RuntimeException(e); } - if (eventInfos != null && eventInfos.containsKey(name)) + if (eventInfos != null && eventInfos.containsKey(name)) { return true; + } - if (name.equals("getClass")) + if (name.equals("getClass")) { return false; + } String propertyName = null; - if (name.startsWith("get")) + if (name.startsWith("get")) { propertyName = Introspector.decapitalize(name.substring("get".length())); - else if (name.startsWith("is")) + } else if (name.startsWith("is")) { propertyName = Introspector.decapitalize(name.substring("is".length())); + } JAXXPropertyDescriptor property = propertyName != null ? properties.get(propertyName) : null; if (property != null) { return property.isBound(); - } else { // check to see if it is a field - try { - FieldDescriptor field = getBeanClass().getFieldDescriptor(name); - return Modifier.isFinal(field.getModifiers()); // final fields might as well be considered bound -- they can't be modified anyway - } - catch (NoSuchFieldException e) { - throw new UnsupportedAttributeException("cannot find property '" + name + "' of " + getBeanClass()); - } } + try { + FieldDescriptor field = getBeanClass().getFieldDescriptor(name); + return Modifier.isFinal(field.getModifiers()); // final fields might as well be considered bound -- they can't be modified anyway + } catch (NoSuchFieldException e) { + throw new UnsupportedAttributeException("cannot find property '" + name + "' of " + getBeanClass()); + } } @@ -267,10 +265,7 @@ */ public String[] getMemberDependencies(String memberName) { ProxyEventInfo eventInfo = eventInfos != null ? eventInfos.get(memberName) : null; - if (eventInfo != null) - return new String[]{eventInfo.modelName}; - else - return null; + return eventInfo == null ? null : new String[]{eventInfo.modelName}; } @@ -292,8 +287,9 @@ * @return Java code snippet which causes the listener to be added to the object */ public String getAddMemberListenerCode(String objectCode, String dataBinding, String memberName, String propertyChangeListenerCode, JAXXCompiler compiler) { - if (memberName.equals("getClass")) + if ("getClass".equals(memberName)) { return null; + } ProxyEventInfo eventInfo = eventInfos != null ? eventInfos.get(memberName) : null; if (eventInfo != null) { // a "proxied" event is one that doesn't fire PropertyChangeEvent, so we need to convert its native event type into PropertyChangeEvents @@ -308,32 +304,32 @@ } } ClassDescriptor eventClass = getEventClass(eventInfo.listenerClass); - if (!methodExists) + if (!methodExists) { compiler.getJavaFile().addMethod(new JavaMethod(Modifier.PUBLIC, "void", methodName, new JavaArgument[]{new JavaArgument(JAXXCompiler.getCanonicalName(eventClass), "event")}, null, propertyChangeListenerCode + ".propertyChange(null);")); + } String code = objectCode + (eventInfo.modelName != null ? ".get" + JAXXCompiler.capitalize(eventInfo.modelName) + "()" : ""); result.append("$bindingSources.put(\"").append(code).append("\", ").append(code).append(");").append(JAXXCompiler.getLineSeparator()); result.append(code).append('.').append(eventInfo.addMethod).append("((").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(") jaxx.runtime.Util.getEventListener(").append(JAXXCompiler.getCanonicalName(eventInfo.listenerClass)).append(".class, ").append(compiler.getRootObject().getJavaCode()).append(", ").append(TypeManager.getJavaCode(methodName)).append("));\n"); - if (eventInfo.modelName != null) + if (eventInfo.modelName != null) { result.append(getAddMemberListenerCode(objectCode, dataBinding, "get" + JAXXCompiler.capitalize(eventInfo.modelName), "jaxx.runtime.Util.getDataBindingUpdateListener(this , \"" + dataBinding + "\")", compiler)); + } return result.toString(); } else { String propertyName = null; if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - } - else if (memberName.startsWith("is")) { + } else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); } else { try { getBeanClass().getFieldDescriptor(memberName); propertyName = memberName; - } - catch (NoSuchFieldException e) { + } catch (NoSuchFieldException e) { // ignore ? } } @@ -343,20 +339,20 @@ getBeanClass().getMethodDescriptor("addPropertyChangeListener", new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(String.class), ClassDescriptorLoader.getClassDescriptor(PropertyChangeListener.class)}); return objectCode + ".addPropertyChangeListener(\"" + propertyName + "\", " + propertyChangeListenerCode + ");\n"; - } - catch (NoSuchMethodException e) { + } catch (NoSuchMethodException e) { // no property-specific method, use general one return objectCode + ".addPropertyChangeListener(" + propertyChangeListenerCode + ");\n"; } - } else - return null; + } + return null; } } public String getRemoveMemberListenerCode(String objectCode, String dataBinding, String memberName, String propertyChangeListenerCode, JAXXCompiler compiler) { - if (memberName.equals("getClass")) + if ("getClass".equals(memberName)) { return null; + } ProxyEventInfo eventInfo = eventInfos != null ? eventInfos.get(memberName) : null; if (eventInfo != null) { // a "proxied" event is one that doesn't fire PropertyChangeEvent, so we need to convert its native event type into PropertyChangeEvents @@ -371,10 +367,11 @@ } } ClassDescriptor eventClass = getEventClass(eventInfo.listenerClass); - if (!methodExists) + if (!methodExists) { compiler.getJavaFile().addMethod(new JavaMethod(Modifier.PUBLIC, "void", methodName, new JavaArgument[]{new JavaArgument(JAXXCompiler.getCanonicalName(eventClass), "event")}, null, propertyChangeListenerCode + ".propertyChange(null);")); + } try { String modelMemberName = eventInfo.modelName != null ? "get" + JAXXCompiler.capitalize(eventInfo.modelName) : null; String modelClassName = modelMemberName != null ? getBeanClass().getMethodDescriptor(modelMemberName, new ClassDescriptor[0]).getReturnType().getName() : JAXXCompiler.getCanonicalName(getBeanClass()); @@ -394,16 +391,13 @@ String propertyName = null; if (memberName.startsWith("get")) { propertyName = Introspector.decapitalize(memberName.substring("get".length())); - } - else if (memberName.startsWith("is")) { + } else if (memberName.startsWith("is")) { propertyName = Introspector.decapitalize(memberName.substring("is".length())); - } - else { + } else { try { getBeanClass().getFieldDescriptor(memberName); propertyName = memberName; - } - catch (NoSuchFieldException e) { + } catch (NoSuchFieldException e) { // ignore ? } } @@ -413,13 +407,12 @@ getBeanClass().getMethodDescriptor("removePropertyChangeListener", new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(String.class), ClassDescriptorLoader.getClassDescriptor(PropertyChangeListener.class)}); return objectCode + ".removePropertyChangeListener(\"" + propertyName + "\", " + propertyChangeListenerCode + ");\n"; - } - catch (NoSuchMethodException e) { + } catch (NoSuchMethodException e) { // no property-specific method, use general one return objectCode + ".removePropertyChangeListener(" + propertyChangeListenerCode + ");\n"; } - } else - return null; + } + return null; } } @@ -485,8 +478,7 @@ String modelName, String addMethod, String removeMethod) { try { addProxyEventInfo(memberName, ClassDescriptorLoader.getClassDescriptor(listenerClass.getName()), modelName, addMethod, removeMethod); - } - catch (ClassNotFoundException e) { + } catch (ClassNotFoundException e) { throw new RuntimeException(e); } } @@ -543,8 +535,7 @@ public void compileSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { try { init(); - } - catch (IntrospectionException e) { + } catch (IntrospectionException e) { throw new RuntimeException(e); } CompiledObject object = objectMap.get(tag); @@ -646,10 +637,8 @@ String value = attribute.getValue(); if (name.equals("constraints") || isEventHandlerName(name)) { compiler.preprocessScript(value); // adds dependencies as a side effect - } - else if (name.equals("constructorParams")) { - String[] params = value.split("\\s*,\\s*"); - for (String param : params) { + } else if (name.equals("constructorParams")) { + for (String param : value.split("\\s*,\\s*")) { compiler.preprocessScript(param); } } else if (value.startsWith("{") && value.endsWith("}")) { @@ -688,8 +677,7 @@ value+=";"; } addEventHandler(object, Introspector.decapitalize(name.substring(2)), value, compiler); - } - else { + } else { setAttribute(object, name, value, true, compiler); } } @@ -722,8 +710,9 @@ * @return the attribute's priority */ protected int getAttributeOrdering(Attr attr) { - if (attr.getName().equals("displayedMnemonicIndex") || attr.getName().equals("displayedMnemonic") || attr.getName().equals("mnemonic")) + if (attr.getName().equals("displayedMnemonicIndex") || attr.getName().equals("displayedMnemonic") || attr.getName().equals("mnemonic")) { return 1; + } return 0; } @@ -733,23 +722,19 @@ String binding = compiler.processDataBindings(stringValue, type); if (binding != null) { return ""; - } else { // no bindings, convert from string - try { - Class typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null; - Object value = convertFromString(propertyName, stringValue, typeClass); - return getSetPropertyCode(object.getJavaCode(), propertyName, TypeManager.getJavaCode(value), compiler); - } - catch (NumberFormatException e) { - compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); - } - catch (IllegalArgumentException e) { - compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); - } - catch (ClassNotFoundException e) { - compiler.reportError("could not find class " + type.getName()); - } - return ""; } + try { + Class typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null; + Object value = convertFromString(propertyName, stringValue, typeClass); + return getSetPropertyCode(object.getJavaCode(), propertyName, TypeManager.getJavaCode(value), compiler); + } catch (NumberFormatException e) { + compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); + } catch (IllegalArgumentException e) { + compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); + } catch (ClassNotFoundException e) { + compiler.reportError("could not find class " + type.getName()); + } + return ""; } @@ -802,19 +787,15 @@ Class typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null; Object value = convertFromString(propertyName, stringValue, typeClass); setProperty(object, propertyName, value, compiler); - } - catch (NumberFormatException e) { + } catch (NumberFormatException e) { compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); - } - catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { compiler.reportError("could not convert literal string '" + stringValue + "' to type " + type.getName()); - } - catch (ClassNotFoundException e) { + } catch (ClassNotFoundException e) { compiler.reportError("could not find class " + type.getName()); } } - } - catch (UnsupportedAttributeException e) { + } catch (UnsupportedAttributeException e) { compiler.reportError("class " + object.getObjectClass().getName() + " does not support attribute '" + propertyName + "'"); } } @@ -857,16 +838,18 @@ } currentObject.setParent(object); String styleClass = object.getStyleClass(); - if (styleClass == null) + if (styleClass == null) { styleClass = descriptor.getStyleClass(); + } child.setStyleClass(styleClass); Stylesheet mergedStylesheet = overrides; Stylesheet childOverrides = jaxxObjectDescriptor.getStylesheet(); if (childOverrides != null) { - if (mergedStylesheet == null) + if (mergedStylesheet == null) { mergedStylesheet = childOverrides; - else + } else { mergedStylesheet.add(childOverrides.getRules()); + } } TagManager.getTagHandler(objectClass).applyStylesheets(child, compiler, mergedStylesheet, isRoot); object.appendInitializationCode(child.getInitializationCode(compiler)); @@ -899,13 +882,13 @@ break; } } - if (listenerMethod == null) + if (listenerMethod == null) { throw new RuntimeException("expected to find method '" + name + "' in JAXXEventSetDescriptor.getListenerMethods()"); + } try { value = compiler.preprocessScript(value); object.addEventHandler(name, JAXXEventSetDescriptor.getAddListenerMethod(), listenerMethod, value, compiler); - } - catch (CompilerException e) { + } catch (CompilerException e) { compiler.reportError("While parsing event handler for '" + name + "': " + e.getMessage()); } } else @@ -926,19 +909,18 @@ public String getGetPropertyCode(String javaCode, String name, JAXXCompiler compiler) { try { init(); - } - catch (IntrospectionException e) { + } catch (IntrospectionException e) { throw new RuntimeException(e); } JAXXPropertyDescriptor property = properties.get(name); if (property != null) { - if (property.getReadMethodDescriptor() != null) + if (property.getReadMethodDescriptor() != null) { return javaCode + '.' + property.getReadMethodDescriptor().getName() + "()"; - else - throw new UnsupportedAttributeException("property '" + name + "' of " + getBeanClass().getName() + " has no read method"); - } else - throw new UnsupportedAttributeException("property '" + name + "' could not be found in class " + getBeanClass().getName()); + } + throw new UnsupportedAttributeException("property '" + name + "' of " + getBeanClass().getName() + " has no read method"); + } + throw new UnsupportedAttributeException("property '" + name + "' could not be found in class " + getBeanClass().getName()); } @@ -956,12 +938,12 @@ public String getSetPropertyCode(String javaCode, String name, String valueCode, JAXXCompiler compiler) { JAXXPropertyDescriptor property = properties.get(name); if (property != null) { - if (property.getWriteMethodDescriptor() != null) + if (property.getWriteMethodDescriptor() != null) { return javaCode + '.' + property.getWriteMethodDescriptor().getName() + '(' + valueCode + ");"; - else - throw new UnsupportedAttributeException("property '" + name + "' of " + getBeanClass().getName() + " is read-only"); - } else - throw new UnsupportedAttributeException("property '" + name + "' could not be found in class " + getBeanClass().getName()); + } + throw new UnsupportedAttributeException("property '" + name + "' of " + getBeanClass().getName() + " is read-only"); + } + throw new UnsupportedAttributeException("property '" + name + "' could not be found in class " + getBeanClass().getName()); } @@ -1009,14 +991,16 @@ Object[] values = (Object[]) property.getValue("enumerationValues"); if (values != null) { for (int j = 0; j < values.length - 2; j += 3) { - if (((String) values[j]).toLowerCase().equals(lowercaseValue)) + if (((String) values[j]).toLowerCase().equals(lowercaseValue)) { return (Integer) values[j + 1]; + } } StringBuffer message = new StringBuffer("value of '" + key + "' must be one of: ["); for (int j = 0; j < values.length - 2; j += 3) { - if (j != 0) + if (j != 0) { message.append(", "); + } message.append(((String) values[j]).toLowerCase()); } message.append("] (found '").append(value).append("')"); @@ -1039,17 +1023,17 @@ * @see #constantValue */ protected Object convertFromString(String key, String value, Class type) { - if (type == null || type == Object.class) + if (type == null || type == Object.class) { return value; + } try { return TypeManager.convertFromString(value, type); - } - catch (NumberFormatException e) { - if (type == int.class || type == Integer.class) + } catch (NumberFormatException e) { + if (type == int.class || type == Integer.class) { return constantValue(key, value); - else - throw e; + } + throw e; } } @@ -1093,11 +1077,11 @@ if (nodeType == Node.ELEMENT_NODE) { Element child = (Element) node; compileChildTagSecondPass(child, compiler); - } else - if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { + } else if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { String text = ((Text) node).getData().trim(); - if (text.length() > 0) + if (text.length() > 0) { compiler.reportError("tag '" + tag.getLocalName() + "' may not contain text ('" + ((Text) node).getData().trim() + "')"); + } } } }

1 0

r205 - trunk/jaxx/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:52:27 +0000 (Tue, 12 Feb 2008) New Revision: 205 Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java Log: ajout TODO Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-12 13:51:04 UTC (rev 204) +++ trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-12 13:52:27 UTC (rev 205) @@ -91,6 +91,7 @@ private static List<String> staticImports = new ArrayList<String>(); static { + //TODO humm, we should be able to import only what is needed staticImports.add("java.awt.*"); staticImports.add("java.awt.event.*"); staticImports.add("java.beans.*");

1 0

r204 - trunk/jaxx/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:51:04 +0000 (Tue, 12 Feb 2008) New Revision: 204 Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java Log: formattage code + ajout d'imports statiques pour I18n etla creation d'icone, ainsi la fonction I18n._ et UIHelper.createImageIcon sont disponibles sur tous les sources jaxx g?\195?\169n?\195?\169r?\195?\169s. TODO int?\195?\169gerer completement I18n dans jaxx, ?\195?\160 savoir lors de la g?\195?\169n?\195?\169ration des attributs de components encapsuler par un _("") Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-12 13:41:33 UTC (rev 203) +++ trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-02-12 13:51:04 UTC (rev 204) @@ -104,6 +104,8 @@ staticImports.add("jaxx.runtime.swing.HBox"); staticImports.add("jaxx.runtime.swing.VBox"); staticImports.add("jaxx.runtime.swing.Table"); + staticImports.add("static org.codelutin.i18n.I18n._"); + staticImports.add("static jaxx.runtime.UIHelper.createImageIcon"); } private static DefaultObjectHandler firstPassClassTagHandler = new DefaultObjectHandler(ClassDescriptorLoader.getClassDescriptor(Object.class)); @@ -634,8 +636,9 @@ protected void createJavaFile(String packageName, String className) throws CompilerException { String fullClassName = packageName != null ? packageName + "." + className : className; - if (root == null) + if (root == null) { throw new CompilerException("root tag must be a class tag"); + } ClassDescriptor superclass = root.getObjectClass(); boolean superclassIsJAXXObject = ClassDescriptorLoader.getClassDescriptor(JAXXObject.class).isAssignableFrom(superclass); javaFile.setModifiers(Modifier.PUBLIC); @@ -659,8 +662,9 @@ javaFile.addField(new JavaField(Modifier.PROTECTED, "java.util.Map<String,Object>", "$bindingSources", "new HashMap<String,Object>()")); } - if (stylesheet != null) + if (stylesheet != null) { javaFile.addField(new JavaField(0, "java.util.Map", "$previousValues", "new java.util.HashMap()")); + } javaFile.addMethod(createConstructor(className)); javaFile.addMethod(createInitializer(className));

1 0

r203 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:41:33 +0000 (Tue, 12 Feb 2008) New Revision: 203 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: utilisation JAXXTab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-02-12 13:41:14 UTC (rev 202) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-02-12 13:41:33 UTC (rev 203) @@ -18,7 +18,7 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import javax.swing.JTabbedPane; import java.lang.annotation.ElementType; @@ -39,7 +39,7 @@ Class<? extends TabModel> model(); - Class<? extends JAXXObject> impl(); + Class<? extends JAXXTab> impl(); Class<? extends JTabbedPane> parentImpl(); Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 13:41:14 UTC (rev 202) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 13:41:33 UTC (rev 203) @@ -19,6 +19,7 @@ package jaxx.runtime.builder; import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,16 +47,16 @@ protected Map<String, TabContentConfig> configs; /** dictionary of instanciated actions */ - protected Map<String, JComponent> cache; + protected Map<String, JAXXTab> cache; /** dictionary of instanciated models */ protected Map<String, TabModel> models; protected abstract Map<String, TabContentConfig> initFactory(); - protected abstract void initTab(JComponent tab, String tabName, TabContentConfig config); + protected abstract void initTab(JAXXTab tab, String tabName, TabContentConfig config); - protected JComponent newTab(String tabName) { + protected JAXXTab newTab(String tabName) { checkRegistredConfig(tabName); @@ -67,9 +68,9 @@ TabContentConfig config = configs.get(tabName); - JComponent instance; + JAXXTab instance; try { - instance = (JComponent) config.impl().newInstance(); + instance = config.impl().newInstance(); log.info("new tab : " + instance); cache.put(tabName, instance); @@ -113,7 +114,7 @@ TabContentConfig config = getConfig(tabName); - JComponent comp = newTab(tabName); + JAXXTab comp = newTab(tabName); int index = getTabIndex(container, comp); if (index == -1) { @@ -155,16 +156,16 @@ protected TabFactory() { configs = initFactory(); - cache = new TreeMap<String, JComponent>(); + cache = new TreeMap<String, JAXXTab>(); models = new TreeMap<String, TabModel>(); } - protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JAXXTab comp) { // by default, no tab header return null; } - protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JAXXTab comp) { container.addTab(tabName, comp); @@ -177,7 +178,7 @@ } @SuppressWarnings({"unchecked"}) - protected void initJAXXTab(TabContentConfig config, JComponent instance) throws NoSuchFieldException, IllegalAccessException { + protected void initJAXXTab(TabContentConfig config, JAXXTab instance) throws NoSuchFieldException, IllegalAccessException { if (instance instanceof JAXXObject) { JAXXObject ui = (JAXXObject) instance; for (String dynamicField : config.dynamicFields()) {

1 0

r202 - trunk/jaxx/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:41:14 +0000 (Tue, 12 Feb 2008) New Revision: 202 Modified: trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java Log: unboxing Modified: trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2008-02-12 13:40:52 UTC (rev 201) +++ trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2008-02-12 13:41:14 UTC (rev 202) @@ -30,9 +30,9 @@ else if (name.equals(TabInfo.BACKGROUND_PROPERTY)) tabs.setBackgroundAt(tabIndex, (Color) e.getNewValue()); else if (name.equals(TabInfo.MNEMONIC_PROPERTY)) - tabs.setMnemonicAt(tabIndex, ((Integer) e.getNewValue()).intValue()); + tabs.setMnemonicAt(tabIndex, (Integer) e.getNewValue()); else if (name.equals(TabInfo.DISPLAYED_MNEMONIC_INDEX_PROPERTY)) - tabs.setDisplayedMnemonicIndexAt(tabIndex, ((Integer) e.getNewValue()).intValue()); + tabs.setDisplayedMnemonicIndexAt(tabIndex, (Integer) e.getNewValue()); else if (name.equals(TabInfo.ICON_PROPERTY)) tabs.setIconAt(tabIndex, (Icon) e.getNewValue()); else if (name.equals(TabInfo.DISABLED_ICON_PROPERTY))

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:40:52 +0000 (Tue, 12 Feb 2008) New Revision: 201 Modified: trunk/jaxx/src/main/java/jaxx/tags/swing/SwingInitializer.java Log: prise en compte du handler pour le nouveau tag JAXXTab Modified: trunk/jaxx/src/main/java/jaxx/tags/swing/SwingInitializer.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/swing/SwingInitializer.java 2008-02-12 13:40:28 UTC (rev 200) +++ trunk/jaxx/src/main/java/jaxx/tags/swing/SwingInitializer.java 2008-02-12 13:40:52 UTC (rev 201) @@ -12,6 +12,7 @@ import jaxx.runtime.swing.JAXXList; import jaxx.runtime.swing.JAXXTree; import jaxx.runtime.swing.Table; +import jaxx.runtime.swing.JAXXTab; import jaxx.spi.Initializer; import jaxx.tags.DefaultObjectHandler; import jaxx.tags.TagManager; @@ -73,6 +74,8 @@ TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "cell", new CellHandler()); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "item", new ItemHandler()); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXTab.class), JAXXTabHandler.class); + TypeManager.registerTypeConverter(KeyStroke.class, new KeyStrokeConverter()); } } \ No newline at end of file

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:40:28 +0000 (Tue, 12 Feb 2008) New Revision: 200 Added: trunk/jaxx/src/main/java/jaxx/tags/swing/JAXXTabHandler.java Log: le handler pour le nouveau tag JAXXTab Added: trunk/jaxx/src/main/java/jaxx/tags/swing/JAXXTabHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/swing/JAXXTabHandler.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/tags/swing/JAXXTabHandler.java 2008-02-12 13:40:28 UTC (rev 200) @@ -0,0 +1,28 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package jaxx.tags.swing; + +import jaxx.reflect.ClassDescriptor; + +/** @author chemit */ +public class JAXXTabHandler extends TableHandler { + public JAXXTabHandler(ClassDescriptor beanClass) { + super(beanClass); + } +}

1 0

r199 - trunk/jaxx/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:40:06 +0000 (Tue, 12 Feb 2008) New Revision: 199 Added: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXTab.java Log: creation d'un tag pour le contenu des Tab (voir TabContentConfig) et TabFactory Added: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXTab.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXTab.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXTab.java 2008-02-12 13:40:06 UTC (rev 199) @@ -0,0 +1,23 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.swing; + +/** @author chemit */ +public class JAXXTab extends Table { +}

1 0

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

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:39:31 +0000 (Tue, 12 Feb 2008) New Revision: 198 Modified: trunk/jaxx/src/main/java/jaxx/tags/swing/RowHandler.java trunk/jaxx/src/main/java/jaxx/tags/swing/TableHandler.java Log: ajout trace Modified: trunk/jaxx/src/main/java/jaxx/tags/swing/RowHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/swing/RowHandler.java 2008-02-12 13:39:09 UTC (rev 197) +++ trunk/jaxx/src/main/java/jaxx/tags/swing/RowHandler.java 2008-02-12 13:39:31 UTC (rev 198) @@ -42,14 +42,16 @@ int nodeType = node.getNodeType(); if (nodeType == Node.ELEMENT_NODE) { Element child = (Element) node; - if (!child.getLocalName().equals("cell")) + if (!child.getLocalName().equals("cell")) { compiler.reportError("tag '" + tag.getLocalName() + "' may only contain cell tags as children"); + } compileChildTagFirstPass(child, compiler); } else if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { String text = ((Text) node).getData().trim(); - if (text.length() > 0) + if (text.length() > 0) { compiler.reportError("tag '" + tag.getLocalName() + "' may not contain text ('" + ((Text) node).getData().trim() + "')"); + } } } } @@ -61,14 +63,16 @@ int nodeType = node.getNodeType(); if (nodeType == Node.ELEMENT_NODE) { Element child = (Element) node; - if (!child.getLocalName().equals("cell")) + if (!child.getLocalName().equals("cell")) { compiler.reportError("tag '" + tag.getLocalName() + "' may only contain cell tags as children"); + } compileChildTagSecondPass(child, compiler); } else if (nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE) { String text = ((Text) node).getData().trim(); - if (text.length() > 0) + if (text.length() > 0) { compiler.reportError("tag '" + tag.getLocalName() + "' may not contain text ('" + ((Text) node).getData().trim() + "')"); + } } } } Modified: trunk/jaxx/src/main/java/jaxx/tags/swing/TableHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/swing/TableHandler.java 2008-02-12 13:39:09 UTC (rev 197) +++ trunk/jaxx/src/main/java/jaxx/tags/swing/TableHandler.java 2008-02-12 13:39:31 UTC (rev 198) @@ -30,10 +30,12 @@ @Override public void setAttribute(CompiledObject object, String propertyName, String stringValue, boolean inline, JAXXCompiler compiler) throws CompilerException { try { - if (object instanceof CompiledTable) + if (object instanceof CompiledTable) { CellHandler.setAttribute(((CompiledTable) object).getTableConstraints(), propertyName, stringValue); - else + } + else { super.setAttribute(object, propertyName, stringValue, inline, compiler); + } } catch (UnsupportedAttributeException e) { super.setAttribute(object, propertyName, stringValue, inline, compiler); @@ -58,19 +60,23 @@ @Override public void addChild(CompiledObject child, String constraints, JAXXCompiler compiler) throws CompilerException { - if (constraints != null) + if (constraints != null) { compiler.reportError("Table does not accept constraints"); + } GridBagConstraints c = getCellConstraints(); if (c == null) { compiler.reportError("Table tag may only contain row tags"); return; } - if (!emptyCell) + if (!emptyCell) { compiler.reportError("Table cells may only have one child component"); - while (rowSpans.size() < c.gridx + c.gridwidth) + } + while (rowSpans.size() < c.gridx + c.gridwidth) { rowSpans.add(null); - for (int x = c.gridx; x < c.gridx + c.gridwidth; x++) + } + for (int x = c.gridx; x < c.gridx + c.gridwidth; x++) { rowSpans.set(x, c.gridheight); + } super.addChild(child, TypeManager.getJavaCode(c), compiler);

1 0

r197 - trunk/jaxx/src/main/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:39:09 +0000 (Tue, 12 Feb 2008) New Revision: 197 Modified: trunk/jaxx/src/main/java/jaxx/tags/TagManager.java Log: ajout trace Modified: trunk/jaxx/src/main/java/jaxx/tags/TagManager.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/TagManager.java 2008-02-12 13:38:55 UTC (rev 196) +++ trunk/jaxx/src/main/java/jaxx/tags/TagManager.java 2008-02-12 13:39:09 UTC (rev 197) @@ -152,6 +152,7 @@ if (namespace == null) { namespace = "*"; } + //System.out.println("registerTag "+namespace+" : "+tag+" : "+handler); registeredTags.put(new QName(namespace, tag), handler); registerDefaultNamespace(tag, namespace); }

1 0

r196 - trunk/jaxx/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:38:55 +0000 (Tue, 12 Feb 2008) New Revision: 196 Modified: trunk/jaxx/src/main/java/jaxx/compiler/CompiledObject.java Log: formattage code Modified: trunk/jaxx/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/CompiledObject.java 2008-02-12 13:38:42 UTC (rev 195) +++ trunk/jaxx/src/main/java/jaxx/compiler/CompiledObject.java 2008-02-12 13:38:55 UTC (rev 196) @@ -115,14 +115,16 @@ */ public CompiledObject(String id, String javaCode, ClassDescriptor objectClass, JAXXCompiler compiler, boolean force) throws CompilerException { if (!force) { - if (!isValidID(id)) + if (!isValidID(id)) { compiler.reportError("the id '" + id + "' is not a valid Java identifier"); + } } this.id = id; this.javaCode = javaCode; - if (objectClass == null) + if (objectClass == null) { throw new NullPointerException(); + } this.objectClass = objectClass; } @@ -132,8 +134,9 @@ if (id.length() == 0) valid = false; if (valid) { - if (!Character.isJavaIdentifierStart(id.charAt(0))) + if (!Character.isJavaIdentifierStart(id.charAt(0))) { valid = false; + } if (valid) { for (int i = 1; i < id.length(); i++) { if (!Character.isJavaIdentifierPart(id.charAt(i))) { @@ -207,8 +210,9 @@ * @param parent the parent container */ public void setParent(CompiledObject parent) { - if (!ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(parent.getObjectClass())) + if (!ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(parent.getObjectClass())) { throw new IllegalArgumentException("parent must descend from java.awt.Container"); + } this.parent = parent; } @@ -443,8 +447,9 @@ */ public void addChild(CompiledObject child, String constraints, JAXXCompiler compiler) throws CompilerException { try { - if (constraints != null) + if (constraints != null) { constraints = compiler.checkJavaCode(constraints); + } } catch (CompilerException e) { compiler.reportError("While parsing 'constraints' attribute: " + e.getMessage()); @@ -452,18 +457,21 @@ if (!child.isOverride()) { TagHandler tagHandler = TagManager.getTagHandler(getObjectClass()); - if (tagHandler instanceof DefaultComponentHandler && !((DefaultComponentHandler) tagHandler).isContainer()) + if (tagHandler instanceof DefaultComponentHandler && !((DefaultComponentHandler) tagHandler).isContainer()) { compiler.reportError("component " + this + " may not have children"); + } String containerDelegate = ((DefaultComponentHandler) tagHandler).getContainerDelegate(); String delegateCode = containerDelegate != null ? "." + containerDelegate + "()" : ""; child.setParent(this); - if (constraints != null) + if (constraints != null) { appendAdditionCode(getJavaCode() + delegateCode + ".add(" + child.getJavaCode() + ", " + constraints + ");"); - else + } + else { appendAdditionCode(getJavaCode() + delegateCode + ".add(" + child.getJavaCode() + ");"); + } } }

1 0

r195 - trunk/jaxx/src/main/java/jaxx/reflect
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:38:42 +0000 (Tue, 12 Feb 2008) New Revision: 195 Modified: trunk/jaxx/src/main/java/jaxx/reflect/ClassDescriptor.java Log: formattage code Modified: trunk/jaxx/src/main/java/jaxx/reflect/ClassDescriptor.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/reflect/ClassDescriptor.java 2008-02-12 13:37:16 UTC (rev 194) +++ trunk/jaxx/src/main/java/jaxx/reflect/ClassDescriptor.java 2008-02-12 13:38:42 UTC (rev 195) @@ -64,8 +64,9 @@ public ClassDescriptor[] getInterfaces() { try { ClassDescriptor[] result = new ClassDescriptor[interfaces.length]; - for (int i = 0; i < result.length; i++) + for (int i = 0; i < result.length; i++) { result[i] = ClassDescriptorLoader.getClassDescriptor(interfaces[i], getClassLoader()); + } return result; } catch (ClassNotFoundException e) { @@ -106,8 +107,9 @@ public MethodDescriptor getMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException { for (MethodDescriptor methodDescriptor : methodDescriptors) { - if (methodDescriptor.getName().equals(name) && Arrays.equals(methodDescriptor.getParameterTypes(), parameterTypes)) + if (methodDescriptor.getName().equals(name) && Arrays.equals(methodDescriptor.getParameterTypes(), parameterTypes)) { return methodDescriptor; + } } throw new NoSuchMethodException("Could not find method " + name + "(" + Arrays.asList(parameterTypes) + ") in " + getName()); } @@ -123,8 +125,9 @@ public FieldDescriptor getFieldDescriptor(String name) throws NoSuchFieldException { for (FieldDescriptor fieldDescriptor : fieldDescriptors) { - if (fieldDescriptor.getName().equals(name)) + if (fieldDescriptor.getName().equals(name)) { return fieldDescriptor; + } } throw new NoSuchFieldException("Could not find field " + name + " in " + getName()); } @@ -140,12 +143,14 @@ public boolean isAssignableFrom(ClassDescriptor descriptor) { while (descriptor != null) { - if (descriptor == this) + if (descriptor == this) { return true; + } ClassDescriptor[] interfaces = descriptor.getInterfaces(); for (ClassDescriptor anInterface : interfaces) - if (anInterface == this) + if (anInterface == this) { return true; + } descriptor = descriptor.getSuperclass(); } return false;

1 0

r194 - trunk/jaxx/src/test/java/jaxx/junit
by tchemit＠users.labs.libre-entreprise.org Feb. 12, 2008

Feb. 12, 2008

Author: tchemit Date: 2008-02-12 13:37:16 +0000 (Tue, 12 Feb 2008) New Revision: 194 Modified: trunk/jaxx/src/test/java/jaxx/junit/TagManagerTest.java Log: formattage code Modified: trunk/jaxx/src/test/java/jaxx/junit/TagManagerTest.java =================================================================== --- trunk/jaxx/src/test/java/jaxx/junit/TagManagerTest.java 2008-01-22 12:00:02 UTC (rev 193) +++ trunk/jaxx/src/test/java/jaxx/junit/TagManagerTest.java 2008-02-12 13:37:16 UTC (rev 194) @@ -1,39 +1,45 @@ package jaxx.junit; -import java.awt.*; -import java.io.*; -import javax.swing.*; -import org.w3c.dom.*; +import jaxx.compiler.JAXXCompiler; +import jaxx.reflect.ClassDescriptor; +import jaxx.reflect.ClassDescriptorLoader; +import jaxx.tags.DefaultComponentHandler; +import jaxx.tags.DefaultObjectHandler; +import jaxx.tags.TagHandler; +import jaxx.tags.TagManager; import junit.framework.TestCase; -import jaxx.compiler.*; -import jaxx.reflect.*; -import jaxx.tags.*; - +import javax.swing.JPopupMenu; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; + public class TagManagerTest extends TestCase { private JAXXCompiler compiler = JAXXCompiler.createDummyCompiler(); - - + + public static class TestHandler extends DefaultObjectHandler { public TestHandler(ClassDescriptor beanClass) { super(beanClass); } } - - + + public void setUp() { compiler.addImport("javax.swing.*"); } - - + + public void testRegisterBean() { TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(InputStream.class), TestHandler.class); - + assertTrue(TagManager.getTagHandler(ClassDescriptorLoader.getClassDescriptor(InputStream.class)) instanceof TestHandler); assertTrue(TagManager.getTagHandler(ClassDescriptorLoader.getClassDescriptor(FileInputStream.class)) instanceof TestHandler); } - - + + public void testRegisterDefaultNamespace() { TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(OutputStream.class), TestHandler.class); @@ -42,22 +48,22 @@ PrintStream oldErr = System.err; ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - System.setErr(new PrintStream(buffer)); + System.setErr(new PrintStream(buffer)); TagManager.registerDefaultNamespace("OutputStream", "java.dummy.*"); assertNull("Found handler for OutputStream despite ambiguous default namespace", TagManager.getTagHandler(null, "OutputStream", compiler)); System.setErr(oldErr); assertTrue("No errors were produced with an ambiguous default namespace", buffer.size() > 0); assertTrue(buffer.size() > 0); } - - + + public void testResolveClassName() { assertEquals("Could not resolve class name 'Object'", TagManager.resolveClassName("Object", compiler), "java.lang.Object"); assertEquals("Could not resolve class name 'java.lang.Object'", TagManager.resolveClassName("java.lang.Object", compiler), "java.lang.Object"); assertNull("Unexpectedly resolved class name 'java.awt.Object'", TagManager.resolveClassName("java.awt.Object", compiler)); } - - + + public void testPackages() { assertNull("Unexpectedly found handler for java.awt.JButton", TagManager.getTagHandler(null, "java.awt.JButton", compiler)); assertNotNull("Did not find handler for JButton with default namespace of java.awt.*", TagManager.getTagHandler("java.awt.*", "JButton", compiler)); @@ -66,8 +72,8 @@ assertNotNull("Did not find handler for JButton with default namespace of java.swing.*", TagManager.getTagHandler("java.swing.*", "JButton", compiler)); assertNotNull("Did not find handler for javax.swing.*:JButton", TagManager.getTagHandler("javax.swing.*", "JButton", true, compiler)); } - + public void testImport() { assertNull("Found handler for ActionListener despite no java.awt.event.* import", TagManager.getTagHandler(null, "ActionListener", compiler)); @@ -83,18 +89,18 @@ PrintStream oldErr = System.err; ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - System.setErr(new PrintStream(buffer)); + System.setErr(new PrintStream(buffer)); compiler.addImport("java.util.*"); - TagManager.reset(); + TagManager.reset(); assertNull("Still found a handler for Date with an ambiguous import", TagManager.getTagHandler(null, "Date", compiler)); System.setErr(oldErr); assertTrue("No errors were produced with an ambiguous import", buffer.size() > 0); - + compiler.addImport("java.util.Date"); assertNotNull("Did not find java.util.Date with a disambiguating import", TagManager.getTagHandler(null, "Date", compiler)); } - - + + public void testInnerClass() { TagHandler handler = TagManager.getTagHandler(null, "JPopupMenu.Separator", compiler); assertTrue("Unable to resolve tag <JPopupMenu.Separator>", handler instanceof DefaultComponentHandler); @@ -104,14 +110,14 @@ assertTrue("Unable to resolve tag <javax.swing.JPopupMenu.Separator>", handler instanceof DefaultComponentHandler); assertTrue(((DefaultComponentHandler) handler).getBeanClass().getName().equals(JPopupMenu.Separator.class.getName())); } - - + + public void testWrongCase() { assertNull("Unexpectedly found handler for 'object'", TagManager.getTagHandler(null, "object", compiler)); assertNull("Unexpectedly found handler for 'tagmanagertest'", TagManager.getTagHandler(null, "tagmanagertest", compiler)); } - - + + public void testAliasing() { assertEquals("JComboBox is not aliased to jaxx.runtime.swing.JAXXComboBox", "jaxx.runtime.swing.JAXXComboBox", TagManager.resolveClassName("JComboBox", compiler)); assertEquals("javax.swing.JComboBox is not aliased to jaxx.runtime.swing.JAXXComboBox", "jaxx.runtime.swing.JAXXComboBox", TagManager.resolveClassName("javax.swing.JComboBox", compiler));

1 0

r193 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 12:00:02 +0000 (Tue, 22 Jan 2008) New Revision: 193 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: le component peut etre null, lors de l'enregistrement d'une action. Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 11:23:40 UTC (rev 192) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 12:00:02 UTC (rev 193) @@ -316,7 +316,7 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(component.isEnabled() || anno.enabled()); + result.setEnabled(component!=null && (component.isEnabled() || anno.enabled())); } return anno;

1 0

r192 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 11:23:40 +0000 (Tue, 22 Jan 2008) New Revision: 192 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: prise en compte de la valeur pr?\195?\169c?\195?\169dente enabled sur les bouttons Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 06:14:38 UTC (rev 191) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 11:23:40 UTC (rev 192) @@ -316,7 +316,8 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(anno.enabled()); + result.setEnabled(component.isEnabled() || anno.enabled()); + } return anno; }

1 0

r191 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 06:14:38 +0000 (Tue, 22 Jan 2008) New Revision: 191 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java Log: supression du container Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java 2008-01-22 06:14:38 UTC (rev 191) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -82,10 +80,4 @@ */ public abstract boolean enabled() default true; - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - public abstract Class<? extends JAXXObject> container(); - } \ No newline at end of file Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java 2008-01-22 06:14:38 UTC (rev 191) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -147,11 +145,4 @@ */ public abstract boolean hideActionText() default false; - - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - public abstract Class<? extends JAXXObject> container(); - } \ No newline at end of file

1 0

r190 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 02:08:56 +0000 (Tue, 22 Jan 2008) New Revision: 190 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java Log: supression du container Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java 2008-01-22 01:48:18 UTC (rev 189) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -113,10 +111,4 @@ boolean hideActionText() default false; - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - Class<? extends JAXXObject> container(); - } \ No newline at end of file

1 0

r189 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 01:48:18 +0000 (Tue, 22 Jan 2008) New Revision: 189 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: les mod?\195?\168les sont instanci?\195?\169s ind?\195?\169pendamment des ui (car on peut avoir besoin du mod?\195?\168le avant que l'ui ne soit instanci?\195?\169e) Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:32:13 UTC (rev 188) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:48:18 UTC (rev 189) @@ -70,18 +70,17 @@ JComponent instance; try { instance = (JComponent) config.impl().newInstance(); - log.info("new tab : " + instance); + log.info("new tab : " + instance); + cache.put(tabName, instance); + initJAXXTab(config, instance); - initTab(instance, tabName, config); - cache.put(tabName, instance); return instance; } catch (Exception e) { throw new RuntimeException(e); } - } public TabContentConfig getConfig(String tabName) { @@ -94,7 +93,20 @@ } public TabModel getModel(String tabName) { - return models.get(tabName); + + if (models.containsKey(tabName)) { + return models.get(tabName); + } + TabContentConfig config = getConfig(tabName); + TabModel tabModel; + try { + tabModel = config.model().newInstance(); + log.info("new tab model : " + tabModel); + models.put(tabName, tabModel); + } catch (Exception e) { + throw new RuntimeException(e); + } + return tabModel; } public void showTab(final JTabbedPane container, String tabName) { @@ -107,7 +119,7 @@ if (index == -1) { registerTab(container, tabName, config, comp); } - + container.setSelectedComponent(comp); }

1 0

r188 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 01:32:13 +0000 (Tue, 22 Jan 2008) New Revision: 188 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java Log: plutot utiliser une interface Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:01:24 UTC (rev 187) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:32:13 UTC (rev 188) @@ -18,20 +18,13 @@ * ##% */ package jaxx.runtime.builder; +import java.io.Serializable; + /** @author chemit */ -public class TabModel { +public interface TabModel extends Serializable { - protected String name; + String getName(); - public TabModel(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } + void setName(String name); + }

1 0

r187 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 01:01:24 +0000 (Tue, 22 Jan 2008) New Revision: 187 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: introduction factory de Tab et TabModel Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:01:24 UTC (rev 187) @@ -0,0 +1,188 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JComponent; +import javax.swing.JTabbedPane; +import java.awt.Component; +import java.lang.reflect.Field; +import java.util.Map; +import java.util.TreeMap; + +/** + * Une usine pour les Tabs, leur configs et leur mod�les + * + * @author tony + * @see jaxx.runtime.builder.TabContentConfig + * @see TabModel + */ + +public abstract class TabFactory { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + protected static Log log = LogFactory.getLog(TabFactory.class); + + /** dictionary of configs */ + protected Map<String, TabContentConfig> configs; + + /** dictionary of instanciated actions */ + protected Map<String, JComponent> cache; + + /** dictionary of instanciated models */ + protected Map<String, TabModel> models; + + protected abstract Map<String, TabContentConfig> initFactory(); + + protected abstract void initTab(JComponent tab, String tabName, TabContentConfig config); + + protected JComponent newTab(String tabName) { + + checkRegistredConfig(tabName); + + // try in cache + if (cache.containsKey(tabName)) { + // use cached tab + return cache.get(tabName); + } + + TabContentConfig config = configs.get(tabName); + + JComponent instance; + try { + instance = (JComponent) config.impl().newInstance(); + log.info("new tab : " + instance); + + initJAXXTab(config, instance); + + initTab(instance, tabName, config); + + cache.put(tabName, instance); + return instance; + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + + public TabContentConfig getConfig(String tabName) { + checkRegistredConfig(tabName); + return configs.get(tabName); + } + + public JComponent getUI(String tabName) { + return cache.get(tabName); + } + + public TabModel getModel(String tabName) { + return models.get(tabName); + } + + public void showTab(final JTabbedPane container, String tabName) { + + TabContentConfig config = getConfig(tabName); + + JComponent comp = newTab(tabName); + + int index = getTabIndex(container, comp); + if (index == -1) { + registerTab(container, tabName, config, comp); + } + + container.setSelectedComponent(comp); + } + + public void closeTab(JTabbedPane container, String tabName) { + + TabContentConfig config = getConfig(tabName); + + final JComponent comp = cache.get(tabName); + + int index = getTabIndex(container, comp); + if (index != -1) { + container.removeTabAt(index); + log.debug(config + " index " + index); + } + } + + public int getTabIndex(final JTabbedPane container, JComponent comp) { + if (container != null && comp != null) { + for (int i = 0; i < container.getTabCount(); i++) { + Component o = container.getComponentAt(i); + if (o.equals(comp)) { + return i; + } + } + } + return -1; + } + + public void resetCache() { + cache.clear(); + } + + + protected TabFactory() { + configs = initFactory(); + cache = new TreeMap<String, JComponent>(); + models = new TreeMap<String, TabModel>(); + } + + protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + // by default, no tab header + return null; + } + + protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + + container.addTab(tabName, comp); + + JComponent header = addTabHeader(container, tabName, config, comp); + + if (header != null) { + + container.setTabComponentAt(container.getTabCount() - 1, header); + } + } + + @SuppressWarnings({"unchecked"}) + protected void initJAXXTab(TabContentConfig config, JComponent instance) throws NoSuchFieldException, IllegalAccessException { + if (instance instanceof JAXXObject) { + JAXXObject ui = (JAXXObject) instance; + for (String dynamicField : config.dynamicFields()) { + String dynamciName = dynamicField + '_' + config.name(); + Object obj = ui.getObjectById(dynamicField); + Field m = ui.getClass().getDeclaredField("$objectMap"); + m.setAccessible(true); + Map<Object, Object> map = (Map<Object, Object>) m.get(ui); + map.put(dynamciName, obj); + } + } + } + + protected void checkRegistredConfig(String tabName) { + if (!configs.containsKey(tabName)) { + throw new IllegalStateException("can not find a registered TabContentConfig for tab name " + tabName); + } + } + +} \ No newline at end of file

1 0

r186 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 22, 2008

Jan. 22, 2008

Author: tchemit Date: 2008-01-22 01:00:28 +0000 (Tue, 22 Jan 2008) New Revision: 186 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java Log: introduction model pour Tab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 22:33:24 UTC (rev 185) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-22 01:00:28 UTC (rev 186) @@ -37,6 +37,8 @@ public @interface TabContentConfig { + Class<? extends TabModel> model(); + Class<? extends JAXXObject> impl(); Class<? extends JTabbedPane> parentImpl(); Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:00:28 UTC (rev 186) @@ -0,0 +1,37 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +/** @author chemit */ +public class TabModel { + + protected String name; + + public TabModel(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}

1 0

r185 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 22:33:24 +0000 (Mon, 21 Jan 2008) New Revision: 185 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: ajout accesseur sur action en cache Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-21 21:26:07 UTC (rev 184) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-21 22:33:24 UTC (rev 185) @@ -81,6 +81,10 @@ impls.clear(); } + public AbstractAction get(String actionKey) { + return cache.get(actionKey); + } + public AbstractAction[] loadActions(JAXXObject ui) { List<AbstractAction> result = new ArrayList<AbstractAction>(); for (Map.Entry<String, Class<? extends AbstractAction>> entry : implsEntrySet()) {

1 0

r184 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 21:26:07 +0000 (Mon, 21 Jan 2008) New Revision: 184 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java Log: ajout propri?\195?\169t?\195?\169s ?\195?\160 TabContentConfig Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 20:53:22 UTC (rev 183) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 21:26:07 UTC (rev 184) @@ -43,4 +43,10 @@ boolean useToogle() default false; + String name(); + + String shortDescription(); + + String[] dynamicFields() default {}; + }

1 0

r183 - in trunk/jaxx/src/main/java/jaxx/runtime: . builder
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 20:53:22 +0000 (Mon, 21 Jan 2008) New Revision: 183 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java Log: des annotations pour configurer des actions au runtime ajout d'une facotry pour g?\195?\169rer des actions (les actions doivent ?\195?\170tre stateless) Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java 2008-01-21 20:53:22 UTC (rev 183) @@ -0,0 +1,122 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour enregister une action. + * + * Placer cette annotation sur la classe implantant l'action, + * + * les informations d�crites seront utilis�es pour instancier l'action + * + * @author chemit + */ +(a)Retention(RetentionPolicy.RUNTIME) + +(a)Target(ElementType.TYPE) + +public @interface ActionConfig { + + /** + * @return la clef de la commande (doit �tre unique) + * @see javax.swing.Action#ACTION_COMMAND_KEY + */ + String actionCommand(); + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#NAME + */ + String name() default ""; + + /** + * @return la clef i18n du tooltip de l'action, si vide ignor� + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + String shortDescription() default ""; + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#LONG_DESCRIPTION + */ + String longDescription() default ""; + + /** + * @return le nom de l'icone associ�, si vide ignor� + * @see javax.swing.Action#SMALL_ICON + */ + String smallIcon() default ""; + + /** + * @return le nom du grande icone associ�, si vide ignor� + * @see javax.swing.Action#LARGE_ICON_KEY + */ + String largeIcon() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + String accelerator() default ""; + + /** + * @return + * @see javax.swing.Action#MNEMONIC_KEY + */ + int mnemonic() default '\0'; + + /** + * @return + * @see javax.swing.Action#DISPLAYED_MNEMONIC_INDEX_KEY + */ + int displayedMnemonicIndex() default '\0'; + + /** + * @return la valeur par d�faut pour les component selectable + * @see javax.swing.Action#SELECTED_KEY + */ + boolean selected() default false; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + boolean enabled() default true; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + boolean hideActionText() default false; + + + /** + * @return la class du container jaxx associ� + * @see javax.swing.Action#NAME + */ + Class<? extends JAXXObject> container(); + +} \ No newline at end of file Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-21 20:53:22 UTC (rev 183) @@ -0,0 +1,357 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; +import jaxx.runtime.UIHelper; +import jaxx.runtime.swing.JAXXToggleButton; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; + +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.Icon; +import javax.swing.JComboBox; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +/** + * Action factory using the ActionConfig annotations to configure the action. + * + * The factory is abstract, implements method {@link #init()} to fill the + * dictonary of known action implementations. + * + * Use after the {@link #loadActions(jaxx.runtime.JAXXObject)} to instanciate + * actions in ui with id equals a known action... + * + * TODO Finish doc + * + * @author chemit + */ +public abstract class ActionFactory { + + private static Log log = LogFactory.getLog(ActionFactory.class); + + /** dictionary of known actions implementations */ + private Map<String, Class<? extends AbstractAction>> impls; + /** dictionary of instanciated actions */ + private Map<String, AbstractAction> cache; + + /** + * Method to init the dictionary of knwon action implementations. + * + * @return the dictionary of known action implementations + */ + protected abstract Map<String, Class<? extends AbstractAction>> init(); + + protected ActionFactory() { + impls = init(); + cache = new TreeMap<String, AbstractAction>(); + } + + public void resetCache() { + cache.clear(); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + resetCache(); + impls.clear(); + } + + public AbstractAction[] loadActions(JAXXObject ui) { + List<AbstractAction> result = new ArrayList<AbstractAction>(); + for (Map.Entry<String, Class<? extends AbstractAction>> entry : implsEntrySet()) { + String actionKey = entry.getKey(); + Object comp = ui.getObjectById(actionKey); + if (comp == null || !(comp instanceof AbstractButton || comp instanceof JComboBox)) { + // nothing to do + continue; + } + + if (comp instanceof AbstractButton) { + AbstractButton component = (AbstractButton) comp; + AbstractAction action = newAction(actionKey, component); + + component.setAction(action); + + if (component instanceof JAXXToggleButton) { + JAXXToggleButton glueComponent = (JAXXToggleButton) component; + glueComponent.setIcon((Icon) action.getValue(Action.SMALL_ICON)); + Integer integer = (Integer) action.getValue(Action.MNEMONIC_KEY); + if (integer != null) { + glueComponent.setNormalMnemonic(integer); + } + glueComponent.setSelectedIcon((Icon) action.getValue(Action.SMALL_ICON + 2)); + integer = (Integer) action.getValue(Action.MNEMONIC_KEY + 2); + if (integer != null) { + glueComponent.setGlueMnemonic(integer); + } + glueComponent.setGlueText((String) action.getValue(Action.NAME + 2)); + glueComponent.setGlueTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION + 2)); + + glueComponent.setNormalText((String) action.getValue(Action.NAME)); + glueComponent.setNormalTooltipText((String) action.getValue(Action.SHORT_DESCRIPTION)); + } + + Boolean value = (Boolean) action.getValue("hideActionText"); + + component.setHideActionText(value != null && value); + result.add(action); + continue; + } + + if (comp instanceof JComboBox) { + JComboBox component = (JComboBox) comp; + AbstractAction action = newAction(actionKey, component); + + component.setAction(action); + Integer val = (Integer) action.getValue("selectedIndex"); + if (val != null && val != -1 && val < component.getItemCount() && val != component.getSelectedIndex()) { + component.setSelectedIndex(val); + } + result.add(action); + } + } + return result.toArray(new AbstractAction[result.size()]); + } + + /** + * @param actionKey le nom de l'action tel que d�finie dans le fichier + * de mapping (sans le prefix action.) + * @param component le button o� rattacher l'action + * @return une nouvelle instance de l'action associ�e � sa clef. + */ + public AbstractAction newAction(String actionKey, AbstractButton component) { + + // on v�rifie que l'action existe bien + checkRegistredAction(actionKey); + + // try in cache + if (cache.containsKey(actionKey)) { + // use cached action + return cache.get(actionKey); + } + // on r�cup�re la classe d'implantation de l'action + Class<? extends AbstractAction> klazz = impls.get(actionKey); + + try { + AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result.putValue(Action.ACTION_COMMAND_KEY, actionKey); + + log.debug(actionKey + " : " + result); + // recherche de l'annotation de configuration + ActionConfig anno = initActionConfig(component, result); + + if (anno == null) { + ToggleActionConfig anno2 = initToggleActionConfig(component, result); + if (anno2 == null && component != null) { + result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); + result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); + result.putValue(Action.SMALL_ICON, component.getIcon()); + result.putValue(Action.NAME, component.getText()); + result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); + result.putValue("hideActionText", component.getHideActionText()); + if (component instanceof JAXXToggleButton) { + JAXXToggleButton glueComponent = (JAXXToggleButton) component; + result.putValue(Action.SHORT_DESCRIPTION, glueComponent.getNormalTooltipText()); + result.putValue(Action.NAME, glueComponent.getNormalText()); + result.putValue(Action.SMALL_ICON, glueComponent.getIcon()); + result.putValue(Action.MNEMONIC_KEY, glueComponent.getNormalMnemonic()); + result.putValue(Action.SHORT_DESCRIPTION + 2, glueComponent.getGlueTooltipText()); + result.putValue(Action.NAME + 2, glueComponent.getGlueText()); + result.putValue(Action.SMALL_ICON + 2, glueComponent.getSelectedIcon()); + result.putValue(Action.MNEMONIC_KEY + 2, glueComponent.getGlueMnemonic()); + } + } + } + + String text = (String) result.getValue(Action.NAME); + Integer mnemo = (Integer) result.getValue(Action.MNEMONIC_KEY); + if (mnemo != null && mnemo != '\0') { + int pos = text.indexOf((char) mnemo.intValue()); + if (pos == -1) { + pos = text.indexOf(Character.toLowerCase((char) mnemo.intValue())); + } + result.putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, pos); + } + cache.put(actionKey,result); + return result; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * @param actionKey le nom de l'action tel que d�finie dans le fichier + * de mapping (sans le prefix action.) + * @param component le button o� rattacher l'action + * @return une nouvelle instance de l'action associ�e � sa clef. + */ + public AbstractAction newAction(String actionKey, JComboBox component) { + + // on v�rifie que l'action existe bien + checkRegistredAction(actionKey); + + // try in cache + if (cache.containsKey(actionKey)) { + // use cached action + return cache.get(actionKey); + } + + // on r�cup�re la classe d'implantation de l'action + Class<? extends AbstractAction> klazz = impls.get(actionKey); + + try { + AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result.putValue(Action.ACTION_COMMAND_KEY, actionKey); + + log.debug(actionKey + " : " + result); + // recherche de l'annotation de configuration + SelectActionConfig anno = initSelectActionConfig(component, result); + if (anno == null) { + result.putValue(Action.ACTION_COMMAND_KEY, component.getName()); + result.putValue(Action.SHORT_DESCRIPTION, component.getToolTipText()); + //result.putValue("selectedIndex", component.getSelectedIndex()); + } + cache.put(actionKey,result); + return result; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static ToggleActionConfig initToggleActionConfig(AbstractButton component, AbstractAction result) { + ToggleActionConfig anno = result.getClass().getAnnotation(ToggleActionConfig.class); + if (anno != null) { + // inject les donn�es + if (!anno.name().isEmpty()) { + //System.out.println("found action with name : " + anno.name()); + result.putValue(Action.NAME, _(anno.name())); + } + if (!anno.name2().isEmpty()) { + //System.out.println("found action with name2 : " + anno.name2()); + result.putValue(Action.NAME + "2", _(anno.name2())); + } + + if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); + } + if (!anno.shortDescription2().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION + "2", _(anno.shortDescription2())); + } + + if (!anno.smallIcon().isEmpty()) { + result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + } + if (!anno.smallIcon2().isEmpty()) { + result.putValue(Action.SMALL_ICON + "2", UIHelper.createImageIcon(anno.smallIcon2())); + } + + if (anno.mnemonic() != '\0') { + result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); + } else if (component != null) { + result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); + } + if (anno.mnemonic2() != '\0') { + result.putValue(Action.MNEMONIC_KEY + "2", anno.mnemonic2()); + } + //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + + + result.putValue("hideActionText", anno.hideActionText()); + result.putValue(Action.SELECTED_KEY, anno.selected()); + result.setEnabled(anno.enabled()); + } + return anno; + } + + public static ActionConfig initActionConfig(AbstractButton component, AbstractAction result) { + ActionConfig anno = result.getClass().getAnnotation(ActionConfig.class); + if (anno != null) { + // inject les donn�es + if (!anno.name().isEmpty()) { + //System.out.println("found action with name : " + anno.name()); + result.putValue(Action.NAME, _(anno.name())); + } + //if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); + //} + if (!anno.smallIcon().isEmpty()) { + result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + } + if (anno.mnemonic() != '\0') { + result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); + } else if (component != null) { + result.putValue(Action.MNEMONIC_KEY, component.getMnemonic()); + } + //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + + + result.putValue("hideActionText", anno.hideActionText()); + result.putValue(Action.SELECTED_KEY, anno.selected()); + result.setEnabled(anno.enabled()); + } + return anno; + } + + public static SelectActionConfig initSelectActionConfig(JComboBox component, AbstractAction result) { + SelectActionConfig anno = result.getClass().getAnnotation(SelectActionConfig.class); + if (anno != null) { + // inject les donn�es + if (!anno.name().isEmpty()) { + result.putValue(Action.NAME, _(anno.name())); + } + if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); + } else { + result.putValue(Action.SHORT_DESCRIPTION, _(component.getToolTipText())); + } + result.putValue("selectedIndex", anno.selectedIndex()); + //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + result.setEnabled(anno.enabled()); + } + return anno; + } + + + protected void checkRegistredAction(String actionKey) { + if (!impls.containsKey(actionKey)) { + throw new IllegalStateException("can not find a registered action for key " + actionKey); + } + } + + public String[] getActionNames() { + return impls.keySet().toArray(new String[impls.size()]); + } + + public Set<Map.Entry<String, Class<? extends AbstractAction>>> implsEntrySet() { + return impls.entrySet(); + } + + public Set<Map.Entry<String, AbstractAction>> cacheEntrySet() { + return cache.entrySet(); + } +} Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java 2008-01-21 20:53:22 UTC (rev 183) @@ -0,0 +1,91 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour enregister une action. + * + * Placer cette annotation sur la classe implantant l'action, + * + * les informations d�crites seront utilis�es pour instancier l'action + * + * @author chemit + */ +(a)Retention(RetentionPolicy.RUNTIME) + +(a)Target(ElementType.TYPE) + +public @interface SelectActionConfig { + + /** + * @return la clef de la commande (doit �tre unique) + * @see javax.swing.Action#ACTION_COMMAND_KEY + */ + public abstract String actionCommand(); + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#NAME + */ + public abstract String name() default ""; + + /** + * @return la clef i18n du tooltip de l'action, si vide ignor� + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + public abstract String shortDescription() default ""; + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#LONG_DESCRIPTION + */ + public abstract String longDescription() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + public abstract String accelerator() default ""; + + /** + * @return la valeur par d�faut pour les component selectable + * @see javax.swing.Action#SELECTED_KEY + */ + public abstract int selectedIndex() default 0; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + public abstract boolean enabled() default true; + + /** + * @return la class du container jaxx associ� + * @see javax.swing.Action#NAME + */ + public abstract Class<? extends JAXXObject> container(); + +} \ No newline at end of file Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 20:53:22 UTC (rev 183) @@ -0,0 +1,46 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; + +import javax.swing.JTabbedPane; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour enregister un tab + * + * @author chemit + */ +(a)Retention(RetentionPolicy.RUNTIME) + +(a)Target(ElementType.FIELD) + +public @interface TabContentConfig { + + Class<? extends JAXXObject> impl(); + + Class<? extends JTabbedPane> parentImpl(); + + boolean useToogle() default false; + +} Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java 2008-01-21 20:53:22 UTC (rev 183) @@ -0,0 +1,157 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour enregister une action de type Toggle (ToggleButton). + * + * Placer cette annotation sur la classe implantant l'action, + * + * les informations d�crites seront utilis�es pour instancier l'action + * + * @author chemit + */ +(a)Retention(RetentionPolicy.RUNTIME) + +(a)Target(ElementType.TYPE) + +public @interface ToggleActionConfig { + /** + * @return la clef de la commande (doit �tre unique) + * @see javax.swing.Action#ACTION_COMMAND_KEY + */ + public abstract String actionCommand(); + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#NAME + */ + public abstract String name() default ""; + + /** + * @return la clef i18n du tooltip de l'action, si vide ignor� + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + public abstract String shortDescription() default ""; + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#LONG_DESCRIPTION + */ + public abstract String longDescription() default ""; + + /** + * @return le nom de l'icone associ�, si vide ignor� + * @see javax.swing.Action#SMALL_ICON + */ + public abstract String smallIcon() default ""; + + /** + * @return le nom du grande icone associ�, si vide ignor� + * @see javax.swing.Action#LARGE_ICON_KEY + */ + public abstract String largeIcon() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + public abstract String accelerator() default ""; + + /** + * @return + * @see javax.swing.Action#MNEMONIC_KEY + */ + public abstract int mnemonic() default '\0'; + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#NAME + */ + public abstract String name2() default ""; + + /** + * @return la clef i18n du tooltip de l'action, si vide ignor� + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + public abstract String shortDescription2() default ""; + + /** + * @return la clef i18n du texte de l'action, si vide ignor� + * @see javax.swing.Action#LONG_DESCRIPTION + */ + public abstract String longDescription2() default ""; + + /** + * @return le nom de l'icone associ�, si vide ignor� + * @see javax.swing.Action#SMALL_ICON + */ + public abstract String smallIcon2() default ""; + + /** + * @return le nom du grande icone associ�, si vide ignor� + * @see javax.swing.Action#LARGE_ICON_KEY + */ + public abstract String largeIcon2() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + public abstract String accelerator2() default ""; + + /** + * @return + * @see javax.swing.Action#MNEMONIC_KEY + */ + public abstract int mnemonic2() default '\0'; + + /** + * @return la valeur par d�faut pour les component selectable + * @see javax.swing.Action#SELECTED_KEY + */ + public abstract boolean selected() default false; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + public abstract boolean enabled() default true; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + public abstract boolean hideActionText() default false; + + + /** + * @return la class du container jaxx associ� + * @see javax.swing.Action#NAME + */ + public abstract Class<? extends JAXXObject> container(); + +} \ No newline at end of file

1 0

r182 - trunk/jaxx/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 20:52:44 +0000 (Mon, 21 Jan 2008) New Revision: 182 Added: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java Log: ajout boutton type ToggleButton avec possibilit?\195?\169 de g?\195?\169rer deux texts, tooltip et icons Added: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java 2008-01-21 20:52:44 UTC (rev 182) @@ -0,0 +1,94 @@ +package jaxx.runtime.swing; + +public class JAXXToggleButton extends javax.swing.JToggleButton { + + protected String glueText; + protected String normalText; + protected String glueTooltipText; + protected String normalTooltipText; + protected int normalMnemonic; + protected int glueMnemonic; + + protected boolean _init; + + + public String getGlueText() { + return glueText; + } + + public String getNormalText() { + return normalText; + } + + public String getGlueTooltipText() { + return glueTooltipText; + } + + public String getNormalTooltipText() { + return normalTooltipText; + } + + public void setGlueText(String glueText) { + this.glueText = glueText; + + } + + public void setNormalText(String normalText) { + this.normalText = normalText; + + } + + public void setGlueTooltipText(String glueTooltipText) { + this.glueTooltipText = glueTooltipText; + } + + public int getNormalMnemonic() { + return normalMnemonic; + } + + public void setNormalMnemonic(int normalMnemonic) { + this.normalMnemonic = normalMnemonic; + } + + public int getGlueMnemonic() { + return glueMnemonic; + } + + public void setGlueMnemonic(int glueMnemonic) { + this.glueMnemonic = glueMnemonic; + } + + public void setNormalTooltipText(String normalTooltipText) { + this.normalTooltipText = normalTooltipText; + if (!_init) { + init(); + _init = true; + } + } + + @Override + public void setSelected(boolean b) { + super.setSelected(b); + if (isSelected()) { + setText(getGlueText()); + setToolTipText(getGlueTooltipText()); + setMnemonic(getGlueMnemonic()); + } else { + setText(getNormalText()); + setToolTipText(getNormalTooltipText()); + setMnemonic(getNormalMnemonic()); + } + revalidate(); + } + + public void init() { + setSelected(false); + } + + /* end raw body code */ + public JAXXToggleButton() { + super(); + _init = false; + } + +} \ No newline at end of file

1 0

r181 - trunk/jaxx/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 20:51:09 +0000 (Mon, 21 Jan 2008) New Revision: 181 Modified: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfo.java Log: formatage code + boxing Modified: trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-21 20:50:33 UTC (rev 180) +++ trunk/jaxx/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java 2008-01-21 20:51:09 UTC (rev 181) @@ -46,8 +46,9 @@ AbstractButton button = e.nextElement(); if (button.isSelected()) { Object selectedValue = button.getClientProperty("$value"); - if (selectedValue != getSelectedValue()) + if (selectedValue != getSelectedValue()) { setSelectedValue(selectedValue); + } } } } Modified: trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfo.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfo.java 2008-01-21 20:50:33 UTC (rev 180) +++ trunk/jaxx/src/main/java/jaxx/runtime/swing/TabInfo.java 2008-01-21 20:51:09 UTC (rev 181) @@ -34,156 +34,130 @@ private PropertyChangeSupport propertyChangeSupport; - public TabInfo() { } - public TabInfo(String id) { this.id = id; } - public String getId() { return id; } - public Color getBackground() { return background; } - public void setBackground(Color background) { Color oldValue = this.background; this.background = background; firePropertyChange(BACKGROUND_PROPERTY, oldValue, background); } - public Icon getDisabledIcon() { return disabledIcon; } - public void setDisabledIcon(Icon disabledIcon) { Icon oldValue = this.disabledIcon; this.disabledIcon = disabledIcon; firePropertyChange(DISABLED_ICON_PROPERTY, oldValue, disabledIcon); } - public int getDisplayedMnemonicIndex() { return displayedMnemonicIndex; } - public void setDisplayedMnemonicIndex(int displayedMnemonicIndex) { int oldValue = this.displayedMnemonicIndex; this.displayedMnemonicIndex = displayedMnemonicIndex; - firePropertyChange(DISPLAYED_MNEMONIC_INDEX_PROPERTY, new Integer(oldValue), new Integer(displayedMnemonicIndex)); + firePropertyChange(DISPLAYED_MNEMONIC_INDEX_PROPERTY, oldValue, displayedMnemonicIndex); } - public boolean isEnabled() { return enabled; } - public void setEnabled(boolean enabled) { boolean oldValue = this.enabled; this.enabled = enabled; - firePropertyChange(ENABLED_PROPERTY, new Boolean(oldValue), new Boolean(enabled)); + firePropertyChange(ENABLED_PROPERTY, oldValue, enabled); } - public Color getForeground() { return foreground; } - public void setForeground(Color foreground) { Color oldValue = this.foreground; this.foreground = foreground; firePropertyChange(FOREGROUND_PROPERTY, oldValue, foreground); } - public Icon getIcon() { return icon; } - public void setIcon(Icon icon) { Icon oldValue = this.icon; this.icon = icon; firePropertyChange(ICON_PROPERTY, oldValue, icon); } - public int getMnemonic() { return mnemonic; } - public void setMnemonic(int mnemonic) { int oldValue = this.mnemonic; this.mnemonic = mnemonic; - firePropertyChange(MNEMONIC_PROPERTY, new Integer(oldValue), new Integer(mnemonic)); + firePropertyChange(MNEMONIC_PROPERTY, oldValue, mnemonic); } - public String getTitle() { return title; } - public void setTitle(String title) { String oldValue = this.title; this.title = title; firePropertyChange(TITLE_PROPERTY, oldValue, title); } - public String getToolTipText() { return toolTipText; } - public void setToolTipText(String toolTipText) { String oldValue = this.toolTipText; this.toolTipText = toolTipText; firePropertyChange(TOOL_TIP_TEXT_PROPERTY, oldValue, toolTipText); } - private PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) + if (propertyChangeSupport == null) { propertyChangeSupport = new SwingPropertyChangeSupport(this); + } return propertyChangeSupport; } - public void addPropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(listener); } - public void addPropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().addPropertyChangeListener(property, listener); } - public void removePropertyChangeListener(PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(listener); } - public void removePropertyChangeListener(String property, PropertyChangeListener listener) { getPropertyChangeSupport().removePropertyChangeListener(property, listener); } - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { if (propertyChangeSupport != null) getPropertyChangeSupport().firePropertyChange(propertyName, oldValue, newValue);

1 0

r180 - trunk/jaxx/src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org Jan. 21, 2008

Jan. 21, 2008

Author: tchemit Date: 2008-01-21 20:50:33 +0000 (Mon, 21 Jan 2008) New Revision: 180 Added: trunk/jaxx/src/main/java/jaxx/runtime/UIHelper.java Log: une classe d'utilitaire (temporaire devrait etre dans lutinwidget) Added: trunk/jaxx/src/main/java/jaxx/runtime/UIHelper.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/UIHelper.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/UIHelper.java 2008-01-21 20:50:33 UTC (rev 180) @@ -0,0 +1,35 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime; + +import javax.swing.ImageIcon; + +/** @author tony */ +public class UIHelper { + + public static ImageIcon createImageIcon(String path) { + java.net.URL imgURL = UIHelper.class.getResource("/icons/" + path); + if (imgURL != null) { + return new ImageIcon(imgURL); + } else { + throw new RuntimeException("could not find icon " + path); + } + } + +}

1 0