Author: fdesbois Date: 2012-09-04 14:47:21 +0200 (Tue, 04 Sep 2012) New Revision: 513 Url: http://forge.codelutin.com/repositories/revision/sammoa/513 Log: refs #1372 : issue on delete transect + add shortcut config Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-03 17:31:14 UTC (rev 512) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-04 12:47:21 UTC (rev 513) @@ -76,6 +76,8 @@ public static final String PROPERTY_CIRCLE_BACK = "circleBack"; + public static final String PROPERTY_VALID_TRANSECT = "validTransect"; + public static final String PROPERTY_VALID_ROUTE = "validRoute"; public static final String PROPERTY_VALID_OBSERVATION = "validObservation"; @@ -464,6 +466,13 @@ false, false), + KEY_VALID_TRANSECT("ui." + PROPERTY_VALID_TRANSECT, + n_("sammoa.config.ui.validTransect"), + "alt pressed T", + KeyStroke.class, + false, + false), + KEY_VALID_ROUTE("ui." + PROPERTY_VALID_ROUTE, n_("sammoa.config.ui.validRoute"), "alt pressed R", Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-03 17:31:14 UTC (rev 512) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-04 12:47:21 UTC (rev 513) @@ -33,6 +33,7 @@ sammoa.config.ui.stop=Stop sammoa.config.ui.validObservation=Validate the selected observation sammoa.config.ui.validRoute=Validate the selected route +sammoa.config.ui.validTransect=Validate the selected transect sammoa.dateTimePattern=dd/MM/yyyy HH\:mm\:ss sammoa.dbf.import.error.unableToReadField=impossible to read value for column %s at line %s sammoa.flight.decorator.flight=Flight %1$d Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-03 17:31:14 UTC (rev 512) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-04 12:47:21 UTC (rev 513) @@ -82,7 +82,7 @@ TransectFlight transectFlightChanged = getValidationService().validateTransectFlight(getModel().getFlight(), transectFlight); - if (transectFlightChanged.isDeleted()) { + if (transectFlightChanged == null) { getModel().removeTransectFlight(index); } else {