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

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0

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

12 Jan '08

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

1 0