August 2012 - Sammoa-commits - mailman.cloud.codelutin.com

r400 - in trunk: . sammoa-application sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/main/java/fr/ulr/sammoa/application/csv sammoa-application/src/main/java/fr/ulr/sammoa/application/device sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-application/src/main/java/fr/ulr/sammoa/appl
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 17:55:35 +0200 (Fri, 10 Aug 2012) New Revision: 400 Url: http://forge.codelutin.com/repositories/revision/sammoa/400 Log: optimize dependencies add missing headers fix NPe in ExportMapService when no observer found Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/DoubleToIntegerValueParser.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/SpeciesImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateTypeValueParser.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/TransectImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManager.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateListener.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorder.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderMock.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerListener.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfColumnModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfImport.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTimestampConverter.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/DbfTimestampConverterTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/ExportMapServiceTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/pom.xml 2012-08-10 15:55:35 UTC (rev 400) @@ -391,7 +391,14 @@ <artifactId>gpsinput</artifactId> <version>0.5.3</version> </dependency> + + <dependency> + <groupId>org.rxtx</groupId> + <artifactId>rxtx</artifactId> + <version>2.1.7</version> + </dependency> </dependencies> + </dependencyManagement> <build> @@ -438,6 +445,19 @@ <version>${jaxxVersion}</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>${animalSnifferPluginVersion}</version> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> + </plugins> </pluginManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/pom.xml 2012-08-10 15:55:35 UTC (rev 400) @@ -37,6 +37,11 @@ <artifactId>gpsinput</artifactId> </dependency> + <dependency> + <groupId>org.rxtx</groupId> + <artifactId>rxtx</artifactId> + </dependency> +  <dependency> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-08-10 15:55:35 UTC (rev 400) @@ -62,6 +62,7 @@ import org.nuiton.util.TimeLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sun.misc.URLClassPath; import java.util.Collection; import java.util.Collections; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/DoubleToIntegerValueParser.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/DoubleToIntegerValueParser.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/DoubleToIntegerValueParser.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/SpeciesImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/SpeciesImportModel.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/SpeciesImportModel.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateImportModel.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateImportModel.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateTypeValueParser.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateTypeValueParser.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/StrateTypeValueParser.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/TransectImportModel.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/csv/TransectImportModel.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManager.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManager.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManager.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateListener.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateListener.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateListener.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorder.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorder.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorder.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderMock.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderMock.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderMock.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerListener.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerListener.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerListener.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfColumnModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfColumnModel.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfColumnModel.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,7 +1,28 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ -import com.bbn.openmap.dataAccess.shape.DbfTableModel; - /** * Note: there is an existing {@link com.bbn.openmap.dataAccess.shape.DbfTableModelFactory.Column} * class. Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfImport.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfImport.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfImport.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import com.bbn.openmap.dataAccess.shape.DbfTableModel; import com.google.common.base.Function; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTimestampConverter.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTimestampConverter.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTimestampConverter.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import com.google.common.base.Preconditions; import com.google.common.base.Strings; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java 2012-08-10 15:55:35 UTC (rev 400) @@ -725,17 +725,17 @@ ObserverPosition observerPositionByPosition = route.getObserverPositionByPosition(Position.FRONT_LEFT); - if (observerPositionByPosition != null) { + if (observerPositionByPosition != null && observerPositionByPosition.getObserver() != null) { record.put("LEFT_REAR", observerPositionByPosition.getObserver().getInitials()); } observerPositionByPosition = route.getObserverPositionByPosition(Position.FRONT_RIGHT); - if (observerPositionByPosition != null) { + if (observerPositionByPosition != null && observerPositionByPosition.getObserver() != null) { record.put("RIGHT_REAR", observerPositionByPosition.getObserver().getInitials()); } observerPositionByPosition = route.getObserverPositionByPosition(Position.NAVIGATOR); - if (observerPositionByPosition != null) { + if (observerPositionByPosition != null && observerPositionByPosition.getObserver() != null) { record.put("CENTER", observerPositionByPosition.getObserver().getInitials()); } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * TODO Modified: trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java =================================================================== --- trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java 2012-08-10 15:55:35 UTC (rev 400) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java =================================================================== --- trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package org.dinopolis.gpstool.gpsinput.nmea; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import org.dinopolis.gpstool.gpsinput.GPSException; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/DbfTimestampConverterTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/DbfTimestampConverterTest.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/DbfTimestampConverterTest.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import junit.framework.Assert; import org.junit.Test; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/ExportMapServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/ExportMapServiceTest.java 2012-08-10 14:54:01 UTC (rev 399) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/map/ExportMapServiceTest.java 2012-08-10 15:55:35 UTC (rev 400) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.application.map; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import com.google.common.collect.Lists; import fr.ulr.sammoa.application.FlightService;

