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

[Buix-commits] r1010 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org 30 Oct '08

30 Oct '08

Author: tchemit Date: 2008-10-30 22:05:12 +0000 (Thu, 30 Oct 2008) New Revision: 1010 Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java Log: add full PropertyChangeEvent java-bean support and a property valid : in that way Jaxx can bind on the validator changes. Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-30 19:52:45 UTC (rev 1009) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-30 22:05:12 UTC (rev 1010) @@ -1,5 +1,6 @@ ver-0-6 chemit 200811?? * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid - when remove bean from validator, must remove errors from model - make possible to have a dynamic errorListModel in jaxx files * 20081030 [chemit] improve JAXXContext : Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java 2008-10-30 19:52:45 UTC (rev 1009) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java 2008-10-30 22:05:12 UTC (rev 1010) @@ -127,13 +127,16 @@ * </pre> * * @author poussin - * @version $Revision$ + * @author chemit + * @version 1.0 * <p/> * Last update: $Date$ - * by : $Author$ + * by : chemit */ public class BeanValidator<T> { + static public final String VALID_PROERTY = "valid"; + /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(BeanValidator.class); @@ -167,8 +170,12 @@ /** validator context */ protected ActionContext context; + /** map of conversion errors detected by this validator */ protected Map<String, String> conversionErrors; + /** state of the validator */ + protected boolean valid; + public BeanValidator() { pcs = new PropertyChangeSupport(this); validationSupport = new ValidationAwareSupport(); @@ -265,6 +272,7 @@ validationSupport.clearErrorsAndMessages(); errorListModel.addErrors(this); } + setValid(!hasErrors()); pcs.firePropertyChange("bean", oldBean, bean); } @@ -480,7 +488,26 @@ validationContext.setFieldErrors(map); } + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + boolean oldValid = this.valid; + this.valid = valid; + if (oldValid != valid) { + pcs.firePropertyChange(VALID_PROERTY, oldValid, valid); + } + } + protected class Listener implements PropertyChangeListener { public void propertyChange(PropertyChangeEvent evt) { @@ -497,6 +524,7 @@ log.debug("launch validation from event [name:" + evt.getPropertyName() + " <old:" + oldValue + ", new:" + newValue + ">]"); } validate(); + setValid(!hasErrors()); setChanged(true); } }

1 0

[Buix-commits] r1009 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 30 Oct '08

30 Oct '08

Author: tchemit Date: 2008-10-30 19:52:45 +0000 (Thu, 30 Oct 2008) New Revision: 1009 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java Log: can add extra unamed objects in context Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java 2008-10-30 14:58:57 UTC (rev 1008) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java 2008-10-30 19:52:45 UTC (rev 1009) @@ -11,8 +11,9 @@ * Prepare the initial context of the ui. * * @param parentContent the context of the parent of the ui (can be null if no parent is required) + * @param datas other datas to inject in initial context * @return the {@link jaxx.runtime.JAXXInitialContext} to be injected in the ui via the constructor of the {@link jaxx.runtime.JAXXObject} */ - JAXXInitialContext init(JAXXContext parentContent); + JAXXInitialContext init(JAXXContext parentContent, Object... datas); }

1 0

[Buix-commits] r1008 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/runtime/validator src/main/java/jaxx/tags/validator
by tchemit＠users.labs.libre-entreprise.org 30 Oct '08

30 Oct '08

