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

r2303 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags
by tchemit＠users.nuiton.org Sept. 20, 2011

Sept. 20, 2011

Author: tchemit Date: 2011-09-20 13:27:33 +0200 (Tue, 20 Sep 2011) New Revision: 2303 Url: http://nuiton.org/repositories/revision/jaxx/2303 Log: Evolution #1744: treat imageIcon as icon and actionIcon Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-09-17 12:48:19 UTC (rev 2302) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-09-20 11:27:33 UTC (rev 2303) @@ -73,6 +73,8 @@ public static final String ICON_ATTRIBUTE = "icon"; + public static final String ICON_IMAGE_ATTRIBUTE = "iconImage"; + public static final String NAME_ATTRIBUTE = "name"; public static final String WIDTH_ATTRIBUTE = "width"; @@ -327,6 +329,19 @@ stringValue = "{" + type + ".createImageIcon(\"" + stringValue + "\")}"; } } + } else if (ICON_IMAGE_ATTRIBUTE.equals(propertyName)) { + if (!(stringValue.startsWith("{") || stringValue.endsWith("}"))) { + // this is a customized icon, add the icon creation code +// compiler.setNeedSwingUtil(true); + String type = + compiler.getImportedType(SwingUtil.class); + + if (compiler.getConfiguration().isUseUIManagerForIcon()) { + stringValue = "{" + type + ".getUIManagerIcon(\"" + stringValue + "\").getImage()}"; + } else { + stringValue = "{" + type + ".createImageIcon(\"" + stringValue + "\").getImage()}"; + } + } } else if (ACTION_ICON_ATTRIBUTE.equals(propertyName)) { // customized actionIcon property if (stringValue.startsWith("{") && stringValue.endsWith("}")) {

1 0

r2302 - trunk
by tchemit＠users.nuiton.org Sept. 17, 2011

Sept. 17, 2011

Author: tchemit Date: 2011-09-17 14:48:19 +0200 (Sat, 17 Sep 2011) New Revision: 2302 Url: http://nuiton.org/repositories/revision/jaxx/2302 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:06:01 UTC (rev 2301) +++ trunk/pom.xml 2011-09-17 12:48:19 UTC (rev 2302) @@ -97,7 +97,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion>

1 0

r2301 - trunk
by tchemit＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 18:06:01 +0200 (Fri, 09 Sep 2011) New Revision: 2301 Url: http://nuiton.org/repositories/revision/jaxx/2301 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:15 UTC (rev 2300) +++ trunk/pom.xml 2011-09-09 16:06:01 UTC (rev 2301) @@ -116,6 +116,13 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> + + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> <dependencyManagement> <dependencies>

1 0

r2300 - trunk
by maven-release＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: maven-release Date: 2011-09-09 17:50:15 +0200 (Fri, 09 Sep 2011) New Revision: 2300 Url: http://nuiton.org/repositories/revision/jaxx/2300 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-19 16:29:02 UTC (rev 2299) +++ trunk/pom.xml 2011-09-09 15:50:15 UTC (rev 2300) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2299 - trunk
by tchemit＠users.nuiton.org Aug. 19, 2011

Aug. 19, 2011

Author: tchemit Date: 2011-08-19 18:29:02 +0200 (Fri, 19 Aug 2011) New Revision: 2299 Url: http://nuiton.org/repositories/revision/jaxx/2299 Log: Update mavenpom4redmineAndCentral to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 05:13:42 UTC (rev 2298) +++ trunk/pom.xml 2011-08-19 16:29:02 UTC (rev 2299) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2298 - in trunk: jaxx-compiler/src/license jaxx-runtime/src/license jaxx-validator/src/license jaxx-widgets/src/license maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org Aug. 18, 2011

Aug. 18, 2011

