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

r405 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by fdesbois＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: fdesbois Date: 2012-08-10 18:42:27 +0200 (Fri, 10 Aug 2012) New Revision: 405 Url: http://forge.codelutin.com/repositories/revision/sammoa/405 Log: Resolve issue with invalid coordinates geoPoints to display on Map Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.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 16:06:49 UTC (rev 404) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-08-10 16:42:27 UTC (rev 405) @@ -31,13 +31,7 @@ import fr.ulr.sammoa.persistence.GeoPointImpl; import fr.ulr.sammoa.persistence.GeoPoints; import gnu.io.CommPortIdentifier; -import org.dinopolis.gpstool.gpsinput.GPSDataProcessor; -import org.dinopolis.gpstool.gpsinput.GPSDevice; -import org.dinopolis.gpstool.gpsinput.GPSException; -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.*; import org.dinopolis.gpstool.gpsinput.nmea.SafeGPSNmeaDataProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -236,16 +230,16 @@ protected void logAvailablePorts(String method) { - if (logger.isInfoEnabled()) { + if (logger.isDebugEnabled()) { - logger.info("GPS configuration port {} [{}]", config.getDevice(), method); + logger.debug("GPS configuration port {} [{}]", config.getDevice(), method); Enumeration portList = CommPortIdentifier.getPortIdentifiers(); while (portList.hasMoreElements()) { CommPortIdentifier portId = (CommPortIdentifier) portList.nextElement(); if (portId.getPortType() == CommPortIdentifier.PORT_SERIAL) { - logger.info("## Available SERIAL port : {}", portId.getName()); + logger.debug("## Available SERIAL port : {}", portId.getName()); } } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-08-10 16:06:49 UTC (rev 404) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-08-10 16:42:27 UTC (rev 405) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -25,6 +25,8 @@ import com.google.common.base.Function; import com.google.common.base.Objects; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; @@ -59,11 +61,22 @@ return result; } + public static List<GeoPoint> retainsValidCoordinates(Iterable<GeoPoint> input) { + List<GeoPoint> result = FluentIterable.from(input) + .filter(Predicates.not(withCoordinatesEmpty())) + .toImmutableList(); + return result; + } + public static boolean isCoordinatesEmpty(GeoPoint geoPoint) { return geoPoint.getLatitude() == GeoPoints.EMPTY_COORDINATE && geoPoint.getLongitude() == GeoPoints.EMPTY_COORDINATE; } + public static Predicate<GeoPoint> withCoordinatesEmpty() { + return IS_COORDINATES_EMPTY_PREDICATE; + } + public static Function<GeoPoint, Date> toDate() { return TO_DATE_FUNCTION; } @@ -142,4 +155,12 @@ } }; + protected static Predicate<GeoPoint> IS_COORDINATES_EMPTY_PREDICATE = new Predicate<GeoPoint>() { + + @Override + public boolean apply(GeoPoint input) { + return isCoordinatesEmpty(input); + } + }; + } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-10 16:06:49 UTC (rev 404) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-10 16:42:27 UTC (rev 405) @@ -24,11 +24,7 @@ */ package fr.ulr.sammoa.ui.swing.flight; -import com.bbn.openmap.InformationDelegator; -import com.bbn.openmap.LayerHandler; -import com.bbn.openmap.MapBean; -import com.bbn.openmap.MapHandler; -import com.bbn.openmap.MouseDelegator; +import com.bbn.openmap.*; import com.bbn.openmap.event.OMMouseMode; import com.bbn.openmap.gui.EmbeddedNavPanel; import com.bbn.openmap.gui.EmbeddedScaleDisplayPanel; @@ -43,11 +39,7 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Ordering; +import com.google.common.collect.*; import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.ReferentialService; import fr.ulr.sammoa.application.SammoaConfig; @@ -58,38 +50,13 @@ import fr.ulr.sammoa.application.device.DeviceTechnicalException; import fr.ulr.sammoa.application.device.gps.GpsLocationEvent; import fr.ulr.sammoa.application.device.gps.GpsLocationListener; -import fr.ulr.sammoa.application.flightController.FlightController; -import fr.ulr.sammoa.application.flightController.FlightControllerDefault; -import fr.ulr.sammoa.application.flightController.FlightControllerListener; -import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.application.flightController.ObservationEvent; -import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.Flight; -import fr.ulr.sammoa.persistence.GeoPoint; -import fr.ulr.sammoa.persistence.GeoPoints; -import fr.ulr.sammoa.persistence.Observation; -import fr.ulr.sammoa.persistence.Observations; -import fr.ulr.sammoa.persistence.Observer; -import fr.ulr.sammoa.persistence.Route; -import fr.ulr.sammoa.persistence.Strate; -import fr.ulr.sammoa.persistence.Transect; -import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.persistence.TransectFlights; +import fr.ulr.sammoa.application.flightController.*; +import fr.ulr.sammoa.persistence.*; import fr.ulr.sammoa.ui.swing.SammoaColors; import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; -import fr.ulr.sammoa.ui.swing.action.AddAction; -import fr.ulr.sammoa.ui.swing.action.BeginAction; -import fr.ulr.sammoa.ui.swing.action.CenterObservationAction; -import fr.ulr.sammoa.ui.swing.action.CircleBackAction; -import fr.ulr.sammoa.ui.swing.action.EndAction; -import fr.ulr.sammoa.ui.swing.action.LeftObservationAction; -import fr.ulr.sammoa.ui.swing.action.NextAction; -import fr.ulr.sammoa.ui.swing.action.NextTransectAction; -import fr.ulr.sammoa.ui.swing.action.RightObservationAction; -import fr.ulr.sammoa.ui.swing.action.StartAction; -import fr.ulr.sammoa.ui.swing.action.StopAction; +import fr.ulr.sammoa.ui.swing.action.*; import fr.ulr.sammoa.ui.swing.flight.layer.BaseGeoPointLayer; import fr.ulr.sammoa.ui.swing.flight.layer.LineGeoPointLayer; import fr.ulr.sammoa.ui.swing.flight.layer.SimpleGeoPointLayer; @@ -209,7 +176,8 @@ List<Observer> observers = getFlightService().getFlightObserverForPositions(flight); List<Observation> observations = getFlightService().getObservations(flight); List<Route> routes = getFlightService().getRoutes(flight); - List<GeoPoint> geoPoints = getFlightService().getFlightGeoPoints(flight); + List<GeoPoint> geoPoints = + GeoPoints.retainsValidCoordinates(getFlightService().getFlightGeoPoints(flight)); if (logger.isTraceEnabled()) { for (GeoPoint geoPoint : geoPoints) { @@ -455,7 +423,7 @@ // Add the GeoPoint to the layer GeoPoint geoPoint = event.getGeoPoint(); - if (geoPoint != null) { + if (!GeoPoints.isCoordinatesEmpty(geoPoint)) { observationLayer.addGeoPoint(geoPoint); } }

