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

r1786 - in trunk/jaxx-runtime/src: main/java/jaxx/runtime/decorator test/java/jaxx/runtime/decorator
by tchemit＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: tchemit Date: 2010-03-15 13:12:51 +0100 (Mon, 15 Mar 2010) New Revision: 1786 Log: * Evolution #403: Introduce a extented jaxx.runtime.decorator.MapPropertyHandler * Introduce a simple JXPathContext tester jaxx.runtime.decorator.JXPathContextTester * Reformat decorator package Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -20,6 +20,8 @@ */ package jaxx.runtime.decorator; +import java.io.Serializable; + /** * A simple contract to define a String decorator on any java objet. * @@ -27,7 +29,7 @@ * @author chemit * @since 1.7.2 (was previously {@code jaxx.runtime.Decorator}) */ -public abstract class Decorator<O> implements java.io.Serializable { +public abstract class Decorator<O> implements Serializable { private static final long serialVersionUID = -1L; /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -50,7 +50,8 @@ } /** - * Obtain a decorator given a object and an extra name to qualify the context. + * Obtain a decorator given a object and an extra name to qualify the + * context. * * @param object object of decorated object * @param name extra name to qualify the decorator to use @@ -98,7 +99,8 @@ } } - protected void registerPropertyDecorator(Class<?> klass, String expression) { + protected void registerPropertyDecorator(Class<?> klass, + String expression) { registerPropertyDecorator(klass, null, expression); } @@ -106,22 +108,38 @@ registerJXPathDecorator(klass, null, expression); } - protected void registerMultiJXPathDecorator(Class<?> klass, String expression, String separator, String separatorReplacement) { - registerMultiJXPathDecorator(klass, null, expression, separator, separatorReplacement); + protected void registerMultiJXPathDecorator(Class<?> klass, + String expression, + String separator, + String separatorReplacement) { + registerMultiJXPathDecorator(klass, null, expression, separator, + separatorReplacement); } - protected void registerPropertyDecorator(Class<?> klass, String name, String expression) { - Decorator<?> decorator = DecoratorUtils.newPropertyDecorator(klass, expression); + protected void registerPropertyDecorator(Class<?> klass, + String name, + String expression) { + Decorator<?> decorator = + DecoratorUtils.newPropertyDecorator(klass, expression); registerDecorator(name, decorator); } - protected void registerJXPathDecorator(Class<?> klass, String name, String expression) { - Decorator<?> decorator = DecoratorUtils.newJXPathDecorator(klass, expression); + protected void registerJXPathDecorator(Class<?> klass, + String name, + String expression) { + Decorator<?> decorator = + DecoratorUtils.newJXPathDecorator(klass, expression); registerDecorator(name, decorator); } - protected void registerMultiJXPathDecorator(Class<?> klass, String name, String expression, String separator, String separatorReplacement) { - Decorator<?> decorator = DecoratorUtils.newMultiJXPathDecorator(klass, expression, separator, separatorReplacement); + protected void registerMultiJXPathDecorator(Class<?> klass, + String name, + String expression, + String separator, + String separatorReplacement) { + Decorator<?> decorator = DecoratorUtils.newMultiJXPathDecorator( + klass, expression, separator, separatorReplacement + ); registerDecorator(name, decorator); } @@ -136,16 +154,21 @@ * @param context the name decorator * @param decorator the decorator to register */ - protected <T> void registerDecorator(String context, Decorator<T> decorator) { + protected <T> void registerDecorator(String context, + Decorator<T> decorator) { // obtain the decorator context - DecoratorContext<?> result = getDecoratorContext(decorator.getInternalClass(), context); + DecoratorContext<?> result = + getDecoratorContext(decorator.getInternalClass(), context); if (result != null) { - throw new IllegalArgumentException("there is an already register decorator with context " + result); + throw new IllegalArgumentException( + "there is an already register decorator with context " + + result); } - DecoratorContext<T> decoratorContext = new DecoratorContext<T>(context, decorator); + DecoratorContext<T> decoratorContext = + new DecoratorContext<T>(context, decorator); if (log.isDebugEnabled()) { log.debug(decoratorContext); } @@ -160,7 +183,8 @@ } @SuppressWarnings({"unchecked"}) - protected <T> DecoratorContext<T> getDecoratorContext(Class<T> type, String context) { + protected <T> DecoratorContext<T> getDecoratorContext(Class<T> type, + String context) { DecoratorContext<T> result = null; if (decorators != null) { for (DecoratorContext<?> d : decorators) { @@ -214,12 +238,14 @@ } public boolean accept(String context) { - return ((this.context == null && context == null) || (this.context != null && this.context.equals(context))); + return ((this.context == null && context == null) || + (this.context != null && this.context.equals(context))); } @Override public String toString() { - return super.toString() + "<type: " + getType().getName() + ", context :" + context + ">"; + return super.toString() + "<type: " + getType().getName() + + ", context :" + context + ">"; } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -26,14 +26,14 @@ import java.util.*; /** - * Some usefull methods on {@link Decorator} to create, and sort data with decorators. + * Some usefull methods on {@link Decorator} to create, and sort data with + * decorators. * - * To create a new decorator, use one of the methods : - * <ul> - * <li>{@link #newPropertyDecorator(Class, String)}</li> - * <li>{@link #newJXPathDecorator(Class, String)}</li> - * <li>{@link #newMultiJXPathDecorator(Class, String, String)})</li> - * <li>{@link #newMultiJXPathDecorator(Class, String, String, String)})</li> + * To create a new decorator, use one of the methods : <ul> <li>{@link + * #newPropertyDecorator(Class, String)}</li> <li>{@link + * #newJXPathDecorator(Class, String)}</li> <li> + * {@link #newMultiJXPathDecorator(Class, String, String)})</li> + * <li>{@link #newMultiJXPathDecorator(Class, String,String, String)})</li> * </ul> * * To sort a list of data, using a {@link JXPathDecorator}, use the method @@ -49,9 +49,11 @@ * Factory method to instanciate a new {@link PropertyDecorator} for the * given class {@code internlaClass} and a readable property name. * - * @param internalClass the class of the objects decorated by the new decorator + * @param internalClass the class of the objects decorated by the new + * decorator * @param property the property - * @param <O> the generic type of class to be decorated by the new decorator + * @param <O> the generic type of class to be decorated by the new + * decorator * @return the new instanciated decorator * @throws IllegalArgumentException if the expression is not valid, says: * @@ -68,14 +70,14 @@ } /** - * Factory method to instanciate a new {@link JXPathDecorator} for the - * given class {@code internalClass} and expression. + * Factory method to instanciate a new {@link JXPathDecorator} for the given + * class {@code internalClass} and expression. * * @param internalClass the class of the objects decorated by the new * decorator * @param expression the expression to use to decorated objects - * @param <O> the generic type of class to be decorated by the - * new decorator + * @param <O> the generic type of class to be decorated by the new + * decorator * @return the new instanciated decorator * @throws IllegalArgumentException if the expression is not valid, says: * @@ -171,16 +173,16 @@ // seek end of jxpath end = expression.indexOf("}", start + 1); if (end == -1) { - throw new IllegalArgumentException("could not find the rigth " + - "brace starting at car " + start + " : " + - expression.substring(start + 2)); + throw new IllegalArgumentException( + "could not find the rigth brace starting at car " + + start + " : " + expression.substring(start + 2)); } String jxpath = expression.substring(start + 2, end); // not allowed ${ inside a jxpath token if (jxpath.indexOf("${") > -1) { - throw new IllegalArgumentException("could not find a ${ " + - "inside a jxpath expression at car " + - (start + 2) + " : " + jxpath); + throw new IllegalArgumentException( + "could not find a ${ inside a jxpath expression at " + + "car " + (start + 2) + " : " + jxpath); } // save the jxpath token lTokens.add(jxpath); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.Serializable; import java.util.*; /** @@ -75,7 +76,7 @@ Context<O> context) throws IllegalArgumentException, NullPointerException { super(internalClass); - this.initialExpression = expression; + initialExpression = expression; if (context != null) { setContext(context); } @@ -130,7 +131,7 @@ public void setContext(Context<O> context) { this.context = context; - this.nbToken = context.tokens.length; + nbToken = context.tokens.length; // always reset comparator //this.context.comparator = null; if (log.isDebugEnabled()) { @@ -158,7 +159,7 @@ public JXPathComparator(String expression) { this.expression = expression; - this.valueCache = new HashMap<O, Comparable<Comparable<?>>>(); + valueCache = new HashMap<O, Comparable<Comparable<?>>>(); } @Override @@ -192,7 +193,7 @@ } } - public static class Context<O> implements java.io.Serializable { + public static class Context<O> implements Serializable { /** * expression to format using {@link String#format(String, Object...)}, Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -0,0 +1,176 @@ +/* + * *##% + * JAXX Runtime + * Copyright (C) 2008 - 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.runtime.decorator; + +import org.apache.commons.jxpath.DynamicPropertyHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +/** + * A extended handler to deal with map in JXPath contexts. + * + * The basic one in JXPath api only deals with map keys as string. + * + * We offers a hook in method {@link #getKey(Object)} to obtain a string + * representation of a real object in map (key or value). + * + * More over, you can also access directly to a key or a value, using this + * syntax : + * + * <pre>context.getValue(".[@name='key:programme2']")</pre> + * <pre>context.getValue(".[@name='value:programme2']")</pre> + * + * If the values are iterable, then will scan inot it when looking for a direct + * value. + * + * @author tchemit <chemit(a)codelutin.com> + * @see DynamicPropertyHandler + * @since 2.0.1 + */ +public class MapPropertyHandler implements DynamicPropertyHandler { + + /** Logger */ + private static final Log log = + LogFactory.getLog(MapPropertyHandler.class); + + @Override + public String[] getPropertyNames(Object object) { + Map<?, ?> map = (Map<?, ?>) object; + Set<?> set = map.keySet(); + String[] names = new String[set.size()]; + Iterator<?> it = set.iterator(); + for (int i = 0; i < names.length; i++) { + Object o = it.next(); + names[i] = getKey(o); + } + return names; + } + + @Override + public Object getProperty(Object object, String propertyName) { + Map<?, ?> map = (Map<?, ?>) object; + boolean getKey = false; + Object property0; + if (propertyName.startsWith("value:")) { + propertyName = propertyName.substring(6); + if (log.isDebugEnabled()) { + log.debug("property value name " + propertyName); + } + property0 = getPropertyValue(map, propertyName); + if (log.isDebugEnabled()) { + log.debug("property value = " + property0); + } + return property0; + } + if (propertyName.startsWith("key:")) { + propertyName = propertyName.substring(4); + getKey = true; + } + property0 = getPropertyKey(map, propertyName); + Object result = null; + if (property0 != null) { + if (getKey) { + result = property0; + } else { + result = map.get(property0); + } + } + return result; + } + + @Override + public void setProperty(Object object, String propertyName, Object value) { + Map map = (Map) object; + Object property0 = getPropertyKey(map, propertyName); + if (property0 != null) { + map.put(property0, value); + } + } + + /** + * Obtain the key from the map keys which matches the given {@code key}. + * + * To compare object ot string, please refers to the method {@link + * #getKey(Object)}. + * + * @param map the map to scan + * @param key the string representation of the required key as object + * @return the found key, or {@code null} if not found. + */ + public Object getPropertyKey(Map<?, ?> map, String key) { + Set<?> set = map.keySet(); + for (Object o : set) { + String k = getKey(o); + if (key.equals(k)) { + return o; + } + } + return null; + } + + /** + * Obtain the value from the map values which matches the given {@code + * value}. + * + * To compare object to string, please refer to the method {@link + * #getKey(Object)}. + * + * @param map the map to scan + * @param value the string representation of the value + * @return the found value, or {@code null} if not found.} + */ + public Object getPropertyValue(Map<?, ?> map, String value) { + Collection<?> set = map.values(); + for (Object o : set) { + if (o instanceof Iterable<?>) { + Iterable<?> c = (Iterable<?>) o; + for (Object oo : c) { + String k = getKey(oo); + if (value.equals(k)) { + return oo; + } + } + continue; + } + String k = getKey(o); + if (value.equals(k)) { + return o; + } + } + return null; + } + + /** + * Obtain a string representation of an object. + * + * @param o the object to decorate + * @return the string representation of the object + */ + protected String getKey(Object o) { + String k = String.valueOf(o); + return k; + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -28,34 +28,35 @@ /** * TODO * + * @author chemit * @param <O> type of data to decorate - * @author chemit * @see Decorator * @since 1.7.2 (was previously {@code jaxx.runtime.MultiJXPathDecorator}) */ public class MultiJXPathDecorator<O> extends JXPathDecorator<O> { private static final long serialVersionUID = 1L; - /** - * Logger - */ - private static final Log log = LogFactory.getLog(MultiJXPathDecorator.class); - /** - * Contexts of the decorator - */ + + /** Logger */ + private static final Log log = + LogFactory.getLog(MultiJXPathDecorator.class); + + /** Contexts of the decorator */ protected Context<O>[] contexts; - /** - * context separator - */ + + /** context separator */ protected String separator; - /** - * context separator replacement - */ + + /** context separator replacement */ protected String separatorReplacement; - protected MultiJXPathDecorator(Class<O> internalClass, String expression, - String separator, String separatorReplacement, - Context<O>[] contexts) throws IllegalArgumentException, NullPointerException { + protected MultiJXPathDecorator( + Class<O> internalClass, + String expression, + String separator, + String separatorReplacement, + Context<O>[] contexts) throws IllegalArgumentException, + NullPointerException { super(internalClass, expression, null); this.separator = separator; this.separatorReplacement = separatorReplacement; @@ -64,7 +65,7 @@ setContextIndex(0); if (log.isDebugEnabled()) { - log.debug(expression + " --> " + this.context); + log.debug(expression + " --> " + context); } } @@ -92,9 +93,13 @@ return context1.getComparator(0); } - protected void ensureContextIndex(MultiJXPathDecorator<?> decorator, int pos) { + protected void ensureContextIndex(MultiJXPathDecorator<?> decorator, + int pos) { if (pos < -1 || pos > decorator.contexts.length) { - throw new ArrayIndexOutOfBoundsException("context index " + pos + " is out of bound, can be inside [" + 0 + "," + decorator.contexts.length + "]"); + throw new ArrayIndexOutOfBoundsException( + "context index " + pos + + " is out of bound, can be inside [" + 0 + "," + + decorator.contexts.length + "]"); } } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java 2010-03-15 11:20:55 UTC (rev 1785) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -28,7 +28,8 @@ import java.lang.reflect.Method; /** - * Simple property decorator based on {@link String#format(String, Object[])} method. + * Simple property decorator based on {@link String#format(String, Object...)} + * method. * * To use it, give him a class and the property name to render. * @@ -37,22 +38,21 @@ * Decorator<Object> d = DecoratorUtils.newPropertyDecorator(PropertyDecorator.class,"expressions"); * </pre> * + * @author chemit * @param <O> type of data to decorate - * @author chemit * @see Decorator * @since 1.7.2 (was previously {@code jaxx.runtime.PropertyDecorator}) */ public class PropertyDecorator<O> extends Decorator<O> { private static final long serialVersionUID = 1L; - /** - * Logger - */ + + /** Logger */ static private final Log log = LogFactory.getLog(PropertyDecorator.class); - /** - * name of property - */ + + /** name of property */ protected String property; + protected transient Method m; @Override @@ -69,7 +69,8 @@ return property; } - protected PropertyDecorator(Class<O> internalClass, String property) throws NullPointerException { + protected PropertyDecorator(Class<O> internalClass, + String property) throws NullPointerException { super(internalClass); if (property == null) { throw new NullPointerException("property can not be null."); @@ -83,7 +84,7 @@ if (m == null) { for (PropertyDescriptor propertyDescriptor : PropertyUtils.getPropertyDescriptors(internalClass)) { if (propertyDescriptor.getName().equals(property)) { - this.m = propertyDescriptor.getReadMethod(); + m = propertyDescriptor.getReadMethod(); break; } } Added: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java (rev 0) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -0,0 +1,53 @@ +/* + * *##% + * JAXX Runtime + * Copyright (C) 2008 - 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.runtime.decorator; + +import org.apache.commons.jxpath.JXPathContext; +import org.junit.After; +import org.junit.Assert; + +/** + * A simple class to test JXPath context. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0.1 + */ +public abstract class JXPathContextTester { + + JXPathContext context; + + @After + public void after() { + context = null; + + } + + protected void newContext(Object o) { + context = JXPathContext.newContext(o); + } + + protected <T> T getValue(String path) { + Assert.assertNotNull("pas de context initialisé", context); + Object value = context.getValue(path); + return (T) value; + } + +} Property changes on: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java (rev 0) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java 2010-03-15 12:12:51 UTC (rev 1786) @@ -0,0 +1,124 @@ +/* + * *##% + * JAXX Runtime + * Copyright (C) 2008 - 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.runtime.decorator; + +import org.apache.commons.jxpath.JXPathIntrospector; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.Map; +import java.util.TreeMap; + +/** + * Tests the class {@link MapPropertyHandler}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0.1 + */ +public class MapPropertyHandlerTest extends JXPathContextTester { + + + /** Logger */ + private static final Log log = + LogFactory.getLog(MapPropertyHandlerTest.class); + + private static final String TWO_ID = "two"; + + private static final String ONE_ID = "one"; + + @BeforeClass + public static void beforeClass() { + + // pour initialiser le JXPathContext + JXPathIntrospector.registerDynamicClass( + Map.class, + MapPropertyHandler.class + ); + } + + @Before + public void setUp() { + + Map<String, Boolean> map = new TreeMap<String, Boolean>(); + map.put(ONE_ID, true); + map.put(TWO_ID, false); + + if (log.isInfoEnabled()) { + log.info("init map : " + map); + } + newContext(map); + } + + @Test + public void testValues() throws Exception { + + Boolean value; + + value = (Boolean) getValue(".[@name='one']"); + Assert.assertNotNull(value); + Assert.assertTrue(value); + + value = (Boolean) getValue(".[@name='two']"); + Assert.assertNotNull(value); + Assert.assertFalse(value); + + value = (Boolean) getValue(".[@name='three']"); + Assert.assertNull(value); + } + + @Test + public void testKey() throws Exception { + + String key; + + key = (String) getValue(".[@name='key:one']"); + Assert.assertNotNull(key); + Assert.assertEquals(ONE_ID, key); + + key = (String) getValue(".[@name='key:two']"); + Assert.assertNotNull(key); + Assert.assertEquals(TWO_ID, key); + + key = (String) getValue(".[@name='key:fake']"); + Assert.assertNull(key); + } + + @Test + public void testValue() throws Exception { + + Boolean value; + + value = (Boolean) getValue(".[@name='value:true']"); + Assert.assertNotNull(value); + Assert.assertTrue(value); + + value = (Boolean) getValue(".[@name='value:false']"); + Assert.assertNotNull(value); + Assert.assertFalse(value); + + value = (Boolean) getValue(".[@name='value:fake']"); + Assert.assertNull(value); + } +} Property changes on: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1785 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: tchemit Date: 2010-03-15 12:20:55 +0100 (Mon, 15 Mar 2010) New Revision: 1785 Log: reformat code Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java 2010-03-13 19:35:08 UTC (rev 1784) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java 2010-03-15 11:20:55 UTC (rev 1785) @@ -20,47 +20,46 @@ */ package jaxx.runtime.swing.navigation; -import java.util.Enumeration; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import jaxx.runtime.JAXXAction; import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXObject; import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.JAXXObject; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeNode; +import java.util.Enumeration; + /** * Node of the {@link NavigationTreeModel}. - * - * Each node is associated with : - * <ul> - * <li> a {@code bean} coming from a {@link JAXXContext} </li> - * <li> a {@code uiClass} to build the associated ui </li> + * + * Each node is associated with : <ul> <li> a {@code bean} coming from a {@link + * JAXXContext} </li> <li> a {@code uiClass} to build the associated ui </li> * </ul> * - * To retrieve the bean from the context, there is a huge logic in the - * method {@link #getBean(JAXXContext)}. - * - * In few words, if the {@link #jaxxContextEntryDef} is defined, it means - * that the object is taken from the {@code context}. + * To retrieve the bean from the context, there is a huge logic in the method + * {@link #getBean(JAXXContext)}. * + * In few words, if the {@link #jaxxContextEntryDef} is defined, it means that + * the object is taken from the {@code context}. + * * Otherwise, find the first ancestor with an context entry and retrieve from * here the bean. * - * Then go down to the initial node by applying the jxpath expressions - * {@link #jaxxContextEntryPath} of each node on road back. + * Then go down to the initial node by applying the jxpath expressions {@link + * #jaxxContextEntryPath} of each node on road back. * - * - * To identify easly a node, each node has a {@link #path} and a - * {@link #fullPath} (full path from root node). * - * + * To identify easly a node, each node has a {@link #path} and a {@link + * #fullPath} (full path from root node). + * + * * To display the node we use a {@link NavigationTreeNodeRenderer} which is in * fact the {@link #userObject}, the object can be synch with the bean via the * {@link NavigationTreeNodeRenderer#reload(java.lang.Object)} method. - * + * * @author chemit * @see NavigationTreeModel * @see NavigationTreeNodeRenderer @@ -69,32 +68,35 @@ public class NavigationTreeNode extends DefaultMutableTreeNode { private static final long serialVersionUID = 1L; - /** - * Logger - */ + + /** Logger */ static private final Log log = LogFactory.getLog(NavigationTreeNode.class); + /** * The path separator used to build the {@link #fullPath}. - * + * * @see #path * @see #fullPath */ protected final String pathSeparator; + /** * The node path. * - * Used to build the {@link #fullPath} which gives a unique identifier of the - * node. + * Used to build the {@link #fullPath} which gives a unique identifier of + * the node. + * * @see #pathSeparator * @see #fullPath */ protected String path; + /** * The full path for the node from the rood node. * - * This path is build by appending nodes {@link #path} from the root node - * to this node, between each path we introduce the {@link #pathSeparator}. - * + * This path is build by appending nodes {@link #path} from the root node to + * this node, between each path we introduce the {@link #pathSeparator}. + * * Exemple : * <pre> * root @@ -103,48 +105,56 @@ * `-- child2 * </pre> * will given {@code $root/child1/child2}. + * * @see #pathSeparator * @see #path */ protected String fullPath; + /** * The UI class associated with the node. * - * This class can be {@code null}, in that case, the - * {@link NavigationTreeModelBuilder#defaultUIClass} will be used while - * building the model. + * This class can be {@code null}, in that case, the {@link + * NavigationTreeModelBuilder#defaultUIClass} will be used while building + * the model. */ protected Class<? extends JAXXObject> uIClass; - /** + + /** * The UI handler class associated with the node. * - * This class can be {@code null}, in that case, the - * {@link NavigationTreeModelBuilder#defaultUIHandlerClass} will be used - * while building the model. + * This class can be {@code null}, in that case, the {@link + * NavigationTreeModelBuilder#defaultUIHandlerClass} will be used while + * building the model. */ protected Class<? extends JAXXAction> uIHandlerClass; + /** * The context entry definition to retrieve the bean. - * + * * Note: If not set - the {@code bean} will be retrieve on a ancestor * node. */ protected JAXXContextEntryDef<?> jaxxContextEntryDef; - /** + + /** * The jxPath to process to obtain real {@code bean} from the data retrieve * in the context. - * - * Note: If not set -no jxpath will be apply on the bean from context. + * + * Note: If not set -no jxpath will be apply on the bean from + * context. */ protected String jaxxContextEntryPath; + /** * The bean associated with the node ( the value can be obtain via the - * method {@link #getBean(JAXXContext)} or directly set via method - * {@link #setBean(Object)}. + * method {@link #getBean(JAXXContext)} or directly set via method {@link + * #setBean(Object)}. * * cache of bean associated with bean to improve performance */ protected transient Object bean; + /** * The type of the related bean associated with the node. * @@ -177,10 +187,7 @@ this.jaxxContextEntryPath = jaxxContextEntryPath; } - /** - * - * @return the text node renderer (store in {@link #userObject} property. - */ + /** @return the text node renderer (store in {@link #userObject} property. */ public NavigationTreeNodeRenderer getRenderer() { NavigationTreeNodeRenderer render = null; Object o = getUserObject(); @@ -275,7 +282,8 @@ } /** - * @param path the name of the {@link #path} to be matched in the child of this node. + * @param path the name of the {@link #path} to be matched in the child of + * this node. * @return the child of this node with given {@link #path} value. */ public NavigationTreeNode getChild(String path) { @@ -311,7 +319,15 @@ throw new NullPointerException("could not find the renderer for node " + this); } - Object b = getBean(context); + String s = getFullPath(); + Object b = null; + try { + b = getBean(context); + } finally { + if (log.isInfoEnabled()) { + log.info("bean for path [" + s + "] = " + bean); + } + } renderer.reload(b); }