Author: tchemit Date: 2008-10-30 14:58:57 +0000 (Thu, 30 Oct 2008) New Revision: 1008 Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java Log: improve BeanValidator : - when remove bean from validator, must remove errors from model - make possible to have a dynamic errorListModel in jaxx Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-30 12:36:43 UTC (rev 1007) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-30 14:58:57 UTC (rev 1008) @@ -1,4 +1,7 @@ ver-0-6 chemit 200811?? + * 20081030 [chemit] improve BeanValidator : + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files * 20081030 [chemit] improve JAXXContext : - fix setContextValue bug when setting twice a same type for a same key - implements a DefaultJAXXContext Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java 2008-10-30 12:36:43 UTC (rev 1007) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/validator/BeanValidator.java 2008-10-30 14:58:57 UTC (rev 1008) @@ -259,8 +259,12 @@ } catch (Exception eee) { log.info("Can't register as listener", eee); } + validate(); + } else { + // must remove all errors from this validator on errorListModel + validationSupport.clearErrorsAndMessages(); + errorListModel.addErrors(this); } - validate(); pcs.firePropertyChange("bean", oldBean, bean); } @@ -360,7 +364,7 @@ return result; } - + /** * il faut eviter le code re-intrant (durant une validation, une autre est * demandee). Pour cela on fait la validation dans un thread, et tant Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java 2008-10-30 12:36:43 UTC (rev 1007) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/validator/BeanValidatorHandler.java 2008-10-30 14:58:57 UTC (rev 1008) @@ -288,7 +288,11 @@ } errorListModel = ERROR_LIST_MODEL_DEFAULT; } else { - if (!compiler.checkReference(tag, errorListModel, true, ERROR_LIST_MODEL_ATTRIBUTE)) { + if (errorListModel.startsWith("{") && errorListModel.endsWith("}")) { + // this is a script, no check here + errorListModel = errorListModel.substring(1,errorListModel.length()-1).trim(); + } else if (!compiler.checkReference(tag, errorListModel, true, ERROR_LIST_MODEL_ATTRIBUTE)) { + // errorListModel is not defined return true; } }

1 0

[Buix-commits] r1007 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/compiler src/main/java/jaxx/runtime src/test/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 30 Oct '08

30 Oct '08

Author: tchemit Date: 2008-10-30 12:36:43 +0000 (Thu, 30 Oct 2008) New Revision: 1007 Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/DefaultJAXXContext.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/runtime/DefaultJAXXContextTest.java Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java Log: improve JAXXContext : - fix setContextValue bug when setting twice a same type for a same key - implements a DefaultJAXXContext - use this default implementation with delegate pattern in JAXXObject Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-27 20:33:29 UTC (rev 1006) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-30 12:36:43 UTC (rev 1007) @@ -1,4 +1,9 @@ ver-0-6 chemit 200811?? + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key + - implements a DefaultJAXXContext + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext * 20081027 [chemit] fix bug 1722 * 20081027 [chemit] add conversion support in validator * 20081025 [chemit] improve BeanValidator tag : Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java 2008-10-27 20:33:29 UTC (rev 1006) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXObjectGenerator.java 2008-10-30 12:36:43 UTC (rev 1007) @@ -142,7 +142,7 @@ javaFile.addImport("jaxx.runtime.validator.BeanValidator"); javaFile.addImport("jaxx.runtime.JAXXInitialContext"); - + if (compiler.getStylesheet() != null) { javaFile.addField(new JavaField(0, "java.util.Map", "$previousValues", "new java.util.HashMap()")); } @@ -182,24 +182,25 @@ javaFile.addMethod(createProcessDataBindingMethod()); + javaFile.addField(createJAXXObjectDescriptorField()); + javaFile.addMethod(createGetJAXXObjectDescriptorMethod()); + if (!superclassIsJAXXObject) { javaFile.addField(createObjectMap()); javaFile.addMethod(createGetObjectByIdMethod()); + + /* + * Gestion du context + */ + javaFile.addField(createContextField()); + javaFile.addMethod(createSetContextValueMethod()); + javaFile.addMethod(createSetContextValueNameMethod()); + javaFile.addMethod(createGetContextValueMethod()); + javaFile.addMethod(createGetContextValueNameMethod()); + javaFile.addMethod(createGetParentContainer()); + javaFile.addMethod(createGetParentContainerMore()); } - javaFile.addField(createJAXXObjectDescriptorField()); - javaFile.addMethod(createGetJAXXObjectDescriptorMethod()); - - /* - * Gestion du context - */ - javaFile.addField(createContextField()); - javaFile.addMethod(createSetContextValueMethod()); - javaFile.addMethod(createSetContextValueNameMethod()); - javaFile.addMethod(createGetContextValueMethod()); - javaFile.addMethod(createGetContextValueNameMethod()); - javaFile.addMethod(createGetParentContainer()); - javaFile.addMethod(createGetParentContainerMore()); ClassDescriptor currentClass = root.getObjectClass(); MethodDescriptor firePropertyChange = null; while (firePropertyChange == null && currentClass != null) { @@ -249,7 +250,7 @@ } private JavaField createContextField() { - return new JavaField(Modifier.PROTECTED, "Map<Object,String>", "$contextMap", "new HashMap<Object,String>()"); + return new JavaField(Modifier.PROTECTED, "jaxx.runtime.JAXXContext", "delegateContext", "new jaxx.runtime.DefaultJAXXContext(this);"); } private JavaField createLoggerField(String className) { @@ -413,7 +414,7 @@ code.append(JAXXCompiler.getLineSeparator()); code.append("$initialize();"); code.append(JAXXCompiler.getLineSeparator()); - JavaArgument arg = new JavaArgument("jaxx.runtime.JAXXInitialContext","initialContext"); + JavaArgument arg = new JavaArgument("jaxx.runtime.JAXXInitialContext", "initialContext"); return new JavaMethod(Modifier.PUBLIC, null, className, new JavaArgument[]{arg}, null, code.toString()); } @@ -542,44 +543,27 @@ /*-- Create methods code ----------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/ private String getSetContextValueMethodCode() { - return "this.setContextValue(clazz, null);"; + return "delegateContext.setContextValue(clazz, null);"; } private String getSetContextValueNameMethodCode() { - StringBuffer result = new StringBuffer(); - result.append("$contextMap.put(clazz, name);"); - return result.toString(); + return "delegateContext.setContextValue(clazz, name);"; } private String getGetContextValueMethodCode() { - return "return this.getContextValue(clazz, null);"; + return "return delegateContext.getContextValue(clazz, null);"; } private String getGetContextValueNameMethodCode() { - StringBuffer result = new StringBuffer(); - result.append("for (Map.Entry<Object,String> entry : $contextMap.entrySet()) {"); - result.append("if (clazz.isAssignableFrom(entry.getKey().getClass()) && (name == null || name == entry.getValue())) {"); - result.append("return (T) entry.getKey();}}"); - result.append("return null;"); - return result.toString(); + return "return delegateContext.getContextValue(clazz, name);"; } private String getGetParentContenerMethodCode() { - StringBuffer result = new StringBuffer(); - result.append("return this.getParentContainer(this, clazz);"); - return result.toString(); + return "return delegateContext.getParentContainer(clazz);"; } private String getGetParentContenerMethodMoreCode() { - StringBuffer result = new StringBuffer(); - result.append("if (!Container.class.isAssignableFrom(source.getClass())) {return null;}"); - result.append(JAXXCompiler.getLineSeparator()); - result.append("Container parent = ((Container)source).getParent();"); - result.append(JAXXCompiler.getLineSeparator()); - result.append("if (parent != null && !clazz.isAssignableFrom(parent.getClass())){parent = getParentContainer(parent, clazz);}"); - result.append(JAXXCompiler.getLineSeparator()); - result.append("return (O)parent;"); - return result.toString(); + return "return delegateContext.getParentContainer(source, clazz);"; } protected String getCreationCode(CompiledObject object) throws CompilerException { Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/DefaultJAXXContext.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/DefaultJAXXContext.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/DefaultJAXXContext.java 2008-10-30 12:36:43 UTC (rev 1007) @@ -0,0 +1,95 @@ +package jaxx.runtime; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.awt.Container; +import java.util.HashMap; +import java.util.Map; + +/** + * The default {@link JAXXContext} to beused in a {@link JAXXObject} by delegation. + * + * @author chemit + */ +public class DefaultJAXXContext implements JAXXContext { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(DefaultJAXXContext.class); + + /** l'ui auquel est rattache le context */ + protected JAXXObject ui; + + /** les données contenues dans le context */ + protected final Map<Object, String> data; + + public DefaultJAXXContext() { + data = new HashMap<Object, String>(); + } + + public DefaultJAXXContext(JAXXObject ui) { + this(); + this.ui = ui; + } + + public void setContextValue(Object o) { + setContextValue(o, null); + } + + public void setContextValue(Object o, String name) { + // first remove + Object toRemove = getContextValue(o.getClass(), name); + if (toRemove != null) { + log.info("remove previously value " + toRemove); + data.remove(toRemove); + } + // then can put safely + data.put(o, name); + } + + public <T> T getContextValue(Class<T> clazz) { + return getContextValue(clazz, null); + } + + @SuppressWarnings({"unchecked"}) + public <T> T getContextValue(Class<T> clazz, String name) { + for (Map.Entry<Object, String> entry : data.entrySet()) { + if (clazz.isAssignableFrom(entry.getKey().getClass()) && (name == null || name.equals(entry.getValue()))) { + return (T) entry.getKey(); + } + } + //todo pas trouve dans ce context, on devrait rechercher dans les parents de l'ui ? + return null; + } + + + public <O extends Container> O getParentContainer(Class<O> clazz) { + return this.getParentContainer(ui, clazz); + } + + @SuppressWarnings({"unchecked"}) + public <O extends Container> O getParentContainer(Object top, Class<O> clazz) { + if (ui == null) { + throw new IllegalStateException("no ui attached to this context"); + } + if (top==null) { + throw new IllegalArgumentException("top parameter can not be null"); + } + if (!Container.class.isAssignableFrom(top.getClass())) { + throw new IllegalArgumentException("top parameter "+top + " is not a " + Container.class); + } + Container parent = ((Container) top).getParent(); + if (parent != null && !clazz.isAssignableFrom(parent.getClass())) { + parent = getParentContainer(parent, clazz); + } + return (O) parent; + } + + protected JAXXObject getUi() { + return ui; + } + + protected void setUi(JAXXObject ui) { + this.ui = ui; + } +} Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXAction.java 2008-10-30 12:36:43 UTC (rev 1007) @@ -0,0 +1,18 @@ +package jaxx.runtime; + +/** + * This is the contract to be realized by any class to be used as Action class for an ui. + * + * @author chemit + */ +public interface JAXXAction { + + /** + * Prepare the initial context of the ui. + * + * @param parentContent the context of the parent of the ui (can be null if no parent is required) + * @return the {@link jaxx.runtime.JAXXInitialContext} to be injected in the ui via the constructor of the {@link jaxx.runtime.JAXXObject} + */ + JAXXInitialContext init(JAXXContext parentContent); + +} Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-10-27 20:33:29 UTC (rev 1006) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-10-30 12:36:43 UTC (rev 1007) @@ -38,7 +38,7 @@ public class Util { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(Util.class); + static private final Log log = LogFactory.getLog(Util.class); // Maps root objects to lists of event listeners Added: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/runtime/DefaultJAXXContextTest.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/runtime/DefaultJAXXContextTest.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/runtime/DefaultJAXXContextTest.java 2008-10-30 12:36:43 UTC (rev 1007) @@ -0,0 +1,138 @@ +package jaxx.runtime; + +import jaxx.runtime.validator.BeanValidator; +import junit.framework.TestCase; + +import java.awt.Container; +import java.util.List; +import java.util.Map; + +/** @author chemit */ +public class DefaultJAXXContextTest extends TestCase { + + JAXXContext ctxt; + + @Override + protected void setUp() throws Exception { + super.setUp(); + // instanciate a new empty context + ctxt = new DefaultJAXXContext(); + } + + public void testParentContainer() throws Exception { + try { + ctxt.getParentContainer(Container.class); + fail(); + } catch (IllegalStateException e) { + assertTrue(true); + } + try { + ctxt.getParentContainer("null", Container.class); + fail(); + } catch (IllegalStateException e) { + assertTrue(true); + } + + // attach a fake ui (which is NOT a Container) + ((DefaultJAXXContext) ctxt).setUi(new MyJAXXObject()); + try { + ctxt.getParentContainer(Container.class); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(true); + } + + try { + ctxt.getParentContainer(null, Container.class); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(true); + } + + try { + ctxt.getParentContainer("null", Container.class); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(true); + } + + //todo finish test with a real JAXXObject + + } + + public void testSetGetContextValue() throws Exception { + String expected; + String result; + + result = ctxt.getContextValue(String.class); + assertNull(result); + + expected = "yo"; + ctxt.setContextValue(expected); + result = ctxt.getContextValue(String.class); + assertEquals(expected, result); + + expected = "ya"; + ctxt.setContextValue(expected, "second"); + result = ctxt.getContextValue(String.class, "second"); + assertEquals(expected, result); + + expected = "yi"; + ctxt.setContextValue(expected, "second"); + result = ctxt.getContextValue(String.class, "second"); + assertEquals(expected, result); + } + + private static class MyJAXXObject implements JAXXObject { + + public Object getObjectById(String id) { + return null; + } + + public Map<String, Object> get$objectMap() { + return null; + } + + public void applyDataBinding(String id) { + } + + public void removeDataBinding(String id) { + } + + public void processDataBinding(String dest) { + } + + public void firePropertyChange(String name, Object oldValue, Object newValue) { + } + + public void setContextValue(Object o) { + } + + public void setContextValue(Object o, String name) { + } + + public <T> T getContextValue(Class<T> clazz) { + return null; + } + + public <T> T getContextValue(Class<T> clazz, String name) { + return null; + } + + public <O extends Container> O getParentContainer(Class<O> clazz) { + return null; + } + + public <O extends Container> O getParentContainer(Object top, Class<O> clazz) { + return null; + } + + public BeanValidator<?> getValidator(String validatorId) { + return null; + } + + public List<String> getValidatorIds() { + return null; + } + } +}

1 0

[Buix-commits] r1006 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 20:33:29 +0000 (Mon, 27 Oct 2008) New Revision: 1006 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java Log: add a getStringValue util value to have the string representation of an object or an empty string if object is null. Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-10-27 18:27:59 UTC (rev 1005) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/Util.java 2008-10-27 20:33:29 UTC (rev 1006) @@ -393,4 +393,18 @@ } list.addMouseListener(new ErrorListMouseListener()); } + + /** + * Compute the string representation of an object. + * <p/> + * Return empty string if given object is null + * + * @param value the value to write + * @return the string representation of the given object or an empty string if object is null. + */ + public static String getStringValue(Object value) { + String result; + result = value == null ? "" : value.toString(); + return result; + } }

