Author: tchemit Date: 2013-09-28 16:36:33 +0200 (Sat, 28 Sep 2013) New Revision: 1248 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1248 Log: refs #3392: [TECH] Updates nuiton-decorator to 3.0-alpha-2 fixes #3335: [ERGO] Permettre ?\195?\160 l'utilisateur d'ordonner les attributs ?\195?\160 afficher, et pas seulement le premier ?\195?\160 afficher refs #3330: [CAPTURE] gestion des poids dans le tableau (add missing action icon) Added: trunk/tutti-ui-swing/src/main/resources/icons/action-clean.png Modified: trunk/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-28 12:15:25 UTC (rev 1247) +++ trunk/pom.xml 2013-09-28 14:36:33 UTC (rev 1248) @@ -123,7 +123,7 @@ <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion> + <nuitonDecoratorVersion>3.0-SNAPSHOT</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-1</nuitonUpdaterVersion> <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java 2013-09-28 12:15:25 UTC (rev 1247) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java 2013-09-28 14:36:33 UTC (rev 1248) @@ -31,9 +31,10 @@ import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BeanUtil; +import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.decorator.MultiJXPathDecorator; +import org.nuiton.util.beans.BeanUtil; import java.beans.PropertyDescriptor; import java.io.Serializable; @@ -77,7 +78,10 @@ super(internalClass, expression, separator, - separatorReplacement); + separatorReplacement, + DecoratorUtil.<O>createMultiJXPathContextKeepingOrder(expression, + separator, + separatorReplacement)); tokenMethods = Maps.newHashMap(); Set<PropertyDescriptor> descriptors = BeanUtil.getDescriptors(type, BeanUtil.IS_READ_DESCRIPTOR); // PropertyDescriptor[] descriptors = Added: trunk/tutti-ui-swing/src/main/resources/icons/action-clean.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-clean.png ___________________________________________________________________ Added: svn:mime-type + image/png