Author: fdesbois Date: 2012-09-12 17:39:59 +0200 (Wed, 12 Sep 2012) New Revision: 577 Url: http://forge.codelutin.com/repositories/revision/sammoa/577 Log: Resolve broken test + NPE in TransectFlightcellEditor Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-09-12 14:45:33 UTC (rev 576) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-09-12 15:39:59 UTC (rev 577) @@ -222,6 +222,7 @@ builder.newMandatoryColumn("LON", "longitude", Common.DOUBLE_PRIMITIVE); builder.newMandatoryColumn("SPEED", "speed", Common.DOUBLE_PRIMITIVE); builder.newMandatoryColumn("ALTITUDE", "altitude", Common.DOUBLE_PRIMITIVE); + builder.newMandatoryColumn("GPS_DELAY", "captureDelay", new DoubleToIntegerValueParser()); return builder.getColumnsForImport(); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-12 14:45:33 UTC (rev 576) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-12 15:39:59 UTC (rev 577) @@ -1010,7 +1010,8 @@ boolean result; TransectFlight value = getCellEditorValue(); - if (Objects.equal(value, initValue) + if (value == null + || Objects.equal(value, initValue) || SammoaUtil.askQuestion(editorComponent, _( "sammoa.confirmDialog.changeRouteTransect.message", value.getTransect().getName()))) {