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

r720 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/resources/i18n
by sbavencoff＠users.forge.codelutin.com 27 Jun '14

27 Jun '14

Author: sbavencoff Date: 2014-06-27 10:24:41 +0200 (Fri, 27 Jun 2014) New Revision: 720 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/720 Log: fixes #5346 : Enregistrement des positions GPS Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-06-27 08:24:41 UTC (rev 720) @@ -84,10 +84,10 @@ this.state = DeviceState.UNAVAILABLE; this.deviceStateListeners = Sets.newHashSet(); this.gpsLocationListeners = Sets.newHashSet(); - this.maxLastEventDelays = config.getTimeout() * 1000; + this.maxLastEventDelays = config.getTimeout(); if (logger.isDebugEnabled()) { - logger.debug("GPS maxLastEventDelays = " + maxLastEventDelays); + logger.debug("GPS maxLastEventDelays = " + maxLastEventDelays + " second"); } } @@ -169,9 +169,11 @@ @Override public GeoPoint getCurrentLocation() { + Date currentDate = getDate(); + GeoPoint lastLocation = getLastLocation(); - Date currentDate = getDate(); + long lastEventDelaysMS = System.currentTimeMillis() - lastEventTime; GeoPoint result = new GeoPointImpl(lastLocation.getLatitude(), lastLocation.getLongitude()); result.setAltitude(lastLocation.getAltitude()); @@ -183,8 +185,21 @@ .toInterval(lastLocation.getRecordTime(), currentDate) .toDuration() .getStandardSeconds(); - result.setCaptureDelay((int) captureDelay); + if (captureDelay > maxLastEventDelays || lastEventDelaysMS > maxLastEventDelays * 1000) { + + result.setLatitude(GeoPoints.EMPTY_COORDINATE); + result.setLongitude(GeoPoints.EMPTY_COORDINATE); + result.setAltitude(0); + result.setSpeed(0); + result.setCaptureDelay(0); + + } else { + + result.setCaptureDelay((int) captureDelay); + + } + if (logger.isTraceEnabled()) { logger.trace("CaptureDelay = {} for GeoPoint {}", captureDelay, result); } @@ -255,14 +270,14 @@ boolean sameLocation = GeoPoints.equal(location, lastLocation); - long lastEventDelays = System.currentTimeMillis() - lastEventTime; + long lastEventDelaysMS = System.currentTimeMillis() - lastEventTime; if (logger.isTraceEnabled()) { logger.trace("sameLocation = {} [{} :: {}], lastEventDelays= {} ms", - new Object[]{sameLocation, location, lastLocation, lastEventDelays}); + new Object[]{sameLocation, location, lastLocation, lastEventDelaysMS}); } - boolean offLine = lastEventDelays > maxLastEventDelays; + boolean offLine = lastEventDelaysMS > maxLastEventDelays * 1000; // Data is unavailable if (GeoPoints.isCoordinatesEmpty(location) || offLine) { Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-06-27 08:24:41 UTC (rev 720) @@ -35,4 +35,17 @@ </field> + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ + !(latitude == @fr.ulr.sammoa.persistence.GeoPoints@EMPTY_COORDINATE + && longitude == @fr.ulr.sammoa.persistence.GeoPoints@EMPTY_COORDINATE) + ]]> + </param> + <message>sammoa.validator.observation.position.unknown</message> + </field-validator> + + </field> + </validators> 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 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-06-27 08:24:41 UTC (rev 720) @@ -308,6 +308,7 @@ sammoa.validator.observation.podSize.geoPointOlder=The previous geopoint should not be older than five seconds sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s sammoa.validator.observation.position.outOfDate=capture delay is out of date +sammoa.validator.observation.position.unknown=Gps position is unknow 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

1 0

[ANN] - SAMMOA 1.0.4-RC4 released
by codelutin.com Release Notification 23 Jun '14

23 Jun '14

The SAMMOA team is pleased to announce the sammoa-1.0.4-RC4 release! SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. Documentation of the project can be found here: http://forge.codelutin.com/projects/sammoa Changes ------- Changes in this version include: New features: o connection GPS / Ordinateur de terrain Issue: 4761. Thanks to Ghislain Doremus. Resolved by sbavencoff. Fixed Bugs: o validation des espèces Issue: 5289. Thanks to Sylvain Bavencoff. Resolved by sbavencoff. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/sammoa/files * sammoa-ui-swing-1.0.4-RC4-bin.zip - http://forge.codelutin.com/attachments/download/1965 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r719 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: maven-release Date: 2014-06-23 17:35:52 +0200 (Mon, 23 Jun 2014) New Revision: 719 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/719 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-application/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r718 - tags
by maven-release＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: maven-release Date: 2014-06-23 17:35:47 +0200 (Mon, 23 Jun 2014) New Revision: 718 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/718 Log: [maven-release-plugin] copy for tag sammoa-1.0.4-RC4 Added: tags/sammoa-1.0.4-RC4/