1 0

r399 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by fdesbois＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: fdesbois Date: 2012-08-10 16:54:01 +0200 (Fri, 10 Aug 2012) New Revision: 399 Url: http://forge.codelutin.com/repositories/revision/sammoa/399 Log: Resolve windows issue on close, do not use SafeGPSSerialDevice. Only SafeGPSNmeaDataProcessor is sufficient Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-08-10 14:41:46 UTC (rev 398) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-08-10 14:54:01 UTC (rev 399) @@ -37,6 +37,7 @@ import org.dinopolis.gpstool.gpsinput.GPSPosition; import org.dinopolis.gpstool.gpsinput.GPSSerialDevice; import org.dinopolis.gpstool.gpsinput.SafeGPSSerialDevice; +import org.dinopolis.gpstool.gpsinput.nmea.GPSNmeaDataProcessor; import org.dinopolis.gpstool.gpsinput.nmea.SafeGPSNmeaDataProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,7 +93,7 @@ gpsDataProcessor = new SafeGPSNmeaDataProcessor(); - gpsDevice = new SafeGPSSerialDevice(); + gpsDevice = new GPSSerialDevice(); Hashtable<String, Object> options = new Hashtable<String, Object>(); options.put(GPSSerialDevice.PORT_NAME_KEY, getConfig().getDevice());

1 0

r398 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio
by fdesbois＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: fdesbois Date: 2012-08-10 16:41:46 +0200 (Fri, 10 Aug 2012) New Revision: 398 Url: http://forge.codelutin.com/repositories/revision/sammoa/398 Log: Resolve ConcurrentModificationException. Once open, device is READY, it's not necessary to update all the time the state in lineReader when not recording yet Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderDefault.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderDefault.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderDefault.java 2012-08-10 13:55:54 UTC (rev 397) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioRecorderDefault.java 2012-08-10 14:41:46 UTC (rev 398) @@ -349,9 +349,6 @@ recorder.write(buffer, 0, numBytesRead); } } - - } else { - setState(DeviceState.READY, null); } }

1 0

r397 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 15:55:54 +0200 (Fri, 10 Aug 2012) New Revision: 397 Url: http://forge.codelutin.com/repositories/revision/sammoa/397 Log: revert commit (not a good idea to not have millisecond on geo points) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-10 13:54:11 UTC (rev 396) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-10 13:55:54 UTC (rev 397) @@ -801,8 +801,6 @@ if (geoPoint == null) { result = new Date(); - // always remove milli-seconds - result = DateUtils.setMilliseconds(result, 0); if (logger.isWarnEnabled()) { logger.warn("No GPS point at {}", result); } @@ -817,9 +815,6 @@ result = geoPoint.getRecordTime(); - // always remove milli-seconds - geoPoint.setRecordTime(result = DateUtils.setMilliseconds(result, 0)); - GeoPointDAO dao = SammoaDAOHelper.getGeoPointDAO(transaction); geoPoint.setFlight(flight);

1 0

