Author: kmorin Date: 2013-07-09 14:15:16 +0200 (Tue, 09 Jul 2013) New Revision: 2696 Url: http://nuiton.org/projects/jaxx/repository/revisions/2696 Log: revert last changes, not really useful actually Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-07-09 09:53:05 UTC (rev 2695) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-07-09 12:15:16 UTC (rev 2696) @@ -42,9 +42,6 @@ <!-- flag to reverse the sort --> <Boolean id='reverseSort' javaBean='false'/> - <!-- Sort on the decorated values of the data --> - <Boolean id='sortOnDecoratedValues' javaBean='false'/> - <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-07-09 09:53:05 UTC (rev 2695) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-07-09 12:15:16 UTC (rev 2696) @@ -53,8 +53,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; -import java.util.Collections; -import java.util.Comparator; import java.util.List; /** @@ -426,39 +424,12 @@ List<O> data = ui.getData(); try { - Boolean sortOnDecoratedValue = ui.getSortOnDecoratedValues(); - if (sortOnDecoratedValue != null && sortOnDecoratedValue) { - Collections.sort(data, new Comparator<O>() { - @Override - public int compare(O o1, O o2) { - if (o1 == null) { - if (o2 == null) { - return 0; - } - return 1; - } - if (o2 == null) { - return -1; - } - String s1 = decorator.toString(o1); - String s2 = decorator.toString(o2); - return s1.compareTo(s2); - } - }); - if (reversesort) { + // Sort data with the decorator jxpath tokens. + DecoratorUtil.sort(decorator, + data, + index, + reversesort); - // reverse order - Collections.reverse(data); - } - - } else { - // Sort data with the decorator jxpath tokens. - DecoratorUtil.sort(decorator, - data, - index, - reversesort); - } - } catch (Exception eee) { log.warn(eee.getMessage(), eee); }