- Jaxx-commits - mailman.cloud.codelutin.com

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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

[Buix-commits] 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