r396 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-ui-swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations sammoa-ui-swing/src/main/resources sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 15:54:11 +0200 (Fri, 10 Aug 2012) New Revision: 396 Url: http://forge.codelutin.com/repositories/revision/sammoa/396 Log: fixes #1399: Validation des esp?\195?\168ces dans le tableau des observations Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-warning-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties trunk/sammoa-ui-swing/src/main/resources/validators.xml Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-10 12:56:49 UTC (rev 395) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-10 13:54:11 UTC (rev 396) @@ -57,6 +57,7 @@ import org.slf4j.LoggerFactory; import java.io.Reader; +import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -361,6 +362,24 @@ } } + public Collection<Species> getAllValidSpecies() { + TopiaContext transaction = persistence.beginTransaction(); + try { + + SpeciesDAO dao = SammoaDAOHelper.getSpeciesDAO(transaction); + + Collection<Species> result = + dao.findAllByLocalCreation(false); + return result; + + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + + } finally { + persistence.endTransaction(transaction); + } + } + public int importTransects(String campaignId, Iterable<Transect> transects) { int result = 0; Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-08-10 12:56:49 UTC (rev 395) +++ trunk/sammoa-ui-swing/pom.xml 2012-08-10 13:54:11 UTC (rev 396) @@ -146,7 +146,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <scope>runtime</scope> + <scope>compile</scope> </dependency>  Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java (rev 0) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 2012-08-10 13:54:11 UTC (rev 396) @@ -0,0 +1,36 @@ +package fr.ulr.sammoa.ui.swing.observations; + +import fr.ulr.sammoa.application.SammoaContext; +import fr.ulr.sammoa.persistence.Species; +import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator; +import org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator; + +import com.opensymphony.xwork2.validator.ValidationException; +import java.util.Collection; + +/** + * To validate that a given species use a known {@link Species#getCode()}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.5 + */ +public class SpeciesCodeValidator extends CollectionFieldExpressionValidator { + + protected Collection<Species> species; + + @Override + protected Collection<?> getCollection(Object object) throws ValidationException { + if (species==null) { + SammoaContext appContext = SammoaUIContext.getUIContext().getAppContext(); + species = appContext.getReferentialService().getAllValidSpecies(); + } + return species; + } + + @Override + public String getValidatorType() { + return "speciesCode"; + } + +} Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-warning-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-warning-validation.xml 2012-08-10 12:56:49 UTC (rev 395) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-warning-validation.xml 2012-08-10 13:54:11 UTC (rev 396) @@ -44,6 +44,15 @@ <message>sammoa.validator.observation.species.required</message> </field-validator> + <field-validator type="speciesCode" short-circuit="true"> + <param name="keys">code</param> + <param name="mode">AT_LEAST_ONE</param> + <param name="useSensitiveContext">true</param> + <param name="expression"> + <![CDATA[ species.code == current.code ]]></param> + <message>sammoa.validator.observation.unknown.species##${code}</message> + </field-validator> + </field> <field name="decAngle"> Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-10 12:56:49 UTC (rev 395) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-10 13:54:11 UTC (rev 396) @@ -236,6 +236,7 @@ sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s sammoa.validator.observation.species.required=The species is mandatory sammoa.validator.observation.swimDir.invalidRange=The swim direction must be between %1$s and %2$s degrees +sammoa.validator.observation.unknown.species=The species with code %s does not exist in referential sammoa.validator.region.code.required=The region code must be defined sammoa.validator.region.uniqueKey=The region code '%1$s' already exists sammoa.validator.route.cloudCover.invalidRange=The cloud cover must be between %1$s and %2$s (octa system \: 8 for covered, 0 for cleared) Modified: trunk/sammoa-ui-swing/src/main/resources/validators.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/validators.xml 2012-08-10 12:56:49 UTC (rev 395) +++ trunk/sammoa-ui-swing/src/main/resources/validators.xml 2012-08-10 13:54:11 UTC (rev 396) @@ -41,6 +41,7 @@ <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> + <validator name="speciesCode" class="fr.ulr.sammoa.ui.swing.observations.SpeciesCodeValidator"/> <validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/> <!--<validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>