1 0

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

10 Aug '12

Author: tchemit Date: 2012-08-10 18:06:49 +0200 (Fri, 10 Aug 2012) New Revision: 404 Url: http://forge.codelutin.com/repositories/revision/sammoa/404 Log: when importing species, they become valid Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 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 16:00:49 UTC (rev 403) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-10 16:06:49 UTC (rev 404) @@ -168,13 +168,11 @@ Import<Species> importCsv = Import.newImport(model, reader); - Iterator<Species> it = importCsv.iterator(); - while (it.hasNext()) { + for (Species species : importCsv) { - Species species; + // while importing a species, it does become valid + species.setLocalCreation(false); - species = it.next(); - Species speciesExists = dao.findByNaturalId(species.getCode(), species.getRegion());

1 0

r403 - trunk
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 18:00:49 +0200 (Fri, 10 Aug 2012) New Revision: 403 Url: http://forge.codelutin.com/repositories/revision/sammoa/403 Log: use last mavenpom version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 15:59:11 UTC (rev 402) +++ trunk/pom.xml 2012-08-10 16:00:49 UTC (rev 403) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>fr.ulr</groupId>

1 0

r402 - trunk/sammoa-persistence
by tchemit＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: tchemit Date: 2012-08-10 17:59:11 +0200 (Fri, 10 Aug 2012) New Revision: 402 Url: http://forge.codelutin.com/repositories/revision/sammoa/402 Log: optimize dependencies Modified: trunk/sammoa-persistence/pom.xml Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-10 15:56:34 UTC (rev 401) +++ trunk/sammoa-persistence/pom.xml 2012-08-10 15:59:11 UTC (rev 402) @@ -32,6 +32,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>

1 0

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

10 Aug '12

Author: tchemit Date: 2012-08-10 17:56:34 +0200 (Fri, 10 Aug 2012) New Revision: 401 Url: http://forge.codelutin.com/repositories/revision/sammoa/401 Log: add missing svn properties and license header Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java 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/map/LegStatus.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java 2012-08-10 15:55:35 UTC (rev 400) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java 2012-08-10 15:56:34 UTC (rev 401) @@ -3,7 +3,7 @@ * #%L * SAMMOA :: Application * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/map/LegStatus.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: 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 2012-08-10 15:55:35 UTC (rev 400) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 2012-08-10 15:56:34 UTC (rev 401) @@ -1,4 +1,27 @@ package fr.ulr.sammoa.ui.swing.observations; +/* + * #%L + * SAMMOA :: UI Swing + * $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 fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.persistence.Species; Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

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