Author: tchemit Date: 2012-08-10 11:29:39 +0200 (Fri, 10 Aug 2012) New Revision: 383 Url: http://forge.codelutin.com/repositories/revision/sammoa/383 Log: fixes #1396: Table des routes non ?\195?\169ditable sur certaines cellules (utilisation d'un seul constructeur sur les m?\195?\169tas d'un mod?\195?\168le de tableau) 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/RouteTableModel.java 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-09 18:35:24 UTC (rev 382) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/ObservationTableModel.java 2012-08-10 09:29:39 UTC (rev 383) @@ -128,15 +128,15 @@ public enum ObservationColumn { - OBSERVATION_NUMBER(false, Observation.PROPERTY_OBSERVATION_NUMBER), + OBSERVATION_NUMBER(false, String.class, Observation.PROPERTY_OBSERVATION_NUMBER), OBSERVATION_TIME(false, Date.class, Observation.PROPERTY_OBSERVATION_TIME), - OBSERVER(false, + OBSERVER(false,String.class, Observation.PROPERTY_OBSERVER_POSITION, ObserverPosition.PROPERTY_OBSERVER, Observer.PROPERTY_INITIALS ), POD_SIZE(true, int.class, Observation.PROPERTY_POD_SIZE), - SPECIES(true, Observation.PROPERTY_SPECIES, Species.PROPERTY_CODE) { + SPECIES(true, String.class, Observation.PROPERTY_SPECIES, Species.PROPERTY_CODE) { @Override public void setValue(Observation bean, Object value, Region region) { String newValue = (String) value; @@ -159,10 +159,10 @@ } } }, - AGE(true, Observation.PROPERTY_AGE), + AGE(true, String.class, Observation.PROPERTY_AGE), DEC_ANGLE(true, int.class, Observation.PROPERTY_DEC_ANGLE), - CUE(true, Observation.PROPERTY_CUE), - BEHAVIOUR(true, Observation.PROPERTY_BEHAVIOUR) { + CUE(true, String.class, Observation.PROPERTY_CUE), + BEHAVIOUR(true, String.class, Observation.PROPERTY_BEHAVIOUR) { @Override public void setValue(Observation bean, Object value, Region region) { String newValue = (String) value; @@ -173,9 +173,9 @@ } }, SWIM_DIR(true, int.class, Observation.PROPERTY_SWIM_DIR), - CALVES(true, Observation.PROPERTY_CALVES), + CALVES(true, String.class, Observation.PROPERTY_CALVES), PHOTO(true, boolean.class, Observation.PROPERTY_PHOTO), - COMMENT(true, Observation.PROPERTY_COMMENT), + COMMENT(true, String.class, Observation.PROPERTY_COMMENT), OBSERVATION_STATUS(true, ObservationStatus.class, Observation.PROPERTY_OBSERVATION_STATUS), DELETED(true, boolean.class, Observation.PROPERTY_DELETED), CIRCLE_BACK(true, Observation.class, "circleBack") { @@ -198,11 +198,6 @@ private final String columnName; private ObservationColumn(boolean editable, - String... beanProperties) { - this(editable, String.class, beanProperties); - } - - private ObservationColumn(boolean editable, Class<?> type, String... beanProperties) { this.editable = editable; 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-09 18:35:24 UTC (rev 382) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/RouteTableModel.java 2012-08-10 09:29:39 UTC (rev 383) @@ -127,10 +127,10 @@ protected enum RouteColumn { - EFFORT_NUMBER(false, Route.PROPERTY_EFFORT_NUMBER), + EFFORT_NUMBER(false, String.class, Route.PROPERTY_EFFORT_NUMBER), BEGIN_TIME(false, Date.class, Route.PROPERTY_BEGIN_TIME), - ROUTE_TYPE(false, Route.PROPERTY_ROUTE_TYPE), - TRANSECT(false, + ROUTE_TYPE(false, String.class, Route.PROPERTY_ROUTE_TYPE), + TRANSECT(false,String.class, Route.PROPERTY_TRANSECT_FLIGHT, TransectFlight.PROPERTY_TRANSECT, Transect.PROPERTY_NAME @@ -163,10 +163,10 @@ GLARE_SEVERITY(true, int.class, Route.PROPERTY_GLARE_SEVERITY), GLARE_UNDER(true, boolean.class, Route.PROPERTY_GLARE_UNDER), CLOUD_COVER(true, int.class, Route.PROPERTY_CLOUD_COVER), - SUBJECTIVE_CONDITIONS(true, Route.PROPERTY_SUBJECTIVE_CONDITIONS), - UNEXPECTED_LEFT(true, Route.PROPERTY_UNEXPECTED_LEFT), - UNEXEPECTED_RIGHT(true, Route.PROPERTY_UNEXPECTED_RIGHT), - COMMENT(true, Route.PROPERTY_COMMENT), + SUBJECTIVE_CONDITIONS(true, String.class, Route.PROPERTY_SUBJECTIVE_CONDITIONS), + UNEXPECTED_LEFT(true, String.class, Route.PROPERTY_UNEXPECTED_LEFT), + UNEXEPECTED_RIGHT(true, String.class, Route.PROPERTY_UNEXPECTED_RIGHT), + COMMENT(true, String.class, Route.PROPERTY_COMMENT), DELETED(true, boolean.class, Route.PROPERTY_DELETED); private final boolean editable; @@ -177,13 +177,7 @@ private final String columnName; - private RouteColumn(boolean editable, - String... beanProperties) { - this(editable, null, beanProperties); - } - - private RouteColumn(boolean editable, Class<?> type, String... beanProperties) { this.editable = editable;