1 0

r395 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/map sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 14:56:49 +0200 (Fri, 10 Aug 2012) New Revision: 395 Url: http://forge.codelutin.com/repositories/revision/sammoa/395 Log: refs #1203: Export SHP (fix Observations export) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java 2012-08-10 12:28:10 UTC (rev 394) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/ExportMapService.java 2012-08-10 12:56:49 UTC (rev 395) @@ -202,6 +202,7 @@ // to keep current effort group identifier String effortGroup = null; + Route previousRoute = null; for (Route route : routes) { if (logger.isTraceEnabled()) { @@ -229,7 +230,7 @@ // add route data fillRouteRecord(flight, - route, + previousRoute, effortGroup, LegStatus.END, record); @@ -277,7 +278,11 @@ } // add route data - fillRouteRecord(flight, route, effortGroup, legStatus, record); + fillRouteRecord(flight, + route, + effortGroup, + legStatus, + record); // add geoPoint data and flush @@ -286,6 +291,9 @@ builder, graphicList); } + + // keep current route as previousroute + previousRoute = route; } } @@ -445,8 +453,10 @@ // use flight end date routeEndTime = flight.getEndDate(); } - Preconditions.checkState(routeEndTime.after(beginTime), - String.format("Route debut de route %s - fin de route %s", beginTime, routeEndTime)); + if (routeEndTime != null) { + Preconditions.checkState(routeEndTime.after(beginTime), + String.format("Route debut de route %s - fin de route %s", beginTime, routeEndTime)); + } PeriodDates routePeriod = new PeriodDates(beginTime, routeEndTime); @@ -518,8 +528,8 @@ record.put("CALVES", observation.getCalves()); record.put("PHOTO", observation.isPhoto()); record.put("OBSERVER", observation.getObserverPosition().getObserver().getInitials()); - record.put("SIDE", observation.getObserverPosition().getPosition().getName()); - record.put("STATUS", observation.getObservationStatus().getName()); + record.put("SIDE", observation.getObserverPosition().getPosition()); + record.put("STATUS", observation.getObservationStatus()); record.put("COMMENT", observation.getComment()); GeoPoint geoPoint = geoPointIterator.next(); @@ -693,15 +703,19 @@ fillRouteTypeRecord(flight, route, effortGroup, record); if (legStatus != null) { - record.put("STATUS", LegStatus.END); + record.put("STATUS", legStatus); } record.put("COMMENT", route.getComment()); record.put("SEA_STATE", route.getSeaState()); record.put("SWELL", route.getSwell()); record.put("TURBIDITY", route.getTurbidity()); record.put("SKY_GLINT", route.getSkyGlint()); - record.put("GLARE_FROM", route.getGlareFrom()); - record.put("GLARE_TO", route.getGlareTo()); + if (route.getGlareFrom() != null) { + record.put("GLARE_FROM", String.valueOf(route.getGlareFrom())); + } + if (route.getGlareTo() != null) { + record.put("GLARE_TO", String.valueOf(route.getGlareTo())); + } record.put("GLARE_SEVERITY", route.getGlareSeverity()); record.put("GLARE_UNDER", route.isGlareUnder()); record.put("CLOUD_COVER", route.getCloudCover()); @@ -731,7 +745,7 @@ String effortGroup, Map<String, Object> record) { - record.put("ROUTE_TYPE", route.getRouteType().getName()); + record.put("ROUTE_TYPE", route.getRouteType()); if (Routes.isRouteLeg(route)) { fillLegRouteRecord(route, effortGroup, record); } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-08-10 12:28:10 UTC (rev 394) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-08-10 12:56:49 UTC (rev 395) @@ -97,13 +97,26 @@ List<Observation> result = Lists.newArrayList(); Iterator<Observation> itr = observations.iterator(); - while (itr.hasNext()) { - Observation observation = itr.next(); - Date observationTime = observation.getObservationTime(); - if (periodDate.between(observationTime)) { - itr.remove(); - result.add(observation); + if (periodDate.getThruDate() == null) { + Date fromDate = periodDate.getFromDate(); + // no up bound + while (itr.hasNext()) { + Observation observation = itr.next(); + Date observationTime = observation.getObservationTime(); + if (fromDate.before(observationTime)) { + itr.remove(); + result.add(observation); + } } + } else { + while (itr.hasNext()) { + Observation observation = itr.next(); + Date observationTime = observation.getObservationTime(); + if (periodDate.between(observationTime)) { + itr.remove(); + result.add(observation); + } + } } return result; }