1 0

r717 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: maven-release Date: 2014-06-23 17:35:41 +0200 (Mon, 23 Jun 2014) New Revision: 717 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/717 Log: [maven-release-plugin] prepare release sammoa-1.0.4-RC4 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/trunk</url> + <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-application/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r716 - trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: sbavencoff Date: 2014-06-20 11:25:08 +0200 (Fri, 20 Jun 2014) New Revision: 716 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/716 Log: fixes #5289 : validation des esp?\195?\168ces Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml 2014-06-20 08:50:13 UTC (rev 715) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml 2014-06-20 09:25:08 UTC (rev 716) @@ -44,12 +44,9 @@ <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> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ species.code == current.code ]]></param> + <![CDATA[ ! species.localCreation ]]></param> <message>sammoa.validator.observation.unknown.species##${species.code}</message> </field-validator>

1 0

r715 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort sammoa-ui-swing/src/main/resources sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: sbavencoff Date: 2014-06-20 10:50:13 +0200 (Fri, 20 Jun 2014) New Revision: 715 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/715 Log: fixes #5289 : validation des esp?\195?\168ces Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/SpeciesCodeValidator.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 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 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-06-20 08:50:13 UTC (rev 715) @@ -162,6 +162,26 @@ } } + public Species getSpecies(String code , Region region) { + SammoaTopiaPersistenceContext transaction = beginTransaction(); + + Species species = null; + + try { + SpeciesTopiaDao dao = transaction.getSpeciesDao(); + + if (dao.existByNaturalId(code, region)) { + species = dao.findByNaturalId(code, region); + } + + } finally { + endTransaction(transaction); + } + + return species; + + } + //------------------------------------------------------------------------// //-- Campaign methods ----------------------------------------------------// //------------------------------------------------------------------------// Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-06-20 08:50:13 UTC (rev 715) @@ -70,7 +70,7 @@ constructorParams='flightUIModel'/--> <ObservationTableModel id='observationTableModel' - constructorParams='model'/> + constructorParams='model, handler'/>  Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-06-20 08:50:13 UTC (rev 715) @@ -31,6 +31,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import fr.ulr.sammoa.application.FlightService; +import fr.ulr.sammoa.application.ReferentialService; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener; @@ -45,8 +46,11 @@ import fr.ulr.sammoa.persistence.Observer; import fr.ulr.sammoa.persistence.ObserverPosition; import fr.ulr.sammoa.persistence.Position; +import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.Routes; +import fr.ulr.sammoa.persistence.Species; +import fr.ulr.sammoa.persistence.SpeciesImpl; import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.ui.swing.SammoaColors; import fr.ulr.sammoa.ui.swing.SammoaUIContext; @@ -92,12 +96,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; +import javax.swing.Action; +import javax.swing.DefaultCellEditor; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.ListCellRenderer; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -138,9 +149,13 @@ private final EffortPanel ui; + protected ReferentialService referentialService; + public EffortPanelHandler(EffortPanel ui) { this.ui = ui; context = ui.getContextValue(SammoaUIContext.class); + + this.referentialService = context.getService(ReferentialService.class); } public FlightUI getParentUI() { @@ -664,6 +679,15 @@ } } + public Species getSpecies(String code, Region region) { + Species species = referentialService.getSpecies(code, region); + if (species == null) { + species = new SpeciesImpl(code, region); + species.setLocalCreation(true); + } + return species; + } + public void initGeoPointTable() { JXTable table = ui.getGeoPointTable(); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java 2014-06-20 08:50:13 UTC (rev 715) @@ -32,7 +32,6 @@ import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.Species; -import fr.ulr.sammoa.persistence.SpeciesImpl; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; @@ -49,8 +48,11 @@ protected FlightUIModel flightUIModel; - public ObservationTableModel(FlightUIModel flightUIModel) { + protected EffortPanelHandler effortPanelHandler; + + public ObservationTableModel(FlightUIModel flightUIModel, EffortPanelHandler effortPanelHandler) { this.flightUIModel = flightUIModel; + this.effortPanelHandler = effortPanelHandler; } @Override @@ -95,10 +97,7 @@ public void setValueAt(Object aValue, int row, int column) { Observation observation = getBean(row); ObservationColumn observationColumn = ObservationColumn.valueOf(column); - Flight flight = observation.getFlight(); - Campaign campaign = flight.getCampaign(); - Region region = campaign.getRegion(); - observationColumn.setValue(observation, aValue, region); + observationColumn.setValue(observation, aValue, effortPanelHandler); fireTableRowsUpdated(row, row); } @@ -144,7 +143,7 @@ POD_SIZE(true, int.class, Observation.PROPERTY_POD_SIZE), SPECIES(true, String.class, Observation.PROPERTY_SPECIES, Species.PROPERTY_CODE) { @Override - public void setValue(Observation bean, Object value, Region region) { + public void setValue(Observation bean, Object value, EffortPanelHandler effortPanelHandler) { String newValue = (String) value; if (!Strings.isNullOrEmpty(newValue)) { @@ -156,8 +155,11 @@ // Always use a new instance for different value to // fire change on Observation and not on Species - Species species = new SpeciesImpl((String) value, region); - bean.setSpecies(species); + Flight flight = bean.getFlight(); + Campaign campaign = flight.getCampaign(); + Region region = campaign.getRegion(); + + bean.setSpecies(effortPanelHandler.getSpecies((String) value, region)); } } else { @@ -170,7 +172,7 @@ CUE(true, String.class, Observation.PROPERTY_CUE), BEHAVIOUR(true, String.class, Observation.PROPERTY_BEHAVIOUR) { @Override - public void setValue(Observation bean, Object value, Region region) { + public void setValue(Observation bean, Object value, EffortPanelHandler effortPanelHandler) { String newValue = (String) value; if (Strings.isNullOrEmpty(newValue)) { newValue = null; @@ -191,7 +193,7 @@ } @Override - public void setValue(Observation bean, Object value, Region region) { + public void setValue(Observation bean, Object value, EffortPanelHandler effortPanelHandler) { } }; @@ -229,7 +231,7 @@ return result; } - public void setValue(Observation bean, Object value, Region region) { + public void setValue(Observation bean, Object value, EffortPanelHandler effortPanelHandler) { if (type.isPrimitive() && value == null) { // can not set a null value to a primitive field } else { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/SpeciesCodeValidator.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/SpeciesCodeValidator.java 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/SpeciesCodeValidator.java 2014-06-20 08:50:13 UTC (rev 715) @@ -37,6 +37,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 0.5 + * @deprecated since 1.0.3 not use */ public class SpeciesCodeValidator extends CollectionFieldExpressionValidator { Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-06-20 08:50:13 UTC (rev 715) @@ -54,7 +54,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ !species.localCreation ]]></param> + <![CDATA[ ! species.localCreation ]]></param> <message>sammoa.validator.observation.unknown.species##${species.code}</message> </field-validator> Modified: trunk/sammoa-ui-swing/src/main/resources/validators.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/validators.xml 2014-06-13 07:38:26 UTC (rev 714) +++ trunk/sammoa-ui-swing/src/main/resources/validators.xml 2014-06-20 08:50:13 UTC (rev 715) @@ -41,7 +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.flight.effort.SpeciesCodeValidator"/> +  <validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/> <!--<validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>