Author: tchemit Date: 2011-08-18 07:13:42 +0200 (Thu, 18 Aug 2011) New Revision: 2298 Url: http://nuiton.org/repositories/revision/jaxx/2298 Log: update third-parties + svn properties and add missing i81n bundle for tutorial Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-validator/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-08-16 23:11:37 UTC (rev 2297) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-08-18 05:13:42 UTC (rev 2298) @@ -2,20 +2,25 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +# - MIT License # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jul 31 15:20:00 CEST 2011 -asm--asm--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +#Thu Aug 18 07:10:45 CEST 2011 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-08-16 23:11:37 UTC (rev 2297) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-08-18 05:13:42 UTC (rev 2298) @@ -1,15 +1,20 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 21:30:15 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:10:40 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/jaxx-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-08-16 23:11:37 UTC (rev 2297) +++ trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-08-18 05:13:42 UTC (rev 2298) @@ -2,20 +2,24 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +# - MIT License # - The Apache Software License, Version 2.0 # - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jul 31 15:19:58 CEST 2011 -asm--asm--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +#Thu Aug 18 07:10:44 CEST 2011 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) Modified: trunk/jaxx-widgets/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2011-08-16 23:11:37 UTC (rev 2297) +++ trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2011-08-18 05:13:42 UTC (rev 2298) @@ -1,15 +1,20 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 21:54:05 CET 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:10:57 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-08-16 23:11:37 UTC (rev 2297) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-08-18 05:13:42 UTC (rev 2298) @@ -2,27 +2,32 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +# - MIT License # - Public Domain # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html # - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jul 31 15:20:34 CEST 2011 -asm--asm--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html -commons-cli--commons-cli--1.0--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 -oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:10:52 CEST 2011 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r2297 - trunk
by tchemit＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: tchemit Date: 2011-08-17 01:11:37 +0200 (Wed, 17 Aug 2011) New Revision: 2297 Url: http://nuiton.org/repositories/revision/jaxx/2297 Log: Update mavenpom4redmineAndCentral to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:44:28 UTC (rev 2296) +++ trunk/pom.xml 2011-08-16 23:11:37 UTC (rev 2297) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2296 - trunk
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 17:44:28 +0200 (Thu, 04 Aug 2011) New Revision: 2296 Url: http://nuiton.org/repositories/revision/jaxx/2296 Log: Evolution #1659: Updates to i18n 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 13:11:17 UTC (rev 2295) +++ trunk/pom.xml 2011-08-04 15:44:28 UTC (rev 2296) @@ -98,7 +98,7 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.3-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.4</nuitonI18nVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2295 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 15:11:17 +0200 (Thu, 04 Aug 2011) New Revision: 2295 Url: http://nuiton.org/repositories/revision/jaxx/2295 Log: use last version of nuiton-utils decorator api Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-08-04 13:06:00 UTC (rev 2294) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-08-04 13:11:17 UTC (rev 2295) @@ -370,12 +370,12 @@ // use default popup title title = DEFAULT_POPUP_LABEL; - Class<?> internalClass = decorator.getInternalClass(); + Class<?> type = decorator.getType(); String beanI18nKey; - if (internalClass == null) { + if (type == null) { beanI18nKey = n_("bean.unknown.type"); } else { - beanI18nKey = i18nPrefix + Introspector.decapitalize(internalClass.getSimpleName()); + beanI18nKey = i18nPrefix + Introspector.decapitalize(type.getSimpleName()); } String beanI18n = _(beanI18nKey); title = _(title, beanI18n);

1 0

r2294 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 15:06:00 +0200 (Thu, 04 Aug 2011) New Revision: 2294 Url: http://nuiton.org/repositories/revision/jaxx/2294 Log: use last version of nuiton-utils decorator api Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-08-04 13:05:47 UTC (rev 2293) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-08-04 13:06:00 UTC (rev 2294) @@ -26,7 +26,7 @@ package jaxx.runtime.swing.editor.bean; import jaxx.runtime.SwingUtil; -import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.DecoratorUtil; import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; @@ -247,10 +247,10 @@ List<O> data = ui.getData(); try { // Sort data with the decorator jxpath tokens. - DecoratorUtils.sort(decorator, - data, - index, - reversesort + DecoratorUtil.sort(decorator, + data, + index, + reversesort ); } catch (Exception eee) { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-08-04 13:05:47 UTC (rev 2293) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-08-04 13:06:00 UTC (rev 2294) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor.bean; -import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.DecoratorUtil; import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; @@ -186,10 +186,10 @@ try { // Sort data with the decorator jxpath tokens. - DecoratorUtils.sort(decorator, - datas, - index, - reverseSort); + DecoratorUtil.sort(decorator, + datas, + index, + reverseSort); } catch (Exception e) { log.warn(e.getMessage(), e); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-08-04 13:05:47 UTC (rev 2293) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-08-04 13:06:00 UTC (rev 2294) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor.bean; import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.DecoratorUtil; import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; @@ -265,8 +265,8 @@ separatorReplacement = " - "; } - return DecoratorUtils.newMultiJXPathDecorator( - decorator.getInternalClass(), + return DecoratorUtil.newMultiJXPathDecorator( + decorator.getType(), decorator.getInitialExpression(), separator, separatorReplacement

1 0