Author: kmorin Date: 2009-04-03 09:44:32 +0000 (Fri, 03 Apr 2009) New Revision: 1287 Added: jaxx-gwt/ jaxx-gwt/trunk/ Removed: jaxx/trunk/ Modified: jaxx-gwt/trunk/jaxx-compiler-api/pom.xml jaxx-gwt/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/TagManager.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/GWTInitializer.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/compiler/GWTGenerator.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/JTabbedPaneHandler.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/ListHandler.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/RadioButtonHandler.java jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/TreeHandler.java jaxx-gwt/trunk/jaxx-compiler-swing/src/main/java/jaxx/SwingInitializer.java jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ExcludeFieldValidatorHandler.java jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/FieldValidatorHandler.java jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ValidatorInitializer.java jaxx-gwt/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/JDialogDemo.jaxx jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationListDemo.jaxx jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationTableDemo.jaxx Log: Modified: jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/JDialogDemo.jaxx =================================================================== --- jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/JDialogDemo.jaxx 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/JDialogDemo.jaxx 2009-04-03 09:44:32 UTC (rev 1287) @@ -76,4 +76,4 @@ <JLabel text='{password != null ? "Password: " + password : ""}'/> </VBox> </VBox> -</DemoPanel> \ No newline at end of file +</DemoPanel> Modified: jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationListDemo.jaxx =================================================================== --- jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationListDemo.jaxx 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationListDemo.jaxx 2009-04-03 09:44:32 UTC (rev 1287) @@ -12,22 +12,22 @@ <Identity id='identity'/> <!-- errors model --> - <jaxx.runtime.validator.swing.SwingValidatorMessageListModel id='errors' + <jaxx.runtime.validator.gwt.GWTValidatorMessageListModel id='errors' onContentsChanged='ok.setEnabled(errors.isEmpty())'/> <!-- validators --> - <BeanValidator id='validator' bean='model1' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + <BeanValidator id='validator' bean='model1' uiClass="jaxx.runtime.validator.gwt.ui.ImageValidationUI"> <field name="text"/> <field name="text2"/> <field name="ratio"/> </BeanValidator> - <BeanValidator id='validator2' bean='model2' uiClass="jaxx.runtime.validator.swing.ui.IconValidationUI"> + <BeanValidator id='validator2' bean='model2' uiClass="jaxx.runtime.validator.gwt.ui.IconValidationUI"> <field name="text" component="_text"/> <field name="text2" component="_text2"/> <field name="ratio" component="_ratio"/> </BeanValidator> <BeanValidator id='validator3' autoField='true' bean='identity' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"> + uiClass="jaxx.runtime.validator.gwt.ui.TranslucentValidationUI"> <field name="email" component="email2"/> </BeanValidator> @@ -320,4 +320,4 @@ </row> </Table> -</DemoPanel> \ No newline at end of file +</DemoPanel> Modified: jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationTableDemo.jaxx =================================================================== --- jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationTableDemo.jaxx 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx/tags/1.3/jaxx-example/src/main/java/jaxx/demo/ValidationTableDemo.jaxx 2009-04-03 09:44:32 UTC (rev 1287) @@ -7,22 +7,22 @@ <Identity id='identity'/> <!-- errors model --> - <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errors2' + <jaxx.runtime.validator.gwt.GWTValidatorMessageTableModel id='errors2' onTableChanged='ok.setEnabled(errors2.getRowCount()==0)'/> <!-- validators --> - <BeanValidator id='validator' bean='model1' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + <BeanValidator id='validator' bean='model1' uiClass="jaxx.runtime.validator.gwt.ui.ImageValidationUI"> <field name="text"/> <field name="text2"/> <field name="ratio"/> </BeanValidator> - <BeanValidator id='validator2' bean='model2' uiClass="jaxx.runtime.validator.swing.ui.IconValidationUI"> + <BeanValidator id='validator2' bean='model2' uiClass="jaxx.runtime.validator.gwt.ui.IconValidationUI"> <field name="text" component="_text"/> <field name="text2" component="_text2"/> <field name="ratio" component="_ratio"/> </BeanValidator> <BeanValidator id='validator3' autoField='true' bean='identity' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"> + uiClass="jaxx.runtime.validator.gwt.ui.TranslucentValidationUI"> <field name="email" component="email2"/> </BeanValidator> @@ -31,7 +31,7 @@ import jaxx.runtime.SwingUtil; void $afterCompleteSetup() { - errorTable.setDefaultRenderer(Object.class, new jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer()); + errorTable.setDefaultRenderer(Object.class, new jaxx.runtime.validator.gwt.SwingValidatorMessageTableRenderer()); errorTable.getRowSorter().setSortKeys(java.util.Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer(errorTable, n_("validator.scope"), n_("validator.scope.tip"), n_("validator.field"), n_("validator.field.tip"), n_("validator.message"), n_("validator.message.tip")); SwingUtil.fixTableColumnWidth(errorTable, 0, 25); @@ -329,4 +329,4 @@ </row> </Table> -</DemoPanel> \ No newline at end of file +</DemoPanel> Copied: jaxx-gwt/trunk (from rev 1286, jaxx/trunk) Modified: jaxx-gwt/trunk/jaxx-compiler-api/pom.xml =================================================================== --- jaxx/trunk/jaxx-compiler-api/pom.xml 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-api/pom.xml 2009-04-03 09:44:32 UTC (rev 1287) @@ -26,6 +26,18 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime-gwt</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime-swing</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: jaxx-gwt/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/TagManager.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/TagManager.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-api/src/main/java/jaxx/tags/TagManager.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -136,7 +136,9 @@ * @param namespace namespace */ public static void registerDefaultNamespace(String tag, String namespace) { - if (defaultNamespaces.containsKey(tag) && !defaultNamespaces.get(tag).equals(namespace)) { + if (defaultNamespaces.containsKey(tag) + && defaultNamespaces.get(tag) != null + && !defaultNamespaces.get(tag).equals(namespace)) { defaultNamespaces.put(tag, null); // tag name is now ambiguous } else { defaultNamespaces.put(tag, namespace); @@ -327,7 +329,7 @@ * @throws jaxx.CompilerException ? */ public static TagHandler getTagHandler(String namespace, String tag, boolean namespacePrefix, JAXXCompiler compiler) throws CompilerException { - if (tag == null) { + if (tag == null) { throw new NullPointerException(); } if (namespace == null && defaultNamespaces.containsKey(tag)) { Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/GWTInitializer.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/GWTInitializer.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/GWTInitializer.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -29,9 +29,9 @@ import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.Insets; -import jaxx.compiler.BoxedCompiledObjectDecorator; +import jaxx.compiler.GWTBoxedCompiledObjectDecorator; import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.HelpRootCompiledObjectDecorator; +import jaxx.compiler.GWTHelpRootCompiledObjectDecorator; import com.google.gwt.user.client.ui.*; @@ -79,7 +79,7 @@ TagManager.registerDefaultNamespace("JTextPane", "javax.swing.*"); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "tab", new TabHandler()); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(Table.class), TableHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(jaxx.runtime.gwt.Table.class), TableHandler.class); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "row", new RowHandler()); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "cell", new CellHandler()); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, "item", new ItemHandler()); @@ -91,7 +91,7 @@ TypeManager.registerTypeConverter(Insets.class, new InsetsConverter()); TypeManager.registerTypeConverter(KeyStroke.class, new KeyStrokeConverter()); - //CompiledObjectDecorator.registerDecorator("boxed", BoxedCompiledObjectDecorator.class); - //CompiledObjectDecorator.registerDecorator("help", HelpRootCompiledObjectDecorator.class); + CompiledObjectDecorator.registerDecorator("boxed", GWTBoxedCompiledObjectDecorator.class); + CompiledObjectDecorator.registerDecorator("help", GWTHelpRootCompiledObjectDecorator.class); } } \ No newline at end of file Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/compiler/GWTGenerator.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/compiler/GWTGenerator.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/compiler/GWTGenerator.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -15,13 +15,12 @@ public void prepareJavaFile(CompiledObject root, JAXXCompiler compiler, JavaFile javaFile, String packageName, String className) throws ClassNotFoundException { //TODO : move this to jaxx-compiler-swing generator - if (ClassDescriptorLoader.getClassDescriptor("jaxx.runtime.swing.Application").isAssignableFrom(root.getObjectClass()) && !compiler.isMainDeclared()) { + if (ClassDescriptorLoader.getClassDescriptor("jaxx.runtime.gwt.Application").isAssignableFrom(root.getObjectClass()) && !compiler.isMainDeclared()) { // TODO: check for existing main method first javaFile.addInterface("com.google.gwt.core.client.EntryPoint"); javaFile.addMethod(JavaMethod.newMethod(Modifier.PUBLIC, "void", "onModuleLoad", "SwingUtilities.invokeLater(new Runnable() { public void run() { new " + className + "().setVisible(true); } });") ); - System.out.println(javaFile.getMethods()[javaFile.getMethods().length-1].getName()); } } } Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/JTabbedPaneHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/JTabbedPaneHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/JTabbedPaneHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -53,7 +53,7 @@ } int tabIndex = ++tabCount - 1; - appendAdditionCode(tabInfo.getId() + ".addPropertyChangeListener(new jaxx.runtime.swing.TabInfoPropertyChangeListener(" + getId() + ", " + tabIndex + "));"); + appendAdditionCode(tabInfo.getId() + ".addPropertyChangeListener(new jaxx.runtime.gwt.TabInfoPropertyChangeListener(" + getId() + ", " + tabIndex + "));"); String title = tabInfo.getTitle(); if (title != null) { Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/ListHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/ListHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/ListHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -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<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); + list.appendAdditionCode("java.util.List<jaxx.runtime.gwt.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.gwt.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorLoader.getClassDescriptor(Item.class), compiler); Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/RadioButtonHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/RadioButtonHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/RadioButtonHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -72,7 +72,7 @@ return "{ javax.swing.ButtonGroup $buttonGroup = " + valueCode + "; " + id + ".putClientProperty(\"$buttonGroup\", $buttonGroup); $buttonGroup.add(" + id + "); }\n"; } else if (name.equals(VALUE_PROPERTY)) { return "{ " + id + ".putClientProperty(\"" + JAXXButtonGroup.VALUE_CLIENT_PROPERTY + "\", " + valueCode + "); Object $buttonGroup = " + id + ".getClientProperty(\"" + JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY + "\");" + - " if ($buttonGroup instanceof jaxx.runtime.swing.JAXXButtonGroup) { ((jaxx.runtime.swing.JAXXButtonGroup) $buttonGroup).updateSelectedValue(); } }\n"; + " if ($buttonGroup instanceof jaxx.runtime.gwt.JAXXButtonGroup) { ((jaxx.runtime.gwt.JAXXButtonGroup) $buttonGroup).updateSelectedValue(); } }\n"; } else { return super.getSetPropertyCode(id, name, valueCode, compiler); } Modified: jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/TreeHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/TreeHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-gwt/src/main/java/jaxx/tags/gwt/TreeHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -58,7 +58,7 @@ 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>();"); + tree.appendAdditionCode("java.util.List<jaxx.runtime.gwt.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); createItems(tree, items, listName + ".add", compiler); tree.appendAdditionCode(tree.getId() + ".setItems(" + listName + ");"); } Modified: jaxx-gwt/trunk/jaxx-compiler-swing/src/main/java/jaxx/SwingInitializer.java =================================================================== --- jaxx/trunk/jaxx-compiler-swing/src/main/java/jaxx/SwingInitializer.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-swing/src/main/java/jaxx/SwingInitializer.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -29,9 +29,9 @@ import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.Insets; -import jaxx.compiler.BoxedCompiledObjectDecorator; +import jaxx.compiler.SwingBoxedCompiledObjectDecorator; import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.HelpRootCompiledObjectDecorator; +import jaxx.compiler.SwingHelpRootCompiledObjectDecorator; public class SwingInitializer implements Initializer { @@ -89,7 +89,7 @@ TypeManager.registerTypeConverter(Insets.class, new InsetsConverter()); TypeManager.registerTypeConverter(KeyStroke.class, new KeyStrokeConverter()); - CompiledObjectDecorator.registerDecorator("boxed", BoxedCompiledObjectDecorator.class); - CompiledObjectDecorator.registerDecorator("help", HelpRootCompiledObjectDecorator.class); + //CompiledObjectDecorator.registerDecorator("boxed", SwingBoxedCompiledObjectDecorator.class); + //CompiledObjectDecorator.registerDecorator("help", SwingHelpRootCompiledObjectDecorator.class); } } \ No newline at end of file Modified: jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -11,9 +11,12 @@ import jaxx.introspection.JAXXPropertyDescriptor; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.SwingValidatorUtil; -import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; +//import jaxx.runtime.SwingValidatorUtil; +import jaxx.runtime.GWTValidatorUtil; +//import jaxx.runtime.validator.swing.SwingValidator; +import jaxx.runtime.validator.gwt.GWTValidator; +//import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; +import jaxx.runtime.validator.gwt.ui.AbstractBeanValidatorUI; import jaxx.tags.DefaultObjectHandler; import jaxx.types.TypeManager; import org.apache.commons.logging.Log; @@ -56,7 +59,8 @@ public BeanValidatorHandler(ClassDescriptor beanClass) { super(beanClass); - ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, SwingValidator.class); + //ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, SwingValidator.class); + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, GWTValidator.class); } @Override @@ -459,7 +463,8 @@ } } - String code = SwingValidatorUtil.class.getName() + ".registerErrorListMouseListener(" + errorList + ");"; + //String code = SwingValidatorUtil.class.getName() + ".registerErrorListMouseListener(" + errorList + ");"; + String code = GWTValidatorUtil.class.getName() + ".registerErrorListMouseListener(" + errorList + ");"; appendAdditionCode(code); return false; @@ -479,7 +484,8 @@ } } - String code = SwingValidatorUtil.class.getName() + ".registerErrorTableMouseListener(" + errorTable + ");"; + //String code = SwingValidatorUtil.class.getName() + ".registerErrorTableMouseListener(" + errorTable + ");"; + String code = GWTValidatorUtil.class.getName() + ".registerErrorTableMouseListener(" + errorTable + ");"; appendAdditionCode(code); return false; Modified: jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ExcludeFieldValidatorHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ExcludeFieldValidatorHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ExcludeFieldValidatorHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -7,7 +7,8 @@ import jaxx.CompilerException; import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.validator.swing.SwingValidator; +//import jaxx.runtime.validator.swing.SwingValidator; +import jaxx.runtime.validator.gwt.GWTValidator; import jaxx.tags.TagHandler; import jaxx.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import org.apache.commons.logging.Log; @@ -37,7 +38,8 @@ log.debug(tag); } - if (!ClassDescriptorLoader.getClassDescriptor(SwingValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { + //if (!ClassDescriptorLoader.getClassDescriptor(SwingValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { + if (!ClassDescriptorLoader.getClassDescriptor(GWTValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { compiler.reportError(TAG + " tag may only appear within " + BeanValidatorHandler.TAG + " tag but was " + tag); return; } Modified: jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/FieldValidatorHandler.java =================================================================== --- jaxx/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/FieldValidatorHandler.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/FieldValidatorHandler.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -7,7 +7,8 @@ import jaxx.CompilerException; import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.validator.swing.SwingValidator; +//import jaxx.runtime.validator.swing.SwingValidator; +import jaxx.runtime.validator.gwt.GWTValidator; import jaxx.tags.TagHandler; import jaxx.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import org.apache.commons.logging.Log; @@ -37,7 +38,8 @@ log.info(tag); } - if (!ClassDescriptorLoader.getClassDescriptor(SwingValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { + //if (!ClassDescriptorLoader.getClassDescriptor(SwingValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { + if (!ClassDescriptorLoader.getClassDescriptor(GWTValidator.class).isAssignableFrom(compiler.getOpenComponent().getObjectClass())) { compiler.reportError(TAG + " tag may only appear within " + BeanValidatorHandler.TAG + " tag but was " + tag); return; } Modified: jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ValidatorInitializer.java =================================================================== --- jaxx/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ValidatorInitializer.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/jaxx-compiler-validator/src/main/java/jaxx/tags/validator/ValidatorInitializer.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -6,7 +6,7 @@ import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptorLoader; -import jaxx.runtime.validator.swing.SwingValidator; +import jaxx.runtime.validator.gwt.GWTValidator; import jaxx.tags.TagManager; public class ValidatorInitializer implements jaxx.spi.Initializer { @@ -14,8 +14,10 @@ @Override public void initialize() { - TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, BeanValidatorHandler.TAG, new BeanValidatorHandler(ClassDescriptorLoader.getClassDescriptor(SwingValidator.class))); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(SwingValidator.class), BeanValidatorHandler.class); + //TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, BeanValidatorHandler.TAG, new BeanValidatorHandler(ClassDescriptorLoader.getClassDescriptor(SwingValidator.class))); + TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, BeanValidatorHandler.TAG, new BeanValidatorHandler(ClassDescriptorLoader.getClassDescriptor(GWTValidator.class))); + //TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(SwingValidator.class), BeanValidatorHandler.class); + TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(GWTValidator.class), BeanValidatorHandler.class); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, FieldValidatorHandler.TAG, new FieldValidatorHandler()); TagManager.registerTag(JAXXCompiler.JAXX_NAMESPACE, ExcludeFieldValidatorHandler.TAG, new FieldValidatorHandler()); } Modified: jaxx-gwt/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2009-04-02 12:38:08 UTC (rev 1286) +++ jaxx-gwt/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2009-04-03 09:44:32 UTC (rev 1287) @@ -43,7 +43,7 @@ import java.util.Properties; import java.util.Set; import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.HelpRootCompiledObjectDecorator; +import jaxx.compiler.SwingHelpRootCompiledObjectDecorator; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; @@ -492,7 +492,7 @@ } protected void generateHelp() throws IOException { - Set<String> helpIds = HelpRootCompiledObjectDecorator.getHelpIds(); + Set<String> helpIds = SwingHelpRootCompiledObjectDecorator.getHelpIds(); if (helpIds.isEmpty()) { if (verbose) { // no ids detected in this compilation round