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