1 0

[Buix-commits] r1005 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 18:27:59 +0000 (Mon, 27 Oct 2008) New Revision: 1005 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java Log: use our code format (block for 1 instruction) remove unecessary else after a return or a throw Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -15,21 +15,20 @@ public Object convertFromString(String string, Class type) { - if (type != Color.class) + if (type != Color.class) { throw new IllegalArgumentException("unsupported type: " + type); + } if (string.length() == 7 && string.charAt(0) == '#') { return new Color(Integer.parseInt(string.substring(1), 16)); - } else { - try { - Field color = Color.class.getField(string); - return color.get(null); - } - catch (NoSuchFieldException e) { - throw new IllegalArgumentException("colors must be of the form #xxxxxx ('#' followed by six hexadecimal digits), or the name of a constant field in java.awt.Color (found: '" + string + "')"); - } - catch (IllegalAccessException e) { - throw new RuntimeException(e); - } } + try { + Field color = Color.class.getField(string); + return color.get(null); + } + catch (NoSuchFieldException e) { + throw new IllegalArgumentException("colors must be of the form #xxxxxx ('#' followed by six hexadecimal digits), or the name of a constant field in java.awt.Color (found: '" + string + "')"); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -15,19 +15,22 @@ public Object convertFromString(String string, Class type) { - if (type != Insets.class) + if (type != Insets.class) { throw new IllegalArgumentException("unsupported type: " + type); + } StringTokenizer tokenizer = new StringTokenizer(string, ","); int count = tokenizer.countTokens(); if (count == 1) { int i = Integer.parseInt(tokenizer.nextToken().trim()); return new Insets(i, i, i, i); - } else if (count == 4) { + } + if (count == 4) { int[] insets = new int[count]; - for (int i = 0; tokenizer.hasMoreTokens(); i++) + for (int i = 0; tokenizer.hasMoreTokens(); i++) { insets[i] = Integer.parseInt(tokenizer.nextToken().trim()); + } return new Insets(insets[0], insets[1], insets[2], insets[3]); - } else - throw new IllegalArgumentException("unable to convert string '" + string + "' to Insets"); + } + throw new IllegalArgumentException("unable to convert string '" + string + "' to Insets"); } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -13,8 +13,9 @@ public Object convertFromString(String string, Class type) { - if (type != KeyStroke.class) + if (type != KeyStroke.class) { throw new IllegalArgumentException("unsupported type: " + type); + } return KeyStroke.getKeyStroke(string); } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -5,7 +5,7 @@ package jaxx.types; public interface TypeConverter { - public String getJavaCode(Object object); + String getJavaCode(Object object); - public Object convertFromString(String string, Class type); + Object convertFromString(String string, Class type); } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -24,21 +24,22 @@ public static String getJavaCode(Object object) { - if (object == null) + if (object == null) { return "null"; - else { - TypeConverter converter = getTypeConverter(object.getClass()); - if (converter == null) - throw new IllegalArgumentException("unsupported type: " + object.getClass()); - return converter.getJavaCode(object); } + TypeConverter converter = getTypeConverter(object.getClass()); + if (converter == null) { + throw new IllegalArgumentException("unsupported type: " + object.getClass()); + } + return converter.getJavaCode(object); } public static Object convertFromString(String string, Class type) { TypeConverter converter = getTypeConverter(type); - if (converter == null) + if (converter == null) { throw new IllegalArgumentException("unsupported type: " + type); + } return converter.convertFromString(string, type); } } \ No newline at end of file

1 0

[Buix-commits] r1004 - lutinjaxx/trunk/jaxx-example/Components
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 17:04:20 +0000 (Mon, 27 Oct 2008) New Revision: 1004 Modified: lutinjaxx/trunk/jaxx-example/Components/ Log: svn ignore Property changes on: lutinjaxx/trunk/jaxx-example/Components ___________________________________________________________________ Name: svn:ignore - target LICENSE.txt + target LICENSE.txt *.log

1 0

[Buix-commits] r1003 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx src/main/java/jaxx/compiler src/main/java/jaxx/tags src/main/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 17:01:12 +0000 (Mon, 27 Oct 2008) New Revision: 1003 Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/ClassMap.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/SwingInitializer.java Log: fix bug 1722 Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-27 16:52:21 UTC (rev 1002) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-27 17:01:12 UTC (rev 1003) @@ -1,4 +1,5 @@ ver-0-6 chemit 200811?? + * 20081027 [chemit] fix bug 1722 * 20081027 [chemit] add conversion support in validator * 20081025 [chemit] improve BeanValidator tag : - add a errorList attribute for set a ErrorListMouseListener on the errorList Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/ClassMap.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/ClassMap.java 2008-10-27 16:52:21 UTC (rev 1002) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/ClassMap.java 2008-10-27 17:01:12 UTC (rev 1003) @@ -6,12 +6,16 @@ import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; +import jaxx.tags.DefaultObjectHandler; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * A Map implementation which uses Classes as keys. <code>ClassMap</code> differs from typical maps * in that it takes subclasses into account; mapping a class to a value also maps all subclasses of @@ -21,6 +25,9 @@ * that, with its nearest ancestor for which there exists a mapping. */ public class ClassMap<T> extends HashMap<ClassDescriptor, T> { + /** log */ + protected static final Log log = LogFactory.getLog(ClassMap.class); + /** * Keeps track of automatically-added Classes so we can distinguish them from user-added * Classes. Unknown Classes are automatically added to the map during <code>get</code> @@ -45,8 +52,9 @@ ClassDescriptor c = (ClassDescriptor) key; while (c != null) { result = super.get(c); - if (result != null) + if (result != null) { break; + } c = c.getSuperclass(); } @@ -55,8 +63,8 @@ } if (c != key && result != null) { // no mapping for the class itself, but found one for a superclass - put(c, result); - autoKeys.add(c); + put((ClassDescriptor) key, result); + autoKeys.add((ClassDescriptor) key); } return result; } @@ -71,8 +79,9 @@ */ @Override public T put(ClassDescriptor key, T value) { - if (!(key instanceof ClassDescriptor)) - throw new IllegalArgumentException("expected ClassDescriptor, got " + key); + //if (!(key instanceof ClassDescriptor)) { + // throw new IllegalArgumentException("expected ClassDescriptor, got " + key); + //} if (autoKeys.size() > 0) { // remove all automatic keys which descend from the class being modified Iterator<ClassDescriptor> i = autoKeys.iterator(); while (i.hasNext()) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java 2008-10-27 16:52:21 UTC (rev 1002) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java 2008-10-27 17:01:12 UTC (rev 1003) @@ -270,11 +270,12 @@ * @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 - //TODO Check if this is safe - return javaCode; + String result = javaCode; + if (isOverride()) { + // handle cases where object is overridden to be a different class + result = "((" + JAXXCompiler.getCanonicalName(getObjectClass()) + ") " + javaCode + ")"; + } + return result; } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-27 16:52:21 UTC (rev 1002) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-27 17:01:12 UTC (rev 1003) @@ -7,8 +7,8 @@ import jaxx.CompilerException; import jaxx.UnsupportedAttributeException; import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; import jaxx.compiler.I18nHelper; +import jaxx.compiler.JAXXCompiler; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import org.apache.commons.logging.Log; @@ -33,9 +33,6 @@ public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, Component.class); - /*if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { - throw new IllegalArgumentException(getClass().getName() + " does not support the class " + beanClass.getName()); - }*/ } @Override @@ -45,17 +42,7 @@ containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) { - DefaultObjectHandler tagHandler = TagManager.getTagHandler(getBeanClass().getSuperclass()); - if (tagHandler instanceof DefaultComponentHandler) { - containerDelegate = ((DefaultComponentHandler) tagHandler).getContainerDelegate(); - } else { - /*tagHandler = TagManager.getTagHandler(getBeanClass()); - if (tagHandler instanceof DefaultComponentHandler) { - containerDelegate = ((DefaultComponentHandler) tagHandler).getContainerDelegate(); - } else {*/ - log.warn("could not find componentHandler for " + getBeanClass().getSuperclass()); - //} - } + containerDelegate = ((DefaultComponentHandler) TagManager.getTagHandler(getBeanClass().getSuperclass())).getContainerDelegate(); } } } @@ -118,8 +105,9 @@ @Override public ClassDescriptor getPropertyType(CompiledObject object, String propertyName, JAXXCompiler compiler) throws CompilerException { if (propertyName.equals("x") || propertyName.equals("y") || propertyName.equals("width") || propertyName.equals("height") || - "font-size".equals(propertyName)) + "font-size".equals(propertyName)) { return ClassDescriptorLoader.getClassDescriptor(Integer.class); + } if (propertyName.equals("font-face") || propertyName.equals("font-style") || propertyName.equals("font-weight")) { return ClassDescriptorLoader.getClassDescriptor(String.class); } @@ -200,10 +188,10 @@ } } // ajout du support i18n - if (I18nHelper.isI18nableAttribute(name,compiler)) { + if (I18nHelper.isI18nableAttribute(name, compiler)) { valueCode = I18nHelper.addI18nInvocation(id, name, valueCode, compiler); } - + return super.getSetPropertyCode(id, name, valueCode, compiler); } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/SwingInitializer.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/SwingInitializer.java 2008-10-27 16:52:21 UTC (rev 1002) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/SwingInitializer.java 2008-10-27 17:01:12 UTC (rev 1003) @@ -38,11 +38,6 @@ TagManager.registerTag("java.awt.*", "ButtonGroup", new DefaultObjectHandler(ClassDescriptorLoader.getClassDescriptor(JAXXButtonGroup.class))); - // Begin Try to fix bug when component handler is not found, but this is not this... - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JButton.class), DefaultComponentHandler.class); - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JTextField.class), JTextComponentHandler.class); - // End Try to fix bug when component handler is not found, but this is not this... - TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(Application.class), ApplicationHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JCheckBox.class), JCheckBoxHandler.class); TagManager.registerBean(ClassDescriptorLoader.getClassDescriptor(JCheckBoxMenuItem.class), JCheckBoxHandler.class);

1 0

[Buix-commits] r1002 - in lutinjaxx/trunk/maven-jaxx-plugin/src/test: java/org/codelutin/jaxx resources/testcases resources/testcases/bug_1722
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 16:52:21 +0000 (Mon, 27 Oct 2008) New Revision: 1002 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx Removed: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1722.xml Log: use a unique DEFAULT_PREFIX fro all tests Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java 2008-10-27 16:52:21 UTC (rev 1002) @@ -1,15 +1,8 @@ package org.codelutin.jaxx; -import java.io.File; - /** @author chemit */ public class Bug1722Test extends JaxxBaseTest { - protected String prefix = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testcases" + File.separator; - - public String getPrefix() { - return prefix; - } public void testBug_1722() throws Exception { mojo.execute(); assertEquals(2, mojo.getFiles().length); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-27 16:52:21 UTC (rev 1002) @@ -11,12 +11,6 @@ public class CompilerTest extends JaxxBaseTest { - protected String prefix = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testcases" + File.separator; - - public String getPrefix() { - return prefix; - } - public void testInnerClasses() throws Exception { mojo.execute(); assertEquals(1, mojo.getFiles().length); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-27 16:52:21 UTC (rev 1002) @@ -1,15 +1,7 @@ package org.codelutin.jaxx; -import java.io.File; - public class I18nTest extends JaxxBaseTest { - protected String prefix = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testcases" + File.separator; - - public String getPrefix() { - return prefix; - } - public void testI18nText() throws Exception { mojo.setI18nable(false); mojo.execute(); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java 2008-10-27 16:52:21 UTC (rev 1002) @@ -10,6 +10,9 @@ /** @author chemit */ public abstract class JaxxBaseTest extends AbstractMojoTestCase { + + protected static final String DEFALUT_PREFIX = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testcases" + File.separator; + /** log */ protected Log log; @@ -17,7 +20,9 @@ protected File pomFile; - public abstract String getPrefix(); + public String getPrefix() { + return DEFALUT_PREFIX; + } @Override protected void setUp() throws Exception { Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1722.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1722.xml 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1722.xml 2008-10-27 16:52:21 UTC (rev 1002) @@ -12,6 +12,7 @@ <outJava>${basedir}/target/it-generated-source/java</outJava> <outResource>${basedir}/target/it-generated-source/resources</outResource> <force>true</force> + <verbose>true</verbose> <includes> <value>**/bug_1722/*.jaxx</value> </includes> Deleted: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx 2008-10-27 16:41:11 UTC (rev 1001) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx 2008-10-27 16:52:21 UTC (rev 1002) @@ -1,5 +0,0 @@ -<DemoPanel> - <JPanel id='demoPanel'> - <JLabel text='override'/> - </JPanel> -</DemoPanel> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1722/JButtonDemo.jaxx 2008-10-27 16:52:21 UTC (rev 1002) @@ -0,0 +1,5 @@ +<DemoPanel> + <JPanel id='demoPanel'> + <JLabel text='override'/> + </JPanel> +</DemoPanel> \ No newline at end of file

1 0

[Buix-commits] r1001 - in lutinjaxx/trunk/jaxx-example: . Components
by tchemit＠users.labs.libre-entreprise.org 27 Oct '08

27 Oct '08

Author: tchemit Date: 2008-10-27 16:41:11 +0000 (Mon, 27 Oct 2008) New Revision: 1001 Modified: lutinjaxx/trunk/jaxx-example/Components/pom.xml lutinjaxx/trunk/jaxx-example/pom.xml Log: fix bug 1722 : this example works again Modified: lutinjaxx/trunk/jaxx-example/Components/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/Components/pom.xml 2008-10-27 11:08:21 UTC (rev 1000) +++ lutinjaxx/trunk/jaxx-example/Components/pom.xml 2008-10-27 16:41:11 UTC (rev 1001) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>jaxx-example</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.codelutin.jaxx-example</groupId> Modified: lutinjaxx/trunk/jaxx-example/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/pom.xml 2008-10-27 11:08:21 UTC (rev 1000) +++ lutinjaxx/trunk/jaxx-example/pom.xml 2008-10-27 16:41:11 UTC (rev 1001) @@ -26,7 +26,7 @@ <modules> <module>Calculator</module> -  + <module>Components</module> <module>Counter</module> <module>LabelStyle</module> <module>Validation</module>

1 0