Author: fdesbois Date: 2012-08-24 19:12:30 +0200 (Fri, 24 Aug 2012) New Revision: 470 Url: http://forge.codelutin.com/repositories/revision/sammoa/470 Log: refs #1204 : resolve issue with sorting Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/ObservationTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/RouteTableModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-23 15:37:35 UTC (rev 469) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-24 17:12:30 UTC (rev 470) @@ -69,6 +69,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.Highlighter; +import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; import org.slf4j.Logger; @@ -89,7 +90,6 @@ import javax.swing.event.TableModelListener; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; import javax.swing.table.TableModel; import java.awt.Color; import java.awt.Rectangle; @@ -489,8 +489,9 @@ }, null ); - TableColumn column = dataTable.getColumnModel().getColumn(circleBack); + TableColumnExt column = dataTable.getColumnExt(circleBack); + column.setSortable(false); column.setCellEditor(editorRenderer); column.setCellRenderer(editorRenderer); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/ObservationTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/ObservationTableModel.java 2012-08-23 15:37:35 UTC (rev 469) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/ObservationTableModel.java 2012-08-24 17:12:30 UTC (rev 470) @@ -128,7 +128,7 @@ public enum ObservationColumn { - OBSERVATION_NUMBER(false, String.class, Observation.PROPERTY_OBSERVATION_NUMBER), + OBSERVATION_NUMBER(false, int.class, Observation.PROPERTY_OBSERVATION_NUMBER), OBSERVATION_TIME(false, Date.class, Observation.PROPERTY_OBSERVATION_TIME), OBSERVER(false, String.class, Observation.PROPERTY_OBSERVER_POSITION, Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/RouteTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/RouteTableModel.java 2012-08-23 15:37:35 UTC (rev 469) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/RouteTableModel.java 2012-08-24 17:12:30 UTC (rev 470) @@ -26,6 +26,7 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Route; +import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; @@ -127,9 +128,9 @@ protected enum RouteColumn { - EFFORT_NUMBER(false, String.class, Route.PROPERTY_EFFORT_NUMBER), + EFFORT_NUMBER(false, Integer.class, Route.PROPERTY_EFFORT_NUMBER), BEGIN_TIME(false, Date.class, Route.PROPERTY_BEGIN_TIME), - ROUTE_TYPE(false, String.class, Route.PROPERTY_ROUTE_TYPE), + ROUTE_TYPE(false, RouteType.class, Route.PROPERTY_ROUTE_TYPE), TRANSECT(false, String.class, Route.PROPERTY_TRANSECT_FLIGHT, TransectFlight.PROPERTY_TRANSECT,