This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-1 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit a3d4ea33ae86725e76b7d4a832e366b0b48fa5bd Author: Tony Chemit <chemit@codelutin.com> Date: Tue Oct 6 04:59:00 2009 +0000 [Evolution #74] : pouvoir generer les classes swing (JComboBox, JList,...) --- .../src/main/java/jaxx/SwingInitializer.java | 31 +++-- .../{JListHandler.java => JAXXListHandler.java} | 128 +++++++++---------- .../{JTreeHandler.java => JAXXTreeHandler.java} | 138 ++++++++++----------- .../java/jaxx/tags/swing/JComboBoxHandler.java | 1 + .../main/java/jaxx/tags/swing/JListHandler.java | 38 ++---- .../main/java/jaxx/tags/swing/JTreeHandler.java | 42 ++----- jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx | 5 +- .../navigation/item/ItemTreeNavigationDemo.jaxx | 4 +- .../java/jaxx/demo/component/swing/JListDemo.jaxx | 116 ++++++++--------- .../{ComboBoxTest.java => Evolution74Test.java} | 22 +++- .../jaxx/plugin/ComboBoxTest/ok/jaxxcombo.jaxx | 4 - .../jaxx/plugin/ComboBoxTest/ok/swingcombo.jaxx | 2 - .../SpecialSubclassing/JListTest1.jaxx | 4 +- .../SpecialSubclassing/JListTest2.jaxx | 4 +- .../SpecialSubclassing/JTreeTest1.jaxx | 4 +- .../SpecialSubclassing/JTreeTest2.jaxx | 4 +- .../{ComboBoxTest => Evolution74Test}/error.xml | 2 +- .../error/swingcombo.jaxx | 0 .../plugin/Evolution74Test/error/swinglist.jaxx | 4 + .../plugin/Evolution74Test/error/swingtree.jaxx | 4 + .../{ComboBoxTest => Evolution74Test}/ok.xml | 2 +- .../jaxx/plugin/Evolution74Test/ok/jaxxcombo.jaxx | 4 + .../jaxx/plugin/Evolution74Test/ok/jaxxlist.jaxx | 4 + .../jaxx/plugin/Evolution74Test/ok/jaxxtree.jaxx | 4 + .../jaxx/plugin/Evolution74Test/ok/swingcombo.jaxx | 2 + .../jaxx/plugin/Evolution74Test/ok/swinglist.jaxx | 1 + .../jaxx/plugin/Evolution74Test/ok/swingtree.jaxx | 2 + 27 files changed, 284 insertions(+), 292 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/SwingInitializer.java b/jaxx-compiler/src/main/java/jaxx/SwingInitializer.java index e849f42..a832eea 100644 --- a/jaxx-compiler/src/main/java/jaxx/SwingInitializer.java +++ b/jaxx-compiler/src/main/java/jaxx/SwingInitializer.java @@ -39,38 +39,47 @@ public class SwingInitializer implements Initializer { // TagManager.registerTag("java.awt.*", "ButtonGroup", new DefaultObjectHandler(ClassDescriptorLoader.getClassDescriptor(JAXXButtonGroup.class))); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(Application.class), ApplicationHandler.class); + + // check boxes TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JCheckBox.class), JCheckBoxHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JCheckBoxMenuItem.class), JCheckBoxHandler.class); - //TC-20091005 : JAXXComboBox and JComboBox are not the same -// TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXComboBox.class), JComboBoxHandler.class); -// TagManager.registerTag("javax.swing.*", "JComboBox", new JComboBoxHandler(ClassDescriptorLoader.getClassDescriptor(JAXXComboBox.class))); + + // combo boxes TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JComboBox.class), JComboBoxHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(EnumEditor.class), JComboBoxHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(LocaleEditor.class), JComboBoxHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXComboBox.class), JAXXComboBoxHandler.class); + // radio boxes + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JRadioButton.class), JRadioButtonHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JRadioButtonMenuItem.class), JRadioButtonHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JToggleButton.class), JRadioButtonHandler.class); + + // Lists + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JList.class), JListHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXList.class), JAXXListHandler.class); + + // Trees + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JTree.class), JTreeHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXTree.class), JAXXTreeHandler.class); + + // Windows TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JDialog.class), JWindowHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JFrame.class), JWindowHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JWindow.class), JWindowHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JInternalFrame.class), JInternalFrameHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXList.class), JListHandler.class); - TagManager.registerTag("javax.swing.*", "JList", new JListHandler(ClassDescriptorLoader.getClassDescriptor(JAXXList.class))); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JMenu.class), JMenuHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JPasswordField.class), JPasswordFieldHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JPopupMenu.class), JPopupMenuHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JProgressBar.class), JProgressBarHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JRadioButton.class), JRadioButtonHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JRadioButtonMenuItem.class), JRadioButtonHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JScrollPane.class), JScrollPaneHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JSlider.class), JSliderHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JSpinner.class), JSpinnerHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JSplitPane.class), JSplitPaneHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JTabbedPane.class), JTabbedPaneHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JTextComponent.class), JTextComponentHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JToggleButton.class), JRadioButtonHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JToolBar.class), JToolBarHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JAXXTree.class), JTreeHandler.class); - TagManager.registerTag("javax.swing.*", "JTree", new JTreeHandler(ClassDescriptorLoader.getClassDescriptor(JAXXTree.class))); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JWindow.class), JWindowHandler.class); TagManager.registerDefaultNamespace("JEditorPane", "javax.swing.*"); TagManager.registerDefaultNamespace("JFormattedTextField", "javax.swing.*"); diff --git a/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java b/jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXListHandler.java similarity index 93% copy from jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java copy to jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXListHandler.java index 40d436b..194b467 100644 --- a/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXListHandler.java @@ -1,64 +1,64 @@ -/* - * Copyright 2006 Ethan Nicholas. All rights reserved. - * Use is subject to license terms. - */ -package jaxx.tags.swing; - -import jaxx.CompilerException; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.reflect.ClassDescriptor; -import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXList; -import jaxx.tags.DefaultComponentHandler; -import jaxx.types.TypeManager; -import org.w3c.dom.Element; - -import javax.swing.event.ListSelectionListener; -import java.io.IOException; -import java.util.List; - -public class JListHandler extends DefaultComponentHandler { - public JListHandler(ClassDescriptor beanClass) { - super(beanClass); - ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXList.class); - } - - @Override - protected void configureProxyEventInfo() { - super.configureProxyEventInfo(); - addProxyEventInfo("getSelectedIndex", ListSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectedIndices", ListSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectedValue", ListSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectedValues", ListSelectionListener.class, "selectionModel"); - } - - @Override - public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { - return new CompiledItemContainer(id, getBeanClass(), compiler); - } - - @Override - public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { - super.compileChildrenSecondPass(tag, compiler); - CompiledItemContainer list = (CompiledItemContainer) compiler.getOpenComponent(); - List<Item> items = list.getItems(); - if (items != null && !items.isEmpty()) { - String listName = list.getId() + "$items"; - //TODO Add the correct generic type - 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); - compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); - compiler.registerCompiledObject(compiledItem); - list.appendAdditionCode(listName + ".add(" + id + ");"); - } - list.appendAdditionCode(list.getId() + ".setItems(" + listName + ");"); - } - } -} - - - +/* + * Copyright 2006 Ethan Nicholas. All rights reserved. + * Use is subject to license terms. + */ +package jaxx.tags.swing; + +import jaxx.CompilerException; +import jaxx.compiler.CompiledObject; +import jaxx.compiler.JAXXCompiler; +import jaxx.reflect.ClassDescriptor; +import jaxx.reflect.ClassDescriptorLoader; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXList; +import jaxx.tags.DefaultComponentHandler; +import jaxx.types.TypeManager; +import org.w3c.dom.Element; + +import javax.swing.event.ListSelectionListener; +import java.io.IOException; +import java.util.List; + +public class JAXXListHandler extends DefaultComponentHandler { + public JAXXListHandler(ClassDescriptor beanClass) { + super(beanClass); + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXList.class); + } + + @Override + protected void configureProxyEventInfo() { + super.configureProxyEventInfo(); + addProxyEventInfo("getSelectedIndex", ListSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectedIndices", ListSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectedValue", ListSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectedValues", ListSelectionListener.class, "selectionModel"); + } + + @Override + public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { + return new CompiledItemContainer(id, getBeanClass(), compiler); + } + + @Override + public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { + super.compileChildrenSecondPass(tag, compiler); + CompiledItemContainer list = (CompiledItemContainer) compiler.getOpenComponent(); + List<Item> items = list.getItems(); + if (items != null && !items.isEmpty()) { + String listName = list.getId() + "$items"; + //TODO Add the correct generic type + 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); + compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); + compiler.registerCompiledObject(compiledItem); + list.appendAdditionCode(listName + ".add(" + id + ");"); + } + list.appendAdditionCode(list.getId() + ".setItems(" + listName + ");"); + } + } +} + + + diff --git a/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java b/jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXTreeHandler.java similarity index 94% copy from jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java copy to jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXTreeHandler.java index 0181aa2..24221ed 100644 --- a/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/tags/swing/JAXXTreeHandler.java @@ -1,69 +1,69 @@ -/* - * Copyright 2006 Ethan Nicholas. All rights reserved. - * Use is subject to license terms. - */ -package jaxx.tags.swing; - -import jaxx.CompilerException; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.reflect.ClassDescriptor; -import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXTree; -import jaxx.tags.DefaultComponentHandler; -import jaxx.types.TypeManager; -import org.w3c.dom.Element; - -import javax.swing.event.TreeSelectionListener; -import java.io.IOException; -import java.util.List; - -public class JTreeHandler extends DefaultComponentHandler { - public JTreeHandler(ClassDescriptor beanClass) { - super(beanClass); - ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXTree.class); - } - - @Override - protected void configureProxyEventInfo() { - super.configureProxyEventInfo(); - addProxyEventInfo("getSelectionCount", TreeSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectionPath", TreeSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectionPaths", TreeSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectionRows", TreeSelectionListener.class, "selectionModel"); - addProxyEventInfo("getSelectionValue", TreeSelectionListener.class, "selectionModel"); - } - - @Override - public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { - return new CompiledItemContainer(id, getBeanClass(), compiler); - } - - private void createItems(CompiledObject tree, List<Item> items, String addMethod, JAXXCompiler compiler) throws CompilerException { - for (Item item : items) { - String id = item.getId(); - CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); - compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); - compiler.registerCompiledObject(compiledItem); - tree.appendAdditionCode(addMethod + "(" + id + ");"); - createItems(tree, item.getChildren(), id + ".addChild", compiler); - } - } - - @Override - public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { - super.compileChildrenSecondPass(tag, compiler); - CompiledItemContainer tree = (CompiledItemContainer) compiler.getOpenComponent(); - List<Item> items = tree.getItems(); - if (items != null && !items.isEmpty()) { - String listName = tree.getId() + "$items"; - 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 + ");"); - } - } -} - - - +/* + * Copyright 2006 Ethan Nicholas. All rights reserved. + * Use is subject to license terms. + */ +package jaxx.tags.swing; + +import jaxx.CompilerException; +import jaxx.compiler.CompiledObject; +import jaxx.compiler.JAXXCompiler; +import jaxx.reflect.ClassDescriptor; +import jaxx.reflect.ClassDescriptorLoader; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXTree; +import jaxx.tags.DefaultComponentHandler; +import jaxx.types.TypeManager; +import org.w3c.dom.Element; + +import javax.swing.event.TreeSelectionListener; +import java.io.IOException; +import java.util.List; + +public class JAXXTreeHandler extends DefaultComponentHandler { + public JAXXTreeHandler(ClassDescriptor beanClass) { + super(beanClass); + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXTree.class); + } + + @Override + protected void configureProxyEventInfo() { + super.configureProxyEventInfo(); + addProxyEventInfo("getSelectionCount", TreeSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectionPath", TreeSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectionPaths", TreeSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectionRows", TreeSelectionListener.class, "selectionModel"); + addProxyEventInfo("getSelectionValue", TreeSelectionListener.class, "selectionModel"); + } + + @Override + public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { + return new CompiledItemContainer(id, getBeanClass(), compiler); + } + + private void createItems(CompiledObject tree, List<Item> items, String addMethod, JAXXCompiler compiler) throws CompilerException { + for (Item item : items) { + String id = item.getId(); + CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); + compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); + compiler.registerCompiledObject(compiledItem); + tree.appendAdditionCode(addMethod + "(" + id + ");"); + createItems(tree, item.getChildren(), id + ".addChild", compiler); + } + } + + @Override + public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { + super.compileChildrenSecondPass(tag, compiler); + CompiledItemContainer tree = (CompiledItemContainer) compiler.getOpenComponent(); + List<Item> items = tree.getItems(); + if (items != null && !items.isEmpty()) { + String listName = tree.getId() + "$items"; + 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 + ");"); + } + } +} + + + diff --git a/jaxx-compiler/src/main/java/jaxx/tags/swing/JComboBoxHandler.java b/jaxx-compiler/src/main/java/jaxx/tags/swing/JComboBoxHandler.java index 456ef98..a984400 100644 --- a/jaxx-compiler/src/main/java/jaxx/tags/swing/JComboBoxHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/tags/swing/JComboBoxHandler.java @@ -35,6 +35,7 @@ public class JComboBoxHandler extends DefaultComponentHandler { NodeList children = tag.getChildNodes(); if (children.getLength() > 0) { compiler.reportError("JComboBox does not accept childs"); + throw new CompilerException("JComboBox does not accept childs"); } } } diff --git a/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java b/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java index 40d436b..f0a8f4a 100644 --- a/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/tags/swing/JListHandler.java @@ -1,28 +1,22 @@ -/* - * Copyright 2006 Ethan Nicholas. All rights reserved. - * Use is subject to license terms. - */ package jaxx.tags.swing; import jaxx.CompilerException; -import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXList; import jaxx.tags.DefaultComponentHandler; -import jaxx.types.TypeManager; import org.w3c.dom.Element; import javax.swing.event.ListSelectionListener; import java.io.IOException; -import java.util.List; +import javax.swing.JList; +import org.w3c.dom.NodeList; public class JListHandler extends DefaultComponentHandler { + public JListHandler(ClassDescriptor beanClass) { super(beanClass); - ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXList.class); + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JList.class); } @Override @@ -35,27 +29,11 @@ public class JListHandler extends DefaultComponentHandler { } @Override - public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { - return new CompiledItemContainer(id, getBeanClass(), compiler); - } - - @Override public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { - super.compileChildrenSecondPass(tag, compiler); - CompiledItemContainer list = (CompiledItemContainer) compiler.getOpenComponent(); - List<Item> items = list.getItems(); - if (items != null && !items.isEmpty()) { - String listName = list.getId() + "$items"; - //TODO Add the correct generic type - 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); - compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); - compiler.registerCompiledObject(compiledItem); - list.appendAdditionCode(listName + ".add(" + id + ");"); - } - list.appendAdditionCode(list.getId() + ".setItems(" + listName + ");"); + NodeList children = tag.getChildNodes(); + if (children.getLength() > 0) { + compiler.reportError("JList does not accept childs"); + throw new CompilerException("JList does not accept childs"); } } } diff --git a/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java b/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java index 0181aa2..77fd645 100644 --- a/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/tags/swing/JTreeHandler.java @@ -1,28 +1,22 @@ -/* - * Copyright 2006 Ethan Nicholas. All rights reserved. - * Use is subject to license terms. - */ package jaxx.tags.swing; import jaxx.CompilerException; -import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXTree; import jaxx.tags.DefaultComponentHandler; -import jaxx.types.TypeManager; import org.w3c.dom.Element; import javax.swing.event.TreeSelectionListener; import java.io.IOException; -import java.util.List; +import javax.swing.JTree; +import org.w3c.dom.NodeList; public class JTreeHandler extends DefaultComponentHandler { + public JTreeHandler(ClassDescriptor beanClass) { super(beanClass); - ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JAXXTree.class); + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, JTree.class); } @Override @@ -36,31 +30,11 @@ public class JTreeHandler extends DefaultComponentHandler { } @Override - public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { - return new CompiledItemContainer(id, getBeanClass(), compiler); - } - - private void createItems(CompiledObject tree, List<Item> items, String addMethod, JAXXCompiler compiler) throws CompilerException { - for (Item item : items) { - String id = item.getId(); - CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); - compiledItem.setConstructorParams(TypeManager.getJavaCode(id) + ", " + TypeManager.getJavaCode(item.getLabel()) + ", " + TypeManager.getJavaCode(item.getValue()) + ", " + item.isSelected()); - compiler.registerCompiledObject(compiledItem); - tree.appendAdditionCode(addMethod + "(" + id + ");"); - createItems(tree, item.getChildren(), id + ".addChild", compiler); - } - } - - @Override public void compileChildrenSecondPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { - super.compileChildrenSecondPass(tag, compiler); - CompiledItemContainer tree = (CompiledItemContainer) compiler.getOpenComponent(); - List<Item> items = tree.getItems(); - if (items != null && !items.isEmpty()) { - String listName = tree.getId() + "$items"; - 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 + ");"); + NodeList children = tag.getChildNodes(); + if (children.getLength() > 0) { + compiler.reportError("JTree does not accept childs"); + throw new CompilerException("JTree does not accept childs"); } } } diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx b/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx index 38ef966..b2a6111 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx @@ -97,10 +97,7 @@ private void $afterCompleteSetup() { <JScrollPane id='navigationPane'> <JTree id='navigation' model='{getTreeHelper().createTreeModel(this)}' - selectionModel="{getTreeHelper().createTreeHandler(this)}"> - <!--cellRenderer='{new NavigationTreeCellRenderer(this)}'>--> - <!--cellRenderer='{new NavigationTreeCellRenderer(this,185)}'>--> - </JTree> + selectionModel="{getTreeHelper().createTreeHandler(this)}"/> </JScrollPane> <JPanel id='content'/> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/item/ItemTreeNavigationDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/item/ItemTreeNavigationDemo.jaxx index de0ac8b..695890c 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/item/ItemTreeNavigationDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/item/ItemTreeNavigationDemo.jaxx @@ -40,7 +40,7 @@ void $afterCompleteSetup() { <JPanel id='demoPanel' layout='{new BorderLayout()}'> <JSplitPane constraints='BorderLayout.CENTER'> <JScrollPane> - <JTree id='nav' rootVisible='{false}'> + <JAXXTree id='nav' rootVisible='{false}'> <!-- Allow to diplay associated pane without value --> <item id='stringItemParent' label='String' value='{String.class}'> <item id='string1Item' label='String1' value='{new String("Ceci est un String")}' selected='true'/> @@ -49,7 +49,7 @@ void $afterCompleteSetup() { <item id='dateItemParent' label='Date' value='{Date.class}'> <item id='dateItem' label='CurrentDate' value='{new Date()}'/> </item> - </JTree> + </JAXXTree> </JScrollPane> <!-- Card panel, only ItemNavigationPanel children is allowed --> <ItemNavigationCardPanel id="content"> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx index 093f15d..56e773f 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JListDemo.jaxx @@ -18,62 +18,62 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* --> -<jaxx.demo.DemoPanel> - <Table id='demoPanel'> - <row> - <cell> - <JLabel text='Supported Swing components:'/> - </cell> - </row> - - <row> - <cell> - <JScrollPane> - <JList> - <item value='JApplet'/> - <item value='JButton'/> - <item value='JCheckBox'/> - <item value='JCheckBoxMenuItem'/> - <item value='JColorChooser'/> - <item value='JComboBox'/> - <item value='JDesktopPane'/> - <item value='JDialog'/> - <item value='JEditorPane'/> - <item value='JFileChooser'/> - <item value='JFormattedTextField'/> - <item value='JFrame'/> - <item value='JInternalFrame'/> - <item value='JLabel'/> - <item value='JLayeredPane'/> - <item value='JList'/> - <item value='JMenu'/> - <item value='JMenuBar'/> - <item value='JMenuItem'/> - <item value='JOptionPane'/> - <item value='JPanel'/> - <item value='JPasswordField'/> - <item value='JPopupMenu'/> - <item value='JProgressBar'/> - <item value='JRadioButton'/> - <item value='JRadioButtonMenuItem'/> - <item value='JScrollBar'/> - <item value='JScrollPane'/> - <item value='JSeparator'/> - <item value='JSlider'/> - <item value='JSpinner'/> - <item value='JSplitPane'/> - <item value='JTabbedPane'/> - <item value='JTable'/> - <item value='JTextArea'/> - <item value='JTextField'/> - <item value='JTextPane'/> - <item value='JToggleButton'/> - <item value='JToolBar'/> - <item value='JTree'/> - <item value='JWindow'/> - </JList> - </JScrollPane> - </cell> - </row> - </Table> +<jaxx.demo.DemoPanel> + <Table id='demoPanel'> + <row> + <cell> + <JLabel text='Supported Swing components:'/> + </cell> + </row> + + <row> + <cell> + <JScrollPane> + <JAXXList> + <item value='JApplet'/> + <item value='JButton'/> + <item value='JCheckBox'/> + <item value='JCheckBoxMenuItem'/> + <item value='JColorChooser'/> + <item value='JComboBox'/> + <item value='JDesktopPane'/> + <item value='JDialog'/> + <item value='JEditorPane'/> + <item value='JFileChooser'/> + <item value='JFormattedTextField'/> + <item value='JFrame'/> + <item value='JInternalFrame'/> + <item value='JLabel'/> + <item value='JLayeredPane'/> + <item value='JList'/> + <item value='JMenu'/> + <item value='JMenuBar'/> + <item value='JMenuItem'/> + <item value='JOptionPane'/> + <item value='JPanel'/> + <item value='JPasswordField'/> + <item value='JPopupMenu'/> + <item value='JProgressBar'/> + <item value='JRadioButton'/> + <item value='JRadioButtonMenuItem'/> + <item value='JScrollBar'/> + <item value='JScrollPane'/> + <item value='JSeparator'/> + <item value='JSlider'/> + <item value='JSpinner'/> + <item value='JSplitPane'/> + <item value='JTabbedPane'/> + <item value='JTable'/> + <item value='JTextArea'/> + <item value='JTextField'/> + <item value='JTextPane'/> + <item value='JToggleButton'/> + <item value='JToolBar'/> + <item value='JTree'/> + <item value='JWindow'/> + </JAXXList> + </JScrollPane> + </cell> + </row> + </Table> </jaxx.demo.DemoPanel> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/ComboBoxTest.java b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java similarity index 63% rename from maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/ComboBoxTest.java rename to maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java index 342bf9f..64f09ff 100644 --- a/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/ComboBoxTest.java +++ b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Evolution74Test.java @@ -11,14 +11,28 @@ import org.apache.maven.plugin.logging.SystemStreamLog; import org.junit.Test; import static org.junit.Assert.*; -public class ComboBoxTest extends JaxxBaseTest { +public class Evolution74Test extends JaxxBaseTest { @Test public void ok() throws Exception { JaxxGeneratorMojo mojo = getMojo(); mojo.execute(); - checkPattern(mojo, "swingComboBox", true, "org/nuiton/jaxx/plugin/ComboBoxTest/ok/swingcombo.java"); - assertNumberJaxxFiles(2); + assertNumberJaxxFiles(6); + + checkPattern(mojo, "JComboBox", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.java"); + checkPattern(mojo, "JComboBox", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.java"); + checkPattern(mojo, "JAXXComboBox", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.java"); + checkPattern(mojo, "JAXXComboBox", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.java"); + + checkPattern(mojo, "JList", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.java"); + checkPattern(mojo, "JList", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.java"); + checkPattern(mojo, "JAXXList", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.java"); + checkPattern(mojo, "JAXXList", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.java"); + + checkPattern(mojo, "JTree", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.java"); + checkPattern(mojo, "JTree", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.java"); + checkPattern(mojo, "JAXXTree", false, "org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.java"); + checkPattern(mojo, "JAXXTree", true, "org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.java"); } @SuppressWarnings({"unchecked"}) @@ -28,7 +42,7 @@ public class ComboBoxTest extends JaxxBaseTest { // init mojo to get alls files to treate mojo.init(); - assertNumberJaxxFiles(1); + assertNumberJaxxFiles(3); mojo.setLog(new SystemStreamLog() { diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/jaxxcombo.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/jaxxcombo.jaxx deleted file mode 100644 index caf6e44..0000000 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/jaxxcombo.jaxx +++ /dev/null @@ -1,4 +0,0 @@ - -<JAXXComboBox id='comboBox'> - <item value='OK' selected='true'/> -</JAXXComboBox> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/swingcombo.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/swingcombo.jaxx deleted file mode 100644 index 3342779..0000000 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok/swingcombo.jaxx +++ /dev/null @@ -1,2 +0,0 @@ - -<JComboBox id='swingComboBox'/> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest1.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest1.jaxx index f49ad85..66eefaf 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest1.jaxx +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest1.jaxx @@ -1,3 +1,3 @@ -<JList> +<JAXXList> <item value='Working' selected='true'/> -</JList> \ No newline at end of file +</JAXXList> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest2.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest2.jaxx index 10a6c79..3eb3554 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest2.jaxx +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JListTest2.jaxx @@ -1,3 +1,3 @@ -<JList> +<JAXXList> <item value='Failed!'/> -</JList> \ No newline at end of file +</JAXXList> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest1.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest1.jaxx index 1dcc3a1..a27d667 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest1.jaxx +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest1.jaxx @@ -1,3 +1,3 @@ -<JTree> +<JAXXTree> <item value='Working' selected='true'/> -</JTree> \ No newline at end of file +</JAXXTree> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest2.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest2.jaxx index a9e3f3a..74ae96d 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest2.jaxx +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing/JTreeTest2.jaxx @@ -1,3 +1,3 @@ -<JTree> +<JAXXTree> <item value='Failed!'/> -</JTree> \ No newline at end of file +</JAXXTree> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/error.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml similarity index 92% rename from maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/error.xml rename to maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml index 704b8ee..c13137e 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/error.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml @@ -18,7 +18,7 @@ <force>true</force> <verbose>true</verbose> <includes> - <value>**/ComboBoxTest/error/*.jaxx</value> + <value>**/Evolution74Test/error/*.jaxx</value> </includes> </configuration> </plugin> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/error/swingcombo.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swingcombo.jaxx similarity index 100% rename from maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/error/swingcombo.jaxx rename to maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swingcombo.jaxx diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swinglist.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swinglist.jaxx new file mode 100644 index 0000000..bc3c16b --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swinglist.jaxx @@ -0,0 +1,4 @@ + +<JList> + <item value='OK'/> +</JList> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swingtree.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swingtree.jaxx new file mode 100644 index 0000000..4b0c56a --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error/swingtree.jaxx @@ -0,0 +1,4 @@ + +<JTree> + <item value='OK'/> +</JTree> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml similarity index 92% rename from maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok.xml rename to maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml index b36498a..c905588 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/ComboBoxTest/ok.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml @@ -17,7 +17,7 @@ <outResource>${basedir}/target/it-generated-sources/resources</outResource> <force>true</force> <includes> - <value>**/ComboBoxTest/ok/*.jaxx</value> + <value>**/Evolution74Test/ok/*.jaxx</value> </includes> </configuration> </plugin> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.jaxx new file mode 100644 index 0000000..64c0be5 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxcombo.jaxx @@ -0,0 +1,4 @@ + +<JAXXComboBox> + <item value='OK'/> +</JAXXComboBox> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.jaxx new file mode 100644 index 0000000..bab2cc5 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxlist.jaxx @@ -0,0 +1,4 @@ + +<JAXXList> + <item value='OK'/> +</JAXXList> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.jaxx new file mode 100644 index 0000000..488787f --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/jaxxtree.jaxx @@ -0,0 +1,4 @@ + +<JAXXTree> + <item value='OK'/> +</JAXXTree> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.jaxx new file mode 100644 index 0000000..bef5b35 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingcombo.jaxx @@ -0,0 +1,2 @@ + +<JComboBox/> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.jaxx new file mode 100644 index 0000000..f81e652 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swinglist.jaxx @@ -0,0 +1 @@ +<JList/> \ No newline at end of file diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.jaxx new file mode 100644 index 0000000..331ed6c --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok/swingtree.jaxx @@ -0,0 +1,2 @@ + +<JTree/> \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.