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

r1185 - in jaxx/trunk/jaxx-compiler-api: . src/main/java/jaxx/compiler src/main/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org 24 Jan '09

24 Jan '09

Author: tchemit Date: 2009-01-24 20:59:24 +0000 (Sat, 24 Jan 2009) New Revision: 1185 Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/CompilerOptions.java jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java Log: introduce a flag useUIManagerForIcon to retreave icons from UIManager Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-24 10:44:23 UTC (rev 1184) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-24 20:59:24 UTC (rev 1185) @@ -1,4 +1,5 @@ 1.1 chemit 200901?? + * 20090124 [chemit] - introduce a flag useUIManagerForIcon to retreave icons from UIManager * 20090123 [chemit] - cache the lineSeparator property in JAXXCompiler - can directly give the icon relatif path (in /icons/ directory) - add an actionIcon attribute to be surronded in the Util.createActionIcon Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/CompilerOptions.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/CompilerOptions.java 2009-01-24 10:44:23 UTC (rev 1184) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/CompilerOptions.java 2009-01-24 20:59:24 UTC (rev 1185) @@ -1,5 +1,7 @@ package jaxx.compiler; +import org.apache.commons.lang.builder.ToStringBuilder; + import java.io.File; /** @@ -31,10 +33,14 @@ /** default error ui */ private Class<?> defaultErrorUI; - + private ClassLoader classLoader; private Class<? extends JAXXCompiler> compilerClass; + + /** a flag to use {@link javax.swing.UIManager} to retreave icons. */ + private boolean useUIManagerForIcon; + /** * Returns the target directory, generally specified with the "-d" option on the command line. * @@ -173,6 +179,10 @@ return i18nable; } + public boolean isUseUIManagerForIcon() { + return useUIManagerForIcon; + } + public void setI18nable(boolean i18nable) { this.i18nable = i18nable; } @@ -209,22 +219,13 @@ this.resetAfterCompile = resetAfterCompile; } + public void setUseUIManagerForIcon(boolean useUIManagerForIcon) { + this.useUIManagerForIcon = useUIManagerForIcon; + } + @Override public String toString() { - StringBuilder sb = new StringBuilder(super.toString()); - sb.append("\nclassPath : ").append(getClassPath()); - sb.append("\ncompilerClass : ").append(compilerClass); - sb.append("\njavaOut : ").append(getTargetDirectory()); - sb.append("\noutClass : ").append(getJavacTargetDirectory()); - sb.append("\njavacOpts : ").append(getJavacOpts()); - sb.append("\nverbose : ").append(isVerbose()); - sb.append("\noptiomize : ").append(getOptimize()); - sb.append("\ni18nable : ").append(isI18nable()); - sb.append("\naddLogger : ").append(isAddLogger()); - sb.append("\nresetAfterCompile : ").append(isResetAfterCompile()); - sb.append("\njaxxContextImplementorClass : ").append(getJaxxContextImplementorClass()); - sb.append("\nextraImports : ").append(getExtraImports()); - return sb.toString(); + return ToStringBuilder.reflectionToString(this); } Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java 2009-01-24 10:44:23 UTC (rev 1184) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java 2009-01-24 20:59:24 UTC (rev 1185) @@ -200,7 +200,11 @@ if ("icon".equals(propertyName)) { if (!(stringValue.startsWith("{") || stringValue.endsWith("}"))) { // this is a customized icon, add the icon creation code - stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createImageIcon(\"" + stringValue + "\")}"; + if (compiler.getOptions().isUseUIManagerForIcon()) { + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".getUIManagerIcon(\"" + stringValue + "\")}"; + } else { + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createImageIcon(\"" + stringValue + "\")}"; + } } } else if ("actionIcon".equals(propertyName)) { // customized actionIcon property @@ -210,7 +214,11 @@ return; } propertyName = "icon"; - stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createActionIcon(\"" + stringValue + "\")}"; + if (compiler.getOptions().isUseUIManagerForIcon()) { + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".getUIManagerActionIcon(\"" + stringValue + "\")}"; + } else { + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createActionIcon(\"" + stringValue + "\")}"; + } } super.setAttribute(object, propertyName, stringValue, inline, compiler); }

1 0

r1184 - in jaxx/trunk/jaxx-runtime-swing: . src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.labs.libre-entreprise.org 24 Jan '09

24 Jan '09

Author: tchemit Date: 2009-01-24 10:44:23 +0000 (Sat, 24 Jan 2009) New Revision: 1184 Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java Log: improve NavigationTreeNodeRenderer (now can customized node internalClass) Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-24 10:36:55 UTC (rev 1183) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-24 10:44:23 UTC (rev 1184) @@ -1,8 +1,9 @@ 1.1 chemit 200901?? + * 20090123 [chemit] - improve NavigationTreeNodeRenderer (now can customized node internalClass) * 20090121 [letellier] - add some usefull methods in JAXXList and JAXXComboBox 1.0 chemit 20090111 - * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) + * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) * 20090105 [chemit] - improve CardLayout2 0.8 ??? 200812?? * 20081228 [chemit] - generify ClassDescriptor @@ -50,11 +51,11 @@ - make possible binding to the javaBean added properties - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java 2009-01-24 10:36:55 UTC (rev 1183) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeCellRenderer.java 2009-01-24 10:44:23 UTC (rev 1184) @@ -64,17 +64,30 @@ return delegate.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + /** + * @param value the value which should be a node + * @return the nodeRenderer attached to node via the {@link NavigationTreeNode#userObject}, + * or <code>null</code> if value is null, or value is not int good type. + */ protected NodeRenderer getNodeRenderer(Object value) { NodeRenderer render = null; - if (value != null && value instanceof NavigationTreeNode && ((NavigationTreeNode) value).getUserObject() instanceof NodeRenderer) { + if (value != null) { + NavigationTreeNode node = getNode(value); - // NodeRenderer used as userObject - NavigationTreeNode navigationTreeNode = (NavigationTreeNode) value; - - render = (NodeRenderer) navigationTreeNode.getUserObject(); + if (node != null && node.getUserObject() instanceof NodeRenderer) { + render = (NodeRenderer) node.getUserObject(); + } } return render; } + /** + * @param value the value which should be a node + * @return the cast {@link NavigationTreeNode}, or <code>null</code> if value is null. + */ + protected NavigationTreeNode getNode(Object value) { + return value instanceof NavigationTreeNode ? (NavigationTreeNode) value : null; + } + } Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java 2009-01-24 10:36:55 UTC (rev 1183) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java 2009-01-24 10:44:23 UTC (rev 1184) @@ -243,6 +243,16 @@ /** renderer of the node */ protected NodeRenderer renderer; + /** + * The type of the related bean associated with the node. + * <p/> + * Note: This type is here to override the NodeRenderer internalClass, since + * we could need to override this data. + * <p/> + * If this property is let to null, then we will use the NodeRenderer one + */ + protected Class<?> internalClass; + public NavigationTreeNode(Object renderer, Object jaxxContextEntryDef, String navigationPath, @@ -313,6 +323,10 @@ this.jaxxClass = jaxxClass; } + public void setInternalClass(Class<?> internalClass) { + this.internalClass = internalClass; + } + public Class<? extends JAXXAction> getJaxxActionClass() { return jaxxActionClass; } @@ -338,7 +352,7 @@ } public Class<?> getInternalClass() { - return renderer.getInternalClass(); + return internalClass == null ? renderer.getInternalClass() : internalClass; } /** @return the fully context pathof the node from the root node to this. */

1 0

r1183 - in jaxx/trunk/jaxx-runtime-api: . src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 24 Jan '09

24 Jan '09

Author: tchemit Date: 2009-01-24 10:36:55 +0000 (Sat, 24 Jan 2009) New Revision: 1183 Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java Log: add a UIManager key "default.icon.path" to be able to change the path where to find icons Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-23 21:54:09 UTC (rev 1182) +++ jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-24 10:36:55 UTC (rev 1183) @@ -1,5 +1,6 @@ 1.1 chemit 200901?? * 20090123 [chemit] - add a simple createIcon method in Util classe (to create an icon with no path prefix) + - add a UIManager key "default.icon.path" to be able to change the path where to find icons * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) 1.0 chemit 20090111 Modified: jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java =================================================================== --- jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-01-23 21:54:09 UTC (rev 1182) +++ jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-01-24 10:36:55 UTC (rev 1183) @@ -9,6 +9,7 @@ import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JList; +import javax.swing.UIManager; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; @@ -34,6 +35,9 @@ public class Util { + public static final String DEFAULT_ICON_PATH = "/icons/"; + public static final String DEFAULT_ICON_PATH_PROPERTY = "default.icon.path"; + /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(Util.class); @@ -448,15 +452,30 @@ * @return the icon at "/icons/"+path */ public static ImageIcon createImageIcon(String path) { - return createIcon("/icons/" + path); + String iconPath = getIconPath(); + return createIcon(iconPath + path); } public static ImageIcon createActionIcon(String name) { - return createIcon("/icons/action-" + name + ".png"); + String iconPath = getIconPath(); + return createIcon(iconPath + "action-" + name + ".png"); } public static ImageIcon createI18nIcon(String name) { - return createIcon("/icons/i18n/" + name + ".png"); + String iconPath = getIconPath(); + return createIcon(iconPath + "i18n/" + name + ".png"); } + private static String getIconPath() { + String iconPath = UIManager.getString(DEFAULT_ICON_PATH_PROPERTY); + if (iconPath == null) { + iconPath = DEFAULT_ICON_PATH; + } else { + if (!iconPath.endsWith("/")) { + iconPath += "/"; + } + } + return iconPath; + } + }

1 0

r1182 - in jaxx/trunk: jaxx-compiler-api jaxx-compiler-api/src/main/java/jaxx/tags jaxx-runtime-api jaxx-runtime-api/src/main/java/jaxx/runtime maven-jaxx-plugin maven-jaxx-plugin/src/test/java/org/codelutin/jaxx maven-jaxx-plugin/src/test/resources/testcases maven-jaxx-plugin/src/test/resources/testcases/icon
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 21:54:09 +0000 (Fri, 23 Jan 2009) New Revision: 1182 Added: jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Icon.xml jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/ jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java jaxx/trunk/jaxx-runtime-api/changelog.txt jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java jaxx/trunk/maven-jaxx-plugin/changelog.txt jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java Log: - add a simple createIcon method in Util classe (to create an icon with no path prefix) - can directly give the icon relatif path (in /icons/ directory) - add an actionIcon attribute to be surronded in the Util.createActionIcon - add tests for icon improvment Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 21:54:09 UTC (rev 1182) @@ -1,5 +1,8 @@ 1.1 chemit 200901?? * 20090123 [chemit] - cache the lineSeparator property in JAXXCompiler + - can directly give the icon relatif path (in /icons/ directory) + - add an actionIcon attribute to be surronded in the Util.createActionIcon + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) 1.0 chemit 20090111 Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/DefaultComponentHandler.java 2009-01-23 21:54:09 UTC (rev 1182) @@ -195,6 +195,25 @@ return super.getSetPropertyCode(id, name, valueCode, compiler); } + @Override + public void setAttribute(CompiledObject object, String propertyName, String stringValue, boolean inline, JAXXCompiler compiler) { + if ("icon".equals(propertyName)) { + if (!(stringValue.startsWith("{") || stringValue.endsWith("}"))) { + // this is a customized icon, add the icon creation code + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createImageIcon(\"" + stringValue + "\")}"; + } + } else if ("actionIcon".equals(propertyName)) { + // customized actionIcon property + if (stringValue.startsWith("{") && stringValue.endsWith("}")) { + // there is a script to define the action icon, this is forbidden + compiler.reportError("the actionIcon does not support script, remove braces..., fix the file " + compiler.getOutputClassName()); + return; + } + propertyName = "icon"; + stringValue = "{" + jaxx.runtime.Util.class.getName() + ".createActionIcon(\"" + stringValue + "\")}"; + } + super.setAttribute(object, propertyName, stringValue, inline, compiler); + } /** * Maps string values onto integers, so that int-valued enumeration properties can be specified by strings. For Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-23 21:54:09 UTC (rev 1182) @@ -1,4 +1,5 @@ 1.1 chemit 200901?? + * 20090123 [chemit] - add a simple createIcon method in Util classe (to create an icon with no path prefix) * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) 1.0 chemit 20090111 Modified: jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java =================================================================== --- jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-01-23 21:54:09 UTC (rev 1182) @@ -6,9 +6,9 @@ import org.jdesktop.jxlayer.JXLayer; import javax.swing.DefaultListCellRenderer; +import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JList; -import javax.swing.ImageIcon; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; @@ -434,8 +434,8 @@ }; } - public static ImageIcon createImageIcon(String path) { - java.net.URL imgURL = Util.class.getResource("/icons/" + path); + public static ImageIcon createIcon(String path) { + java.net.URL imgURL = Util.class.getResource(path); if (imgURL != null) { return new ImageIcon(imgURL); } else { @@ -443,12 +443,20 @@ } } + /** + * @param path the location of icons in root directory icons + * @return the icon at "/icons/"+path + */ + public static ImageIcon createImageIcon(String path) { + return createIcon("/icons/" + path); + } + public static ImageIcon createActionIcon(String name) { - return createImageIcon("action-" + name + ".png"); + return createIcon("/icons/action-" + name + ".png"); } public static ImageIcon createI18nIcon(String name) { - return createImageIcon("i18n/" + name + ".png"); + return createIcon("/icons/i18n/" + name + ".png"); } } Modified: jaxx/trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-23 21:54:09 UTC (rev 1182) @@ -1,4 +1,5 @@ 1.1 chemit 200901?? + * 20090123 [chemit] - add tests for icon improvment * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) - rename i18n bundles according artifactId * 20090113 [chemit] - fix bug : when using addProjectClassPath property, sometimes does not retreave Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2009-01-23 21:45:08 UTC (rev 1181) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2009-01-23 21:54:09 UTC (rev 1182) @@ -18,6 +18,11 @@ assertEquals(1, mojo.getFiles().length); } + public void testIcon() throws Exception { + mojo.execute(); + assertEquals(1, mojo.getFiles().length); + } + public void testSpecialSubclassing() throws Exception { mojo.execute(); assertEquals(7, mojo.getFiles().length); Copied: jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Icon.xml (from rev 1173, jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1751.xml) =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Icon.xml (rev 0) +++ jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Icon.xml 2009-01-23 21:54:09 UTC (rev 1182) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outResource>${basedir}/target/it-generated-sources/resources</outResource> + <i18nable>false</i18nable> + <force>true</force> + <verbose>true</verbose> + <resetAfterCompile>true</resetAfterCompile> + <includes> + <value>**/icon/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx (rev 0) +++ jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx 2009-01-23 21:54:09 UTC (rev 1182) @@ -0,0 +1,4 @@ +<JPanel> + <JLabel actionIcon='myIcon.png'/> + <JLabel icon='myIcon.png'/> +</JPanel>

1 0

r1181 - jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 21:45:08 +0000 (Fri, 23 Jan 2009) New Revision: 1181 Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java Log: ajout todo sur javadoc Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java 2009-01-23 21:37:28 UTC (rev 1180) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java 2009-01-23 21:45:08 UTC (rev 1181) @@ -1,6 +1,10 @@ package jaxx.compiler; -/** @author chemit */ +/** + * TODO javadoc! + * + * @author chemit + */ public interface Generator { void finalizeCompiler(CompiledObject root, JAXXCompiler compiler, JavaFile javaFile, String packageName, String className);

1 0

r1180 - in jaxx/trunk/jaxx-compiler-api: . src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 21:37:28 +0000 (Fri, 23 Jan 2009) New Revision: 1180 Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java Log: cache the lineSeparator property in JAXXCompiler Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 14:12:00 UTC (rev 1179) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 21:37:28 UTC (rev 1180) @@ -1,4 +1,5 @@ 1.1 chemit 200901?? + * 20090123 [chemit] - cache the lineSeparator property in JAXXCompiler * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) 1.0 chemit 20090111 Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-01-23 14:12:00 UTC (rev 1179) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-01-23 21:37:28 UTC (rev 1180) @@ -1310,13 +1310,16 @@ } } + /** line separator cached value */ + protected static String lineSeparator = System.getProperty("line.separator", "\n"); + /** * Returns the system line separator string. * * @return the string used to separate lines */ public static String getLineSeparator() { - return System.getProperty("line.separator", "\n"); + return lineSeparator; } // 1.5 adds getCanonicalName; unfortunately we can't depend on 1.5 features yet

1 0

r1179 - in jaxx/trunk/jaxx-runtime-validator/src: main/java/jaxx/runtime/validator/field test/java/jaxx/runtime/validator/field test/resources/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 14:12:00 +0000 (Fri, 23 Jan 2009) New Revision: 1179 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml Log: ajout d'un validateur pour tester l'unicit?\195?\169 d'une clef dans une collection Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -41,7 +41,11 @@ } public void setKeys(String[] keys) { - this.keys = keys; + if (keys != null && keys.length == 1 && keys[0].indexOf(",") != -1) { + this.keys = keys[0].split(","); + } else { + this.keys = keys; + } } @Override Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -9,6 +9,7 @@ static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); + static protected ValidatorBeanEntry beanEntry3 = new ValidatorBeanEntry(0, "stringValue", "stringValue2"); @org.junit.Test @Override @@ -19,6 +20,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // add a entry bean.setEntries(Arrays.asList(beanEntry)); @@ -26,6 +28,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // two entries with same key bean.setEntries(Arrays.asList(beanEntry, beanEntry)); @@ -33,6 +36,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", true); assertFieldInError("entries", "collectionUniqueKey.two.failed", true); assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", true); // add a entry bean.setEntries(Arrays.asList(beanEntry2)); @@ -40,6 +44,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // add two entries (will violated unique key on intValue) bean.setEntries(Arrays.asList(beanEntry2, beanEntry)); @@ -47,6 +52,24 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", true); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + + // two entries with same key (except validator four) + bean.setEntries(Arrays.asList(beanEntry, beanEntry3)); + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + + beanEntry.setStringValue2("stringValue2"); + // two entries with same key + bean.setEntries(Arrays.asList(beanEntry, beanEntry3)); + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", true); + + } } \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -11,12 +11,19 @@ protected int intValue; protected String stringValue; + protected String stringValue2; public ValidatorBeanEntry(int intValue, String stringValue) { this.intValue = intValue; this.stringValue = stringValue; } + public ValidatorBeanEntry(int intValue, String stringValue, String stringValue2) { + this.intValue = intValue; + this.stringValue = stringValue; + this.stringValue2 = stringValue2; + } + public int getIntValue() { return intValue; } @@ -32,6 +39,14 @@ public void setStringValue(String stringValue) { this.stringValue = stringValue; } + + public String getStringValue2() { + return stringValue2; + } + + public void setStringValue2(String stringValue2) { + this.stringValue2 = stringValue2; + } } protected File existingFile; @@ -110,8 +125,10 @@ } public void setEntries(Collection<ValidatorBeanEntry> entries) { - Collection<ValidatorBeanEntry> old = this.entries; this.entries = entries; - p.firePropertyChange("entries", old, entries); + // set null oldValue to always fire event + // otherwise it could been not sent... + p.firePropertyChange("entries", null, entries); } + } \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-23 14:12:00 UTC (rev 1179) @@ -75,6 +75,10 @@ <param name="keys">intValue,stringValue</param> <message>collectionUniqueKey.three.failed</message> </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue,stringValue,stringValue2</param> + <message>collectionUniqueKey.four.failed</message> + </field-validator> </field> </validators> \ No newline at end of file

1 0

r1178 - jaxx/trunk/jaxx-example/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 12:27:43 +0000 (Fri, 23 Jan 2009) New Revision: 1178 Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties Log: update i18n Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-23 12:12:53 UTC (rev 1177) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-23 12:27:43 UTC (rev 1178) @@ -45,6 +45,7 @@ Greet= Inc\ (+)= Italic= +JAXX\ Demo= JMenu\ demo= Last\ Name\:= LastName\:= Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-23 12:12:53 UTC (rev 1177) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-23 12:27:43 UTC (rev 1178) @@ -45,6 +45,7 @@ Greet= Inc\ (+)= Italic= +JAXX\ Demo= JMenu\ demo= Last\ Name\:= LastName\:=

1 0

r1177 - in jaxx/trunk/jaxx-runtime-validator/src: main/java/jaxx/runtime/validator/field main/resources test/java/jaxx/runtime/validator/field test/resources test/resources/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 12:12:53 +0000 (Fri, 23 Jan 2009) New Revision: 1177 Added: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties Log: ajout d'un validateur pour tester l'unicit?\195?\169 d'une clef dans une collection Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -42,7 +42,7 @@ @Override public void validate(Object object) throws ValidationException { if (mode == null) { - throw new ValidationException("no mode was setted"); + throw new ValidationException("no mode defined"); } String fieldName = getFieldName(); Copied: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java (from rev 1173, jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -0,0 +1,137 @@ +package jaxx.runtime.validator.field; + +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * Un validateur basé sur {@link FieldExpressionValidator} qui valide une clef + * unique sur une collection. + * <p/> + * Le {@link #fieldName} sert à récupérer la propriété de type de collection du bean. + * + * @author chemit + */ +public class CollectionUniqueKeyValidator extends FieldExpressionValidator { + + + public enum Mode { + /** au moins une entrée de la collection doit etre valide */ + AT_LEAST_ONE, + /** exactement une entrée dela collection doit être valide */ + EXACTLY_ONE, + /** toutes les valeurs de la collection doivent etre valides */ + ALL, + /** aucune valeur de la collection doivent etre valides */ + NONE + } + + /** + * la liste des propriétés d'une entrée de la collection qui définit la + * clef unique. + */ + protected String[] keys; + + public String[] getKeys() { + return keys; + } + + public void setKeys(String[] keys) { + this.keys = keys; + } + + @Override + public void validate(Object object) throws ValidationException { + + if (keys == null || keys.length == 0) { + throw new ValidationException("no unique keys defined"); + } + + String fieldName = getFieldName(); + + Collection<?> col = getCollection(object); + + if (col.size() < 2) { + // la liste ne contient pas deux entrées donc c'est valide + return; + } + + boolean answer = true; + + List<Integer> hashCodes = new ArrayList<Integer>(); + + for (Object o : col) { + Integer hash = getUniqueKeyHashCode(o); + if (hashCodes.contains(hash)) { + // on a deja rencontre cette clef unique, + // donc la validation a echouee + answer = false; + break; + } + + // nouveau hashcode enregistre + hashCodes.add(hash); + } + + if (!answer) { + addFieldError(fieldName, object); + } + } + + /** + * Calcule pour une entrée donné, le hash de la clef unique + * + * @param o l'entree de la collection dont on va calculer le hash de la clef unique + * @return le hashCode calclé de la clef unique sur l'entrée donné + * @throws ValidationException if any pb to retreave properties values + */ + protected Integer getUniqueKeyHashCode(Object o) throws ValidationException { + // calcul du hash à la volée + HashCodeBuilder builder = new HashCodeBuilder(); + for (String key : this.keys) { + Object property = getFieldValue(key, o); + builder.append(property); + } + return builder.toHashCode(); + } + + /** + * @param object the incoming object containing the collection to test + * @return the collection of the incoming object given by the fieldName property + * @throws ValidationException if any pb to retreave the collection + */ + protected Collection<?> getCollection(Object object) throws ValidationException { + String fieldName = getFieldName(); + + Object obj = null; + + // obtain the collection to test + try { + obj = getFieldValue(fieldName, object); + } catch (ValidationException e) { + throw e; + } catch (Exception e) { + // let this pass, but it will be logged right below + } + + if (obj == null) { + // la collection est nulle, donc on renvoie une collection vide + return java.util.Collections.EMPTY_LIST; + } + + if (!Collection.class.isInstance(obj)) { + throw new ValidationException("field " + fieldName + " is not a collection type! (" + obj.getClass() + ")"); + } + return (Collection<?>) obj; + } + + @Override + public String getValidatorType() { + return "collectionUniqueKey"; + } + +} \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-23 12:12:53 UTC (rev 1177) @@ -12,5 +12,7 @@ <validator name="notExistingDirectory" class="jaxx.runtime.validator.field.NotExistingDirectoryFieldValidator"/> <validator name="collectionFieldExpression" class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> + <validator name="collectionUniqueKey" + class="jaxx.runtime.validator.field.CollectionUniqueKeyValidator"/> </validators>  Added: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -0,0 +1,52 @@ +package jaxx.runtime.validator.field; + +import jaxx.runtime.validator.field.ValidatorBean.ValidatorBeanEntry; + +import java.util.Arrays; + +/** @author chemit */ +public class CollectionUniqueKeyValidatorTest extends AbstractValidatorTest { + + static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); + static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); + + @org.junit.Test + @Override + public void testValidator() throws Exception { + assertNull(bean.getEntries()); + + // no entry + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // add a entry + bean.setEntries(Arrays.asList(beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // two entries with same key + bean.setEntries(Arrays.asList(beanEntry, beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + + // add a entry + bean.setEntries(Arrays.asList(beanEntry2)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // add two entries (will violated unique key on intValue) + bean.setEntries(Arrays.asList(beanEntry2, beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + } +} \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-23 12:12:53 UTC (rev 1177) @@ -62,6 +62,19 @@ <param name="expression"><![CDATA[ intValue == 0 && stringValue == "stringValue" ]]></param> <message>collectionFieldExpression.none</message> </field-validator> + + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue</param> + <message>collectionUniqueKey.one.failed</message> + </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">stringValue</param> + <message>collectionUniqueKey.two.failed</message> + </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue,stringValue</param> + <message>collectionUniqueKey.three.failed</message> + </field-validator> </field> </validators> \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-23 12:12:53 UTC (rev 1177) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

1 0

r1176 - jaxx/trunk/jaxx-example/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 22 Jan '09

22 Jan '09

Author: tchemit Date: 2009-01-22 15:28:17 +0000 (Thu, 22 Jan 2009) New Revision: 1176 Added: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties Removed: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties Log: refactor poms reformat changelog rename some bundles according to the artifactId Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties (from rev 1175, jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties (from rev 1175, jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x= Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x=

1 0