Author: kmorin Date: 2013-07-09 14:15:45 +0200 (Tue, 09 Jul 2013) New Revision: 1121 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1121 Log: fixes #2441 [REF TEMPORAIRE] Positionnement des taxons temporaires dans les listes Modified: trunk/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-09 10:02:33 UTC (rev 1120) +++ trunk/pom.xml 2013-07-09 12:15:45 UTC (rev 1121) @@ -126,7 +126,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.24-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.23</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15</xworkVersion> 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-07-09 10:02:33 UTC (rev 1120) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java 2013-07-09 12:15:45 UTC (rev 1121) @@ -216,7 +216,7 @@ clear(); TuttiDecorator<O> tuttDecorator = (TuttiDecorator<O>) decorator; for (O data : datas) { - Comparable key = (Comparable) tuttDecorator.getValue(data, expression); + Comparable key = (Comparable) tuttDecorator.toString(data); valueCache.put(data, key); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-07-09 10:02:33 UTC (rev 1120) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-07-09 12:15:45 UTC (rev 1121) @@ -529,8 +529,6 @@ (data == null ? 0 : data.size())); } - comboBox.setSortOnDecoratedValues(true); - // add data list to combo box comboBox.init((JXPathDecorator<E>) decorator, data); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2013-07-09 10:02:33 UTC (rev 1120) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2013-07-09 12:15:45 UTC (rev 1121) @@ -88,7 +88,6 @@ final BeanFilterableComboBox<TuttiLocation> component = new BeanFilterableComboBox<TuttiLocation>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); - component.setSortOnDecoratedValues(true); component.setBeanType(TuttiLocation.class); setClickCountToStart(1); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-07-09 10:02:33 UTC (rev 1120) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-07-09 12:15:45 UTC (rev 1121) @@ -87,7 +87,6 @@ final BeanFilterableComboBox<Vessel> component = new BeanFilterableComboBox<Vessel>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); - component.setSortOnDecoratedValues(true); component.setBeanType(Vessel.class); setClickCountToStart(1);