1 0

[ANN] - SAMMOA 1.0.4-RC3 released
by codelutin.com Release Notification 13 Jun '14

13 Jun '14

The SAMMOA team is pleased to announce the sammoa-1.0.4-RC3 release! SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. Documentation of the project can be found here: http://forge.codelutin.com/projects/sammoa Changes ------- Changes in this version include: Fixed Bugs: o Erreur à l'import des espèces Issue: 5209. Thanks to Sylvain Bavencoff. Resolved by sbavencoff. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/sammoa/files * sammoa-ui-swing-1.0.4-RC3-bin.zip - http://forge.codelutin.com/attachments/download/1927 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r714 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 13 Jun '14

13 Jun '14

Author: maven-release Date: 2014-06-13 09:38:26 +0200 (Fri, 13 Jun 2014) New Revision: 714 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/714 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-13 07:38:21 UTC (rev 713) +++ trunk/pom.xml 2014-06-13 07:38:26 UTC (rev 714) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC3</version> + <version>1.0.4-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC3</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC3 + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC3 + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-13 07:38:21 UTC (rev 713) +++ trunk/sammoa-application/pom.xml 2014-06-13 07:38:26 UTC (rev 714) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC3</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-13 07:38:21 UTC (rev 713) +++ trunk/sammoa-persistence/pom.xml 2014-06-13 07:38:26 UTC (rev 714) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC3</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-13 07:38:21 UTC (rev 713) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-13 07:38:26 UTC (rev 714) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC3</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r713 - tags
by maven-release＠users.forge.codelutin.com 13 Jun '14

13 Jun '14

Author: maven-release Date: 2014-06-13 09:38:21 +0200 (Fri, 13 Jun 2014) New Revision: 713 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/713 Log: [maven-release-plugin] copy for tag sammoa-1.0.4-RC3 Added: tags/sammoa-1.0.4-RC3/

1 0