1 0

r1784 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config: . model
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 20:35:08 +0100 (Sat, 13 Mar 2010) New Revision: 1784 Log: change author signature Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUIHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBackEntry.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBacksManager.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUIHandler.java 2010-03-13 09:04:57 UTC (rev 1783) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUIHandler.java 2010-03-13 19:35:08 UTC (rev 1784) @@ -18,7 +18,7 @@ /** * callBackUI handler * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ public class ConfigCallBackUIHandler { @@ -164,4 +164,4 @@ } }); } -} \ No newline at end of file +} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBackEntry.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBackEntry.java 2010-03-13 09:04:57 UTC (rev 1783) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBackEntry.java 2010-03-13 19:35:08 UTC (rev 1784) @@ -7,7 +7,7 @@ /** * A call back with his attached options. * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ public class CallBackEntry { @@ -54,4 +54,4 @@ options.add(option); } -} \ No newline at end of file +} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBacksManager.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBacksManager.java 2010-03-13 09:04:57 UTC (rev 1783) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CallBacksManager.java 2010-03-13 19:35:08 UTC (rev 1784) @@ -9,7 +9,7 @@ /** * CallBack manager. * - * @author tchemit < chemit(a)codelutin.com > + * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ public class CallBacksManager { @@ -168,4 +168,4 @@ return null; } -} \ No newline at end of file +}

1 0

r1783 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-swing-action jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 10:04:57 +0100 (Sat, 13 Mar 2010) New Revision: 1783 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/jaxx-compiler/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/jaxx-demo/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/jaxx-runtime/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/jaxx-swing-action/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/jaxx-widgets/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/maven-jaxx-plugin/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-13 09:04:52 UTC (rev 1782) +++ trunk/pom.xml 2010-03-13 09:04:57 UTC (rev 1783) @@ -14,7 +14,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -414,9 +414,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.0</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> </project>

1 0

r1782 - tags
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 10:04:52 +0100 (Sat, 13 Mar 2010) New Revision: 1782 Log: [maven-release-plugin] copy for tag jaxx-2.0 Added: tags/jaxx-2.0/

1 0

r1781 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-swing-action jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 10:04:49 +0100 (Sat, 13 Mar 2010) New Revision: 1781 Log: [maven-release-plugin] prepare release jaxx-2.0 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/jaxx-compiler/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/jaxx-demo/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/jaxx-runtime/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/jaxx-swing-action/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/jaxx-widgets/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/maven-jaxx-plugin/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-13 09:02:04 UTC (rev 1780) +++ trunk/pom.xml 2010-03-13 09:04:49 UTC (rev 1781) @@ -14,7 +14,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-7-SNAPSHOT</version> + <version>2.0</version> <modules> <module>jaxx-runtime</module> @@ -414,9 +414,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.0</url> </scm> </project>

1 0

r1780 - trunk/src/site/rst
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 10:02:04 +0100 (Sat, 13 Mar 2010) New Revision: 1780 Log: update doc Modified: trunk/src/site/rst/NavigationModel.rst Modified: trunk/src/site/rst/NavigationModel.rst =================================================================== --- trunk/src/site/rst/NavigationModel.rst 2010-03-13 08:18:50 UTC (rev 1779) +++ trunk/src/site/rst/NavigationModel.rst 2010-03-13 09:02:04 UTC (rev 1780) @@ -4,7 +4,7 @@ .. contents:: -**WARNING : documentation non à jour...** +**WARNING : certaines parties de la documentation ne sont pas à jour...** Présentation ============

1 0

r1779 - trunk/src/site/rst
by tchemit＠users.nuiton.org 13 Mar '10

13 Mar '10

Author: tchemit Date: 2010-03-13 09:18:50 +0100 (Sat, 13 Mar 2010) New Revision: 1779 Log: update docs Modified: trunk/src/site/rst/NavigationModel.rst trunk/src/site/rst/migration.rst Modified: trunk/src/site/rst/NavigationModel.rst =================================================================== --- trunk/src/site/rst/NavigationModel.rst 2010-03-12 20:13:58 UTC (rev 1778) +++ trunk/src/site/rst/NavigationModel.rst 2010-03-13 08:18:50 UTC (rev 1779) @@ -11,39 +11,46 @@ Ajout d'un modèle d'arbre de navigation. -Le but de cette fonctionnalité est de pouvoir créer un arbre de navigation lié au context de JAXX, de définir des UI -rattachés à chaque noeud. +Le but de cette fonctionnalité est de pouvoir créer un arbre de navigation lié +au context de JAXX, de définir des UI rattachés à chaque noeud. Le développement est effectué dans le paquetage *jaxx.runtime.swing.navigation*. jaxx.runtime.swing.navigation.NavigationModel ============================================= -Contract representant le model de l'arbre de navigation. +Contract représentant le model de l'arbre de navigation. -Les noeuds présents dans se modèle sont aussi typés en *jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode*. +Les noeuds présents dans se modèle sont aussi typés en +*jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode*. -L'idée principale est de pouvoir associer à un noeud précis un chemin depuis la racine, ce que l'on appele *chemin de navigation*. +L'idée principale est de pouvoir associer à un noeud précis un chemin depuis +la racine, ce que l'on appele *chemin de navigation*. -Pour obtenir le chemin de navigation d'un noeud donné, on récupère l'enmseble des neoud depuis la racine vers ce noeud -et les concatène en suffixant par le caractère séparateur défini. +Pour obtenir le chemin de navigation d'un noeud donné, on récupère l'enmseble +des neoud depuis la racine vers ce noeud et les concatène en suffixant par le +caractère séparateur défini. Tout les models suivants implémantent cette interface. jaxx.runtime.swing.navigation.NavigationTreeModel ================================================= -Il s'agit du modèle de l'arbre utilisé, c'est une extension d'un *javax.swing.tree.DefaultTreeModel*. +Il s'agit du modèle de l'arbre utilisé, c'est une extension d'un +*javax.swing.tree.DefaultTreeModel*. jaxx.runtime.swing.navigation.NavigationTreeTableModel ====================================================== -Il s'agit du modèle de l'arbre tableau (*org.jdesktop.swingx.JXTreeTable*), c'est une extension d'un *org.jdesktop.swingx.treetable.DefaultTreeTableModel*. +Il s'agit du modèle de l'arbre tableau (*org.jdesktop.swingx.JXTreeTable*), +c'est une extension d'un *org.jdesktop.swingx.treetable.DefaultTreeTableModel*. -Les noeuds présents dans se modèle sont typés en *jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeTableNode* qui +Les noeuds présents dans se modèle sont typés en +*jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeTableNode* qui étend *jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode*. -NavigationTreeTableNode est abstaite, l'instance doit donc être crée en implementant la méthode createNavigationTreeTableNode +NavigationTreeTableNode est abstaite, l'instance doit donc être crée en +implementant la méthode createNavigationTreeTableNode du builder (*jaxx.runtime.swing.navigation.NavigationTreeTableModelBuilder*). Les builders @@ -52,18 +59,23 @@ jaxx.runtime.swing.navigation.NavigationModelBuilder ---------------------------------------------------- -Les builders sont des classes utilitaires permétant de construire le model et les rendus de l'arbre simplement. +Les builders sont des classes utilitaires permétant de construire le model et +les rendus de l'arbre simplement. + Tous les builders implémentent cette interface. jaxx.runtime.swing.navigation.NavigationTreeModelBuilder -------------------------------------------------------- -Classe utilitaire pour construire le model (ici un *jaxx.runtime.swing.navigation.NavigationTreeModel*) et décorer un arbre. +Classe utilitaire pour construire le model (ici un +*jaxx.runtime.swing.navigation.NavigationTreeModel*) et décorer un arbre. jaxx.runtime.swing.navigation.NavigationTreeTableModelBuilder ------------------------------------------------------------- -Classe utilitaire pour construire le model (ici un *jaxx.runtime.swing.navigation.NavigationTreeTableModel*) et décorer un arbre tableau. +Classe utilitaire pour construire le model (ici un +*jaxx.runtime.swing.navigation.NavigationTreeTableModel*) et décorer un arbre +tableau. Les Handlers ============ @@ -71,26 +83,33 @@ jaxx.runtime.swing.navigation.NavigationTreeHandler --------------------------------------------------- -Cette classe est une implémentation d'un model de sélection pour les arbres de navigations. +Cette classe est une implémentation d'un model de sélection pour les arbres +de navigations. -Il y a 2 façons de l'utiliser, soit l'on associe une ui par noeud (*Strategy.PER_NODE*) soit on associe une ui par type de noeud (*Strategy.PER_UI_TYPE*). +Il y a 2 façons de l'utiliser, soit l'on associe une ui par noeud +(*Strategy.PER_NODE*) soit on associe une ui par type de noeud +(*Strategy.PER_UI_TYPE*). jaxx.runtime.swing.navigation.NavigationTreeHandlerWithCardLayout ----------------------------------------------------------------- -Extension de *jaxx.runtime.swing.navigation.NavigationTreeHandler* pour l'utilisation de CardLayout (*jaxx.runtime.swing.CardLayout2*). +Extension de *jaxx.runtime.swing.navigation.NavigationTreeHandler* pour +l'utilisation de CardLayout (*jaxx.runtime.swing.CardLayout2*). jaxx.runtime.swing.navigation.NavigationMultiTreeHandler -------------------------------------------------------- TODO ajouter la strategie de la multiselection -Extension de *jaxx.runtime.swing.navigation.NavigationTreeHandler* pour ajouter la possibilité d'utiliser la multisélection. +Extension de *jaxx.runtime.swing.navigation.NavigationTreeHandler* pour +ajouter la possibilité d'utiliser la multisélection. Définition d'un noeud ===================== -Le noeud (*jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode*) est une extension d'un *javax.swing.tree.DefaultMutableTreeNode*. +Le noeud +(*jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode*) est +une extension d'un *javax.swing.tree.DefaultMutableTreeNode*. Il apporte les nouvelles propriétés suivantes : @@ -108,7 +127,8 @@ Retrouver un noeud à partir du chemin de navigation *************************************************** -Il est possible en connaissant le chemin de navigation d'un noued de récupérer le noeud dans l'arbre via la méthode +Il est possible en connaissant le chemin de navigation d'un noeud de récupérer +le noeud dans l'arbre via la méthode :: @@ -117,7 +137,8 @@ Trouver la valeur associée dans le context JAXX à partir du chemin de navigation ******************************************************************************** -Il est possible en connaissant le chemin de navigation d'un noued de récupérer la valeur associée dans le context JAXX. +Il est possible en connaissant le chemin de navigation d'un noeud de récupérer +la valeur associée dans le context JAXX. :: @@ -127,9 +148,13 @@ * récupération du noeud associé au chemin de navigation - * recherche du premier noeud (dans les noeuds qui remontent vers la racine de l'arbre) dont la propriété *jaxxContextEntry* est non nulle, il s'agit du point d'entré dans le context JAXX. + * recherche du premier noeud (dans les noeuds qui remontent vers la racine + de l'arbre) dont la propriété *jaxxContextEntry* est non nulle, il s'agit + du point d'entré dans le context JAXX. - * redescendre à partir de ce noeud vers le noeud d'origine (si ce noeud était différent) et en descendant conjointement dans l'objet du context JAXX : + * redescendre à partir de ce noeud vers le noeud d'origine (si ce noeud + était différent) et en descendant conjointement dans l'objet du context + JAXX : - on utilise l'expression JXPath pour obtenir l'objet associé au noeud @@ -186,10 +211,13 @@ jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapter ============================================================ -Il s'agit d'un listener sur la sélection d'un noeud dans l'arbre de navigation basé sur notre modèle de navigation. Il -étend *javax.swing.event.TreeSelectionListener*. +Il s'agit d'un listener sur la sélection d'un noeud dans l'arbre de navigation +basé sur notre modèle de navigation. Il étend +*javax.swing.event.TreeSelectionListener*. -Ce listener contient la gestion de passage d'un noeud à un autre avec interaction avec le context JAXX et affichage automatique de l'ui associé au noeud sélectionné. +Ce listener contient la gestion de passage d'un noeud à un autre avec +interaction avec le context JAXX et affichage automatique de l'ui associé au +noeud sélectionné. **Attention : la mécanique ne fonctionne que pour un arbre à selection unique.** @@ -198,23 +226,29 @@ Voici l'algorithme utilisé lors de la sélection d'un nouveau noeud : - * *closeUI* : tentative de fermeture de l'ui lié au noeud précédemment selectionné, si cela n'aboutit pas on retourne sur le noeud précédent. + * *closeUI* : tentative de fermeture de l'ui lié au noeud précédemment + selectionné, si cela n'aboutit pas on retourne sur le noeud précédent. - * *attachBeanFromNodeToContext* : injection dans le context JAXX de la valeur associée au nouveau noeud + * *attachBeanFromNodeToContext* : injection dans le context JAXX de la valeur + associée au nouveau noeud * *createUI* : création de la nouvelle ui (si elle n'existe pas) * *openUI* : ouverture de la nouvelle ui -Si une erreur survient lors de ces opérations, on entre dans la méthode *goBackToPreviousNode* qui est abstraite et permet de notifier les erreur de retourner au noeud précdent. +Si une erreur survient lors de ces opérations, on entre dans la méthode +*goBackToPreviousNode* qui est abstraite et permet de notifier les erreur de +retourner au noeud précdent. jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout ************************************************************************** -Il s'agit d'une implantation du listener précédent qui suppose que les uis associées aux noeuds sont affichées dans un -unique container en utilisant le layout *jaxx.runtime.swing.CardLayout2*. +Il s'agit d'une implantation du listener précédent qui suppose que les uis +associées aux noeuds sont affichées dans un unique container en utilisant le +layout *jaxx.runtime.swing.CardLayout2*. -La contrainte de chaque ui sera extactement le chemin de navigation du noeud associé. +La contrainte de chaque ui sera extactement le chemin de navigation du noeud +associé. Il possède deux méthodes abstraites : @@ -222,7 +256,9 @@ * *getContentLayout* : qui indique le layout utilisé. -Pour pouvoir utilisé cet *adapter*, il vous suffit de définir la méthode suivante (en plus des deux méthodes abstraites) : +Pour pouvoir utilisé cet *adapter*, il vous suffit de définir la méthode +suivante (en plus des deux méthodes abstraites) : - * *goBackToPreviousNode* : comment gérer les erreurs et retourner au noeud précedent. + * *goBackToPreviousNode* : comment gérer les erreurs et retourner au noeud + précedent. Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2010-03-12 20:13:58 UTC (rev 1778) +++ trunk/src/site/rst/migration.rst 2010-03-13 08:18:50 UTC (rev 1779) @@ -15,16 +15,24 @@ * JList, JComboBox et JTree n'acceptent plus de fils Item (utiliser JAXXList, JAXXComboBox, JAXXTree). - * changement de paquetage de jaxx.runtime.JAXXContext vers jaxx.runtime.JAXXContext + * Changement de paquetage de jaxx.runtime.JAXXContext vers jaxx.runtime.JAXXContext - * changement de paquetage de jaxx.runtime.\*Decorator vers jaxx.runtime.decorator.\*Decorator + * Changement de paquetage de jaxx.runtime.Decorator vers jaxx.runtime.decorator.Decorator - * le framwork NavigationTree n'est plus compatible avec l'ancien... + * Le framwork de Navigation n'est plus compatible avec l'ancien... * JAXX interprète toutes les interfaces, elles doivent être donc importer * Les classe PropertychangeListener et PropertyChangeEvent ne sont plus automatiquement importées et il faut le faire manuellement quand requis. - * L'api des bindings a complètement été revue et permet de les programmer + * L'api des bindings a complètement été revue et permet de les utiliser par + programmation. +Aide à la migration +------------------- + +Pour tout problème rencontré lors d'un passage à la version 2.0, vous pouvez +utiliser les listes de diffusions du projet disponibles ici : +http://maven-site.nuiton.org/jaxx/mail-lists.html +

1 0

r1778 - trunk
by tchemit＠users.nuiton.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 21:13:58 +0100 (Fri, 12 Mar 2010) New Revision: 1778 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 17:21:11 UTC (rev 1777) +++ trunk/pom.xml 2010-03-12 20:13:58 UTC (rev 1778) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>jaxx</artifactId>

1 0

r1777 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 18:21:11 +0100 (Fri, 12 Mar 2010) New Revision: 1777 Log: add AbstractActionthread.createRunnable to create easely a Runnable interface from a given method name to invoke in a proxy Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/AbstractActionThread.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/AbstractActionThread.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/AbstractActionThread.java 2010-03-12 16:09:15 UTC (rev 1776) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/AbstractActionThread.java 2010-03-12 17:21:11 UTC (rev 1777) @@ -2,10 +2,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; /** * An abstract action thread to consume actions in a non Swing event thread. @@ -59,6 +64,10 @@ protected Exception error; + protected long startTime; + + protected long endTime; + public ActionWorker(String actionLabel, Runnable target) { this.target = target; this.actionLabel = actionLabel; @@ -66,13 +75,18 @@ @Override protected Void doInBackground() throws Exception { + startTime = System.nanoTime(); if (log.isDebugEnabled()) { - log.debug("Action is starting " + getActionLabel()); + log.debug("Action [" + getActionLabel() + "] is starting..."); } try { target.run(); } catch (Exception e) { error = e; + } finally { + if (log.isDebugEnabled()) { + log.debug("Action [" + getActionLabel() + "] is ending..."); + } } return null; } @@ -96,21 +110,30 @@ @Override protected void done() { super.done(); + endTime = System.nanoTime(); if (error != null) { status = ActionStatus.FAIL; - return; - } - - if (isCancelled()) { + } else if (isCancelled()) { status = ActionStatus.CANCEL; - return; + } else { + status = ActionStatus.OK; } - status = ActionStatus.OK; if (log.isDebugEnabled()) { - log.debug("Action is ending " + getActionLabel() + - " with status : " + status); + log.debug("Action [" + getActionLabel() + "] ends with status : " + status + " in " + getTime()); } } + + public String getTime() { + return StringUtil.convertTime(endTime - startTime); + } + + public long getStartTime() { + return startTime; + } + + public long getEndTime() { + return endTime; + } } protected AbstractActionThread(String name) { @@ -119,10 +142,11 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("action " + evt.getSource() + " property " + - evt.getPropertyName() + " changed <" + - evt.getOldValue() + " - " + evt.getNewValue() + ">"); + if (log.isDebugEnabled()) { + log.debug("action " + evt.getSource() + " property " + + evt.getPropertyName() + " changed <" + + evt.getOldValue() + " - " + evt.getNewValue() + + '>'); } if ("state".equals(evt.getPropertyName())) { @@ -143,8 +167,9 @@ // prochaine operation ActionStatus status = source.getStatus(); - if (log.isInfoEnabled()) { - log.info("status = " + status); + if (log.isDebugEnabled()) { + log.debug("Action [" + source.getActionLabel() + + "] status = " + status); } try { switch (status) { @@ -171,6 +196,96 @@ } /** + * Creates a runnable instance (via a Proxy) to a method given by his name + * ({@code methodName}) to invoke on {@code methodcontainer} with given + * {@code arguments}. + * + * This is a great feature to create runnable code with a real context. + * + * @param methodContainer the container of the method to invoke + * @param methodName the name of the method to invoke + * @param arguments parameters to pass to method to invke. + * @return the proxy instance + */ + public Runnable createRunnable(final Object methodContainer, + String methodName, + final Object... arguments) { + + // find method + + Class<?> klass = methodContainer.getClass(); + Method mFound = null; + for (Method m : klass.getDeclaredMethods()) { + if (!methodName.equals(m.getName())) { + continue; + } + //same method name + + Class<?>[] types = m.getParameterTypes(); + if (arguments.length != types.length) { + continue; + } + + // same number arguments + mFound = m; + break; + } + if (mFound == null) { + throw new IllegalArgumentException( + "could not find method " + methodName + " on type " + + klass.getName()); + } + + //TODO Test arguments are on good type... + + final Method targetMethod = mFound; + targetMethod.setAccessible(true); + Runnable result; + + // create runnable proxy + + result = (Runnable) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{Runnable.class}, + new InvocationHandler() { + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) { + String methodName = method.getName(); + + if ("run".equals(methodName)) { + try { + if (log.isDebugEnabled()) { + log.debug("will invoke run method"); + } + return targetMethod.invoke(methodContainer, arguments); + } catch (IllegalAccessException e) { + throw new RuntimeException( + "could not invoke on container " + + methodContainer, e); + } catch (InvocationTargetException e) { + throw new RuntimeException(e); + } + } + if (methodName.equals("toString")) { + return toString(); + } + if (methodName.equals("equals")) { + return equals(args[0]); + } + if (methodName.equals("hashCode")) { + return hashCode(); + } + return null; + } + } + ); + return result; + } + + /** * Add an new action to perform. * * @param actionLabel the name of the action to perform @@ -272,12 +387,6 @@ // est terminée ou a été annulée, on passera alors // dans la méthode onPropertyChanged - if (canceled) { -// getModel().setOperationState(WizardOperationState.CANCELED); - } else { -// getModel().setOperationState(currentAction.getOperationState()); - } - } finally { if (worker != null) { // le thread n'écoute plus l'action car elle est terminée

1 0