1 0

r394 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 14:28:10 +0200 (Fri, 10 Aug 2012) New Revision: 394 Url: http://forge.codelutin.com/repositories/revision/sammoa/394 Log: improve dbf table model (more check on cleanValue) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java 2012-08-10 12:26:41 UTC (rev 393) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/DbfTableModelBuilder.java 2012-08-10 12:28:10 UTC (rev 394) @@ -5,6 +5,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -19,6 +21,10 @@ */ public class DbfTableModelBuilder { + /** Logger. */ + private static final Logger logger = + LoggerFactory.getLogger(DbfTableModelBuilder.class); + public static final int DEFAULT_STRING_LENGTH = 64; public static final int DEFAULT_INTEGER_LENGTH = 8; @@ -88,7 +94,7 @@ } public DbfTableModelBuilder booleanColumn(String name) { - return dbfColumn(newBooleanColumn( name )); + return dbfColumn(newBooleanColumn(name)); } public DbfTableModelBuilder integerColumn(String name) { @@ -119,13 +125,13 @@ model.setDecimalCount(i, (byte) columnModel.getDecimalCount()); } columnMap = Maps.uniqueIndex(columns, - new Function<DbfColumnModel, String>() { + new Function<DbfColumnModel, String>() { - @Override - public String apply(DbfColumnModel input) { - return input.getName(); - } - }); + @Override + public String apply(DbfColumnModel input) { + return input.getName(); + } + }); return this; } @@ -163,8 +169,7 @@ if (value instanceof Integer) { result = Double.valueOf(String.valueOf(value)); } - } - else if (DbfTableModel.TYPE_TIMESTAMP == type) { + } else if (DbfTableModel.TYPE_TIMESTAMP == type) { // FIX for Date : no format is done if (value instanceof Date) { @@ -172,8 +177,7 @@ result = DbfTimestampConverter.toString(date); } - } - else if (DbfTableModel.TYPE_DATE == type) { + } else if (DbfTableModel.TYPE_DATE == type) { // FIX for Date : no format is done if (value instanceof Date) { @@ -181,9 +185,21 @@ result = DATE_FORMAT.format(date); } - }else if (DbfTableModel.TYPE_LOGICAL == type) { - result = ( (Boolean) value ) ? "T" : "F"; + } else if (DbfTableModel.TYPE_LOGICAL == type) { + result = ((Boolean) value) ? "T" : "F"; + } else if (value instanceof Enum) { + result = ((Enum) value).name(); + } else if (value instanceof Character) { + result = String.valueOf(value); } + + if (result != null && + !(result instanceof String) && + !(result instanceof Double)) { + if (logger.isWarnEnabled()) { + logger.warn("Incompatible data value {} (type {})", result, type); + } + } return result; }

1 0

r393 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 14:26:41 +0200 (Fri, 10 Aug 2012) New Revision: 393 Url: http://forge.codelutin.com/repositories/revision/sammoa/393 Log: remove generated enumeration if not needed Removed: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationStatus.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationStatus.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationStatus.java 2012-08-10 12:26:18 UTC (rev 392) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationStatus.java 2012-08-10 12:26:41 UTC (rev 393) @@ -1,13 +0,0 @@ -package fr.ulr.sammoa.persistence; - - -public enum ObservationStatus { - RECAPTURE, - NEW, - NO_RECAPTURE, - CIRCLE_BACK; - - public String getName() { - return name(); - } -} //ObservationStatus Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java 2012-08-10 12:26:18 UTC (rev 392) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java 2012-08-10 12:26:41 UTC (rev 393) @@ -1,14 +0,0 @@ -package fr.ulr.sammoa.persistence; - -public enum Position { - NAVIGATOR, - FRONT_LEFT, - FRONT_RIGHT, - BACK_LEFT, - BACK_RIGHT, - CO_NAVIGATOR; - - public String getName() { - return name(); - } -} //Position

1 0

r392 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 14:26:18 +0200 (Fri, 10 Aug 2012) New Revision: 392 Url: http://forge.codelutin.com/repositories/revision/sammoa/392 Log: Action in Swing are serializables (add serialVersionUID) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CloseAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -39,6 +39,8 @@ */ public class AddAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public AddAction(SammoaUIContext context) { super(Resource.getIcon("/icons/action-add.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -40,6 +40,8 @@ */ public class BeginAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public BeginAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -37,6 +37,8 @@ */ public class CenterObservationAction extends ObservationAction { + private static final long serialVersionUID = 1L; + public CenterObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.center"), context, Position.NAVIGATOR); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.center.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -43,6 +43,8 @@ */ public class CircleBackAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public static final String CLIENT_PROPERTY_OBSERVATION = "observation"; protected static final ImageIcon CIRCLE_BACK_ICON = Resource.getIcon("/icons/undo.png"); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CloseAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CloseAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CloseAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: UI Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -39,6 +39,8 @@ */ public class EndAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public EndAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -37,6 +37,8 @@ */ public class LeftObservationAction extends ObservationAction { + private static final long serialVersionUID = 1L; + public LeftObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.left.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -39,6 +39,8 @@ */ public class NextAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public NextAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_next.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -38,7 +38,9 @@ * @author fdesbois <desbois(a)codelutin.com> */ public class NextTransectAction extends SammoaAction { - + + private static final long serialVersionUID = 1L; + public static final String CLIENT_PROPERTY_INDEX = "index"; public NextTransectAction(SammoaUIContext context) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -36,6 +36,8 @@ */ public abstract class ObservationAction extends SammoaAction { + private static final long serialVersionUID = 1L; + protected Position position; public ObservationAction(String name, SammoaUIContext context, Position position) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -37,6 +37,8 @@ */ public class RightObservationAction extends ObservationAction { + private static final long serialVersionUID = 1L; + public RightObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.right.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -42,6 +42,8 @@ */ public abstract class SammoaAction extends AbstractAction implements PropertyChangeListener { + private static final long serialVersionUID = 1L; + protected SammoaUIContext context; public SammoaAction(Icon icon, SammoaUIContext context) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -39,6 +39,8 @@ */ public class StartAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public StartAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-10 12:25:54 UTC (rev 391) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-10 12:26:18 UTC (rev 392) @@ -39,6 +39,8 @@ */ public class StopAction extends SammoaAction { + private static final long serialVersionUID = 1L; + public StopAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip"));

1 0

r391 - trunk/sammoa-persistence/src/main/xmi
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 14:25:54 +0200 (Fri, 10 Aug 2012) New Revision: 391 Url: http://forge.codelutin.com/repositories/revision/sammoa/391 Log: add lazy on Route#circleBackCause property Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2012-08-10 11:56:16 UTC (rev 390) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2012-08-10 12:25:54 UTC (rev 391) @@ -117,6 +117,7 @@ # transectFlight is not a collection (EAGER load) fr.ulr.sammoa.persistence.Route.attribute.transectFlight.tagvalue.lazy=false +fr.ulr.sammoa.persistence.Route.attribute.circleBackCause.tagvalue.lazy=false # observerPositions is a collection but always used fr.ulr.sammoa.persistence.Route.attribute.observerPosition.tagvalue.lazy=false

1 0