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

r595 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence sammoa-ui-swing sammoa-ui-swing/src/main sammoa-ui-swing/src/main/filtered-resources sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/resources/i18n
by fdesbois＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: fdesbois Date: 2012-09-25 15:51:43 +0200 (Tue, 25 Sep 2012) New Revision: 595 Url: http://forge.codelutin.com/repositories/revision/sammoa/595 Log: fixes #1383 : clean persistence open connection Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java trunk/sammoa-ui-swing/src/main/filtered-resources/ trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties Removed: trunk/sammoa-ui-swing/src/main/filters/ Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 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/SammoaContext.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java 2012-09-25 13:51:43 UTC (rev 595) @@ -28,6 +28,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import fr.ulr.sammoa.persistence.PersistenceException; import fr.ulr.sammoa.persistence.SammoaPersistence; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; @@ -57,10 +58,7 @@ protected final LoadingCache<Class<? extends SammoaService>, SammoaService> services; public SammoaContext(SammoaConfig config) { - this(config, new SammoaPersistence( - config.getApplicationConfig().getFlatOptions(), - config.getAutoCommitDelay()) - ); + this(config, new SammoaPersistence()); } public SammoaContext(SammoaConfig config, SammoaPersistence persistence) { @@ -110,7 +108,7 @@ service.close(); } - public void open() { + public void open() throws PersistenceException { persistence.open( config.getApplicationConfig().getFlatOptions(), config.getAutoCommitDelay() Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java 2012-09-25 13:51:43 UTC (rev 595) @@ -0,0 +1,55 @@ +package fr.ulr.sammoa.persistence; + +/* + * #%L + * SAMMOA :: Persistence + * $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.Throwables; + +/** + * Created: 25/09/12 + * + * @author fdesbois <florian.desbois(a)codelutin.com> + */ +public class PersistenceException extends Exception { + + protected String dbUrl; + + public PersistenceException(String message, String dbUrl, Throwable cause) { + super(message, cause); + this.dbUrl = dbUrl; + } + + public String getDbUrl() { + return dbUrl; + } + + public String getMessageWithCause() { + String result = getMessage(); + Throwable cause = Throwables.getRootCause(this); + if (cause != this) { + result += " : " + cause.getMessage(); + } + return result; + } +} Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-09-25 13:51:43 UTC (rev 595) @@ -28,7 +28,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; @@ -40,7 +39,7 @@ * Persistence context for SAMMOA. This class must be used for all transaction * management. An {@link AutoSaveListener} will be used to commit all entities * changed every {@code autoCommitDelay} defined in constructor - * {@link #SammoaPersistence(Properties, long)}. + * {@link #open(Properties, long)}. * <p/> * You will create a transaction with {@link #beginTransaction()} and on finally * block call {@link #endTransaction(TopiaContext)}. @@ -64,19 +63,6 @@ protected SammoaDbMeta dbMetas; /** - * Constructor of SammoaPersistence with {@code dbConfiguration} for - * {@link TopiaContextFactory#getContext(Properties)} and {@code autoCommitDelay} - * for {@link AutoSaveListener}. - * - * @param dbConfiguration Configuration for Topia - * @param autoCommitDelay Delay in milliseconds for auto commit period - * @see #open(Properties, long) - */ - public SammoaPersistence(Properties dbConfiguration, long autoCommitDelay) { - open(dbConfiguration, autoCommitDelay); - } - - /** * Open the Persistence with {@code dbConfiguration} for * {@link TopiaContextFactory#getContext(Properties)} and {@code autoCommitDelay} * for {@link AutoSaveListener}. You can't open an already opened context. @@ -84,8 +70,10 @@ * * @param dbConfiguration Configuration for Topia * @param autoCommitDelay Delay in milliseconds for auto commit period + * @throws PersistenceException if database connection can't be opened */ - public void open(Properties dbConfiguration, long autoCommitDelay) { + public void open(Properties dbConfiguration, long autoCommitDelay) + throws PersistenceException { Preconditions.checkState(rootContext == null); this.dbConfiguration = dbConfiguration; @@ -95,6 +83,26 @@ SammoaDAOHelper.getImplementationClassesAsString()); autoSaveListener = new AutoSaveListener(this, autoCommitDelay); + + // Retrieve the rootContext and try opening a transaction to check + // the connection + TopiaContext tx = null; + try { + rootContext = TopiaContextFactory.getContext(dbConfiguration); + tx = rootContext.beginTransaction(); + + } catch (TopiaException ex) { + throw new PersistenceException( + "Error opening database connection", + (String) dbConfiguration.get("hibernate.connection.url"), + ex + ); + + } finally { + if (tx != null) { + closeContext(tx); + } + } } /** @@ -143,13 +151,8 @@ /** @return the main TopiaContext where all other transactions are opened */ public TopiaContext getRootContext() { - if (rootContext == null) { - try { - rootContext = TopiaContextFactory.getContext(dbConfiguration); - } catch (TopiaNotFoundException e) { - throw new TopiaRuntimeException(e); - } - } + Preconditions.checkState(rootContext != null, + "You have to open the persistence to use rootContext"); return rootContext; } Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2012-09-25 13:51:43 UTC (rev 595) @@ -24,6 +24,7 @@ */ package fr.ulr.sammoa.persistence; +import com.google.common.base.Throwables; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; @@ -55,7 +56,12 @@ @Override protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { - persistence = new SammoaPersistence(configuration, autoCommitDelay); + persistence = new SammoaPersistence(); + try { + persistence.open(configuration, autoCommitDelay); + } catch (PersistenceException ex) { + throw Throwables.propagate(ex); + } } @Override Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-ui-swing/pom.xml 2012-09-25 13:51:43 UTC (rev 595) @@ -230,7 +230,7 @@ <resources> <resource> - <directory>src/main/filters</directory> + <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> <include>*.properties</include> Copied: trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties (from rev 594, trunk/sammoa-ui-swing/src/main/filters/sammoa.properties) =================================================================== --- trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties (rev 0) +++ trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties 2012-09-25 13:51:43 UTC (rev 595) @@ -0,0 +1,39 @@ +### +# #%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% +### +## DB Configuration +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.url=jdbc:h2:file:${db.directory}/sammoa +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider + +sammoa.version=${project.version} +sammoa.url=${project.url} +sammoa.inceptionYear=${project.inceptionYear} +sammoa.organizationName=${license.organizationName} Property changes on: trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-25 13:51:43 UTC (rev 595) @@ -37,6 +37,7 @@ import fr.ulr.sammoa.application.flightController.FlightState; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; +import fr.ulr.sammoa.persistence.PersistenceException; import fr.ulr.sammoa.ui.swing.campaign.CampaignUI; import fr.ulr.sammoa.ui.swing.flight.FlightUI; import fr.ulr.sammoa.ui.swing.home.HomeUI; @@ -248,7 +249,11 @@ closeSammoa(false); // Re-open the context - context.open(); + try { + context.open(); + } catch (PersistenceException ex) { + ErrorDialogUI.showError(ex); + } MainUI mainUI = new MainUI(context); mainUI.setVisible(true); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java 2012-09-25 13:51:43 UTC (rev 595) @@ -30,6 +30,7 @@ import fr.ulr.sammoa.application.SammoaService; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; +import fr.ulr.sammoa.persistence.PersistenceException; import org.apache.commons.io.IOUtils; import org.nuiton.widget.SwingSession; @@ -51,8 +52,6 @@ protected String flightId; - protected boolean validationMode; - public static SammoaUIContext newUIContext(SammoaContext context) { Preconditions.checkNotNull(context); uiContext = new SammoaUIContext(context); @@ -149,7 +148,7 @@ return mainUIHandler.getUI().getScreen() == SammoaScreen.VALIDATION; } - public void open() { + public void open() throws PersistenceException { context.open(); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2012-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2012-09-25 13:51:43 UTC (rev 595) @@ -26,7 +26,9 @@ import fr.ulr.sammoa.application.SammoaConfig; import fr.ulr.sammoa.application.SammoaContext; +import fr.ulr.sammoa.persistence.PersistenceException; import fr.ulr.sammoa.ui.swing.util.LogFileInitializer; +import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -38,6 +40,8 @@ import java.io.File; import java.util.Locale; +import static org.nuiton.i18n.I18n._; + /** * Created: 16/05/12 * @@ -55,33 +59,58 @@ // Create application context SammoaContext appContext = new SammoaContext(config); - // Create ui context - SammoaUIContext context = SammoaUIContext.newUIContext(appContext); + try { + // Create ui context + final SammoaUIContext context = SammoaUIContext.newUIContext(appContext); - // Initialize log file - File logFile = config.getLogFile(); - if (logFile != null) { - new LogFileInitializer(logFile).addFileAppender(); - } + // Use shutdownHook to close context on System.exit + Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { - // Initialize i18n - Locale locale = config.getLocale(); - I18n.init(new DefaultI18nInitializer("sammoa-ui-swing"), locale); + @Override + public void run() { + if (logger.isInfoEnabled()) { + logger.info("Close context on shutdown"); + } + context.close(); + } + })); - // Prepare ui look&feel and load ui properties - try { - SwingUtil.initNimbusLoookAndFeel(); - } catch (Exception e) { - // could not find nimbus look-and-feel - if (logger.isWarnEnabled()) { - logger.warn("Failed to init nimbus look and feel"); + context.open(); + + // Initialize log file + File logFile = config.getLogFile(); + if (logFile != null) { + new LogFileInitializer(logFile).addFileAppender(); } - } - UIManager.put("BlockingLayerUI.blockingColor", new Color(50, 50, 50)); + // Initialize i18n + Locale locale = config.getLocale(); + I18n.init(new DefaultI18nInitializer("sammoa-ui-swing"), locale); - MainUI mainUI = new MainUI(context); - mainUI.setVisible(true); + // Prepare ui look&feel and load ui properties + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + if (logger.isWarnEnabled()) { + logger.warn("Failed to init nimbus look and feel"); + } + } + + UIManager.put("BlockingLayerUI.blockingColor", new Color(50, 50, 50)); + + MainUI mainUI = new MainUI(context); + mainUI.setVisible(true); + + } catch (PersistenceException ex) { + if (logger.isErrorEnabled()) { + logger.error("Error during db connection", ex); + } + SammoaUtil.showErrorMessage(null, _("sammoa.messageDialog.persistence.error", + ex.getDbUrl(), + ex.getMessageWithCause())); + System.exit(1); + } } } 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-09-25 09:54:48 UTC (rev 594) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-25 13:51:43 UTC (rev 595) @@ -173,6 +173,7 @@ sammoa.messageDialog.map.export.success=Map (with %s rows in dbf) was successfully exported in directory\n\n%s sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists=Export Shape file (%s)\nor dbf file (%s) already exists.\n\nConfirm to override it? sammoa.messageDialog.observers.import.success=%1$d observers are successfully imported +sammoa.messageDialog.persistence.error=An error occurs with SAMMOA database at address '%s'\:\n%s sammoa.messageDialog.sammoa.backup.success=Sammoa was successfully backup in file\n\n%s sammoa.messageDialog.sammoa.export.success=Sammoa was successfully exported in file\n\n%s sammoa.messageDialog.sammoa.exportFile.alreadyExists=Export File %s already exists.\n\nConfirm to override it?

1 0

r594 - in trunk/sammoa-ui-swing/src/main: java/fr/ulr/sammoa/ui/swing/flight/action resources/i18n
by fdesbois＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: fdesbois Date: 2012-09-25 11:54:48 +0200 (Tue, 25 Sep 2012) New Revision: 594 Url: http://forge.codelutin.com/repositories/revision/sammoa/594 Log: fixes #1526 : add confirm for stop flight Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-25 09:47:19 UTC (rev 593) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-25 09:54:48 UTC (rev 594) @@ -24,7 +24,9 @@ package fr.ulr.sammoa.ui.swing.flight.action; import fr.ulr.sammoa.application.flightController.FlightState; +import fr.ulr.sammoa.ui.swing.flight.FlightUI; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; +import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; @@ -50,7 +52,9 @@ @Override public void actionPerformed(ActionEvent e) { - getFlightController().stop(); + if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.stopFlight.message"))) { + getFlightController().stop(); + } } @Override 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-09-25 09:47:19 UTC (rev 593) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-25 09:54:48 UTC (rev 594) @@ -77,6 +77,7 @@ sammoa.confirmDialog.flightInProgress.message.exit=A flight is in progress, are you sure you want to quit ? sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ? sammoa.confirmDialog.flightInProgress.title=Flight in progress +sammoa.confirmDialog.stopFlight.message=Are you sure you want to stop the flight ? no more actions (observation, begin, add, ...) could be done after stop. sammoa.confirmDialog.validation.delete.message=Are you sure you want to definitely delete this %s ? sammoa.confirmDialog.validation.deleteByCascade.message=This %1$s contains some deleted %2$ss, do you want to continue ? This will definitely delete %2$s marked as deleted. sammoa.datePattern=dd/MM/yyyy

1 0

r593 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by fdesbois＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: fdesbois Date: 2012-09-25 11:47:19 +0200 (Tue, 25 Sep 2012) New Revision: 593 Url: http://forge.codelutin.com/repositories/revision/sammoa/593 Log: fixes #1527 : change text color for new transect Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectListCellRenderer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectListCellRenderer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectListCellRenderer.java 2012-09-25 09:46:44 UTC (rev 592) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectListCellRenderer.java 2012-09-25 09:47:19 UTC (rev 593) @@ -25,9 +25,11 @@ import com.google.common.base.Preconditions; import fr.ulr.sammoa.ui.swing.SammoaColors; +import org.jdesktop.swingx.util.PaintUtils; import javax.swing.JList; import javax.swing.ListCellRenderer; +import java.awt.Color; import java.awt.Component; /** @@ -50,7 +52,11 @@ Component result = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); TransectModel transect = (TransectModel) value; if (transect.getSource().getGraphicIndex() == null) { - result.setBackground(SammoaColors.TRANSECT_WITHOUT_GRAPHIC_BACKGROUND_COLOR); + Color color = SammoaColors.TRANSECT_WITHOUT_GRAPHIC_BACKGROUND_COLOR; + result.setBackground(color); + if (isSelected) { + result.setForeground(PaintUtils.computeForeground(color)); + } } return result; }

1 0

r592 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort
by fdesbois＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: fdesbois Date: 2012-09-25 11:46:44 +0200 (Tue, 25 Sep 2012) New Revision: 592 Url: http://forge.codelutin.com/repositories/revision/sammoa/592 Log: fixes #1513 : change audioReader position only if READY (not running) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-25 09:46:19 UTC (rev 591) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-25 09:46:44 UTC (rev 592) @@ -792,7 +792,11 @@ protected void setAudioReaderPositionDate(Date date) { FlightController flightController = getParentUI().getHandler().getFlightController(); AudioReader audioReader = flightController.getDeviceManager(AudioReader.class); - audioReader.setPositionDate(date); + + // Change position only if AudioReader is ready (not running) + if (DeviceState.READY == audioReader.getState()) { + audioReader.setPositionDate(date); + } } protected void fireObservationsUpdated(Route route, boolean scrollToFirst) {

1 0

r591 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by fdesbois＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: fdesbois Date: 2012-09-25 11:46:19 +0200 (Tue, 25 Sep 2012) New Revision: 591 Url: http://forge.codelutin.com/repositories/revision/sammoa/591 Log: fixes #1525 : remove observation number in map label Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 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-09-24 11:25:21 UTC (rev 590) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-09-25 09:46:19 UTC (rev 591) @@ -58,7 +58,7 @@ public static String toLabel(Observation observation) { Species species = observation.getSpecies(); - return (species != null ? species.getCode() : "") + " (S" + observation.getObservationNumber() + ")"; + return species != null ? species.getCode() : ""; } public static GeoPoint toGeoPoint(Observation observation,

1 0

r590 - trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by fdesbois＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: fdesbois Date: 2012-09-24 13:25:21 +0200 (Mon, 24 Sep 2012) New Revision: 590 Url: http://forge.codelutin.com/repositories/revision/sammoa/590 Log: fixes #1516 : add empty allowed for validation 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-validation-error-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 2012-09-24 11:19:23 UTC (rev 589) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml 2012-09-24 11:25:21 UTC (rev 590) @@ -91,7 +91,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ behaviour in { null, "SW", "MI", "BR", "LO", "FE", "FA", "SB", "OT" } ]]> + <![CDATA[ behaviour in { null, "", "SW", "MI", "BR", "LO", "FE", "FA", "SB", "OT" } ]]> </param> <message>sammoa.validator.observation.behaviour.unkownValue</message> </field-validator> 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 2012-09-24 11:19:23 UTC (rev 589) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2012-09-24 11:25:21 UTC (rev 590) @@ -91,7 +91,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ behaviour in { null, "SW", "MI", "BR", "LO", "FE", "FA", "SB", "OT" } ]]> + <![CDATA[ behaviour in { null, "", "SW", "MI", "BR", "LO", "FE", "FA", "SB", "OT" } ]]> </param> <message>sammoa.validator.observation.behaviour.unkownValue</message> </field-validator>

1 0

r589 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by fdesbois＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: fdesbois Date: 2012-09-24 13:19:23 +0200 (Mon, 24 Sep 2012) New Revision: 589 Url: http://forge.codelutin.com/repositories/revision/sammoa/589 Log: fixes #1515 : problem with selection of transect Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java 2012-09-21 17:22:36 UTC (rev 588) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/TableSelectionListener.java 2012-09-24 11:19:23 UTC (rev 589) @@ -63,18 +63,25 @@ int lastIndex = e.getLastIndex(); Integer newSelectedRow = null; - if (listSelectionModel.isSelectionEmpty()) { + // Use the last selected row + for (int i = firstIndex; i <= lastIndex; i++) { + if (listSelectionModel.isSelectedIndex(i)) { + newSelectedRow = table.convertRowIndexToModel(i); + } + } - // no selection - } else if (listSelectionModel.isSelectedIndex(firstIndex)) { - - // use first index - newSelectedRow = table.convertRowIndexToModel(firstIndex); - } else if (listSelectionModel.isSelectedIndex(lastIndex)) { - - // use last index - newSelectedRow = table.convertRowIndexToModel(lastIndex); - } +// if (listSelectionModel.isSelectionEmpty()) { +// +// // no selection +// } else if (listSelectionModel.isSelectedIndex(firstIndex)) { +// +// // use first index +// newSelectedRow = table.convertRowIndexToModel(firstIndex); +// } else if (listSelectionModel.isSelectedIndex(lastIndex)) { +// +// // use last index +// newSelectedRow = table.convertRowIndexToModel(lastIndex); +// } List<T> elements = selectionModelAdapter.getElements(); T element = null;

1 0

r588 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by fdesbois＠users.forge.codelutin.com 21 Sep '12

21 Sep '12

Author: fdesbois Date: 2012-09-21 19:22:36 +0200 (Fri, 21 Sep 2012) New Revision: 588 Url: http://forge.codelutin.com/repositories/revision/sammoa/588 Log: Add license header Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java 2012-09-21 17:18:29 UTC (rev 587) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java 2012-09-21 17:22:36 UTC (rev 588) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.application.device.gps; +/* + * #%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 gnu.io.NRSerialPort; import gnu.io.NativeResourceException;

1 0

r587 - in trunk: . sammoa-application sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea sammoa-ui-swing/src/main/assembly sammoa-ui-swing/src/main/assembly/x64 sammoa-ui-swing/src/main/assembly/x86
by fdesbois＠users.forge.codelutin.com 21 Sep '12

21 Sep '12

Author: fdesbois Date: 2012-09-21 19:18:29 +0200 (Fri, 21 Sep 2012) New Revision: 587 Url: http://forge.codelutin.com/repositories/revision/sammoa/587 Log: fixes #1457 : - use nrjavaserial (rxtx recent fork) instead of rxtx java library - create GPSNRSerialDevice impl for Gpsylon to use nrjavaserial - remove no more used (encapsulated in nrjavaserial) native libraries - improve SafeGPSNmeaDataProcessor to check if processor is opened on all loops (during reading thread) - improve begin state after open (only if we receive data, the state becomes READY) Added: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java Removed: trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java trunk/sammoa-ui-swing/src/main/assembly/sammoa64.bat trunk/sammoa-ui-swing/src/main/assembly/sammoa64.sh trunk/sammoa-ui-swing/src/main/assembly/x64/librxtxSerial.so trunk/sammoa-ui-swing/src/main/assembly/x64/rxtxSerial.dll trunk/sammoa-ui-swing/src/main/assembly/x86/librxtxSerial.so trunk/sammoa-ui-swing/src/main/assembly/x86/rxtxSerial.dll Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java trunk/sammoa-ui-swing/src/main/assembly/bin.xml trunk/sammoa-ui-swing/src/main/assembly/sammoa.bat trunk/sammoa-ui-swing/src/main/assembly/sammoa.sh Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/pom.xml 2012-09-21 17:18:29 UTC (rev 587) @@ -399,13 +399,26 @@ <groupId>org.dinopolis.gpstool</groupId> <artifactId>gpsinput</artifactId> <version>0.5.3</version> + <exclusions> + <exclusion> + <groupId>org.rxtx</groupId> + <artifactId>rxtx</artifactId> + </exclusion> + </exclusions> </dependency> +  +  +  +  +  + <dependency> - <groupId>org.rxtx</groupId> - <artifactId>rxtx</artifactId> - <version>2.1.7</version> + <groupId>com.neuronrobotics</groupId> + <artifactId>nrjavaserial</artifactId> + <version>3.7.5.1</version> </dependency> + </dependencies> </dependencyManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-application/pom.xml 2012-09-21 17:18:29 UTC (rev 587) @@ -38,8 +38,8 @@ </dependency> <dependency> - <groupId>org.rxtx</groupId> - <artifactId>rxtx</artifactId> + <groupId>com.neuronrobotics</groupId> + <artifactId>nrjavaserial</artifactId> </dependency>  Added: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java (rev 0) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java 2012-09-21 17:18:29 UTC (rev 587) @@ -0,0 +1,124 @@ +package fr.ulr.sammoa.application.device.gps; + +import com.google.common.base.Preconditions; +import gnu.io.NRSerialPort; +import gnu.io.NativeResourceException; +import org.dinopolis.gpstool.gpsinput.GPSDevice; +import org.dinopolis.gpstool.gpsinput.GPSException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Hashtable; + +/** + * Created: 21/09/12 + * + * @author fdesbois <florian.desbois(a)codelutin.com> + */ +public class GPSNRSerialDevice implements GPSDevice { + + /** Logger. */ + private static final Logger logger = LoggerFactory.getLogger(GPSNRSerialDevice.class); + + public final static String PORT_NAME_KEY = "port_name"; + public final static String PORT_SPEED_KEY = "port_speed"; + + protected final static String DEFAULT_PORT_NAME_LINUX = "/dev/ttyS1"; + protected final static String DEFAULT_PORT_NAME_WIN = "COM1"; + protected final static int DEFAULT_PORT_SPEED = 4800; + + protected String serialPortName; + + protected NRSerialPort serialPort; + + @Override + public void init(Hashtable environment) throws GPSException { + + try { + + if (environment.containsKey(PORT_NAME_KEY)) { + serialPortName = (String) environment.get(PORT_NAME_KEY); + + } else if (System.getProperty("os.name").toLowerCase().startsWith("windows")) { + serialPortName = DEFAULT_PORT_NAME_WIN; + + } else { + serialPortName = DEFAULT_PORT_NAME_LINUX; + } + + final int serialPortSpeed; + if (environment.containsKey(PORT_SPEED_KEY)) { + serialPortSpeed = ((Integer) environment.get(PORT_SPEED_KEY)).intValue(); + + } else { + serialPortSpeed = DEFAULT_PORT_SPEED; + } + + serialPort = new NRSerialPort(serialPortName, serialPortSpeed); + + } catch (Exception ex) { + throw new GPSException("Invalid environment set for serial " + + "connection : " + ex.getMessage(), ex); + } + } + + @Override + public void open() throws GPSException { + Preconditions.checkState(serialPort != null, + "Please use init() method to prepare serialDevice"); + + try { + boolean response = serialPort.connect(); + if (!response) { + throw new GPSException("Unable to connect to the SerialPort " + + serialPortName); + } + + if (logger.isInfoEnabled()) { + logger.info("Serial port {} is opened", serialPortName); + } + + } catch (NativeResourceException ex) { + throw new GPSException("Native exception on open SerialPort " + + serialPortName + " : " + ex.getMessage(), ex); + + } catch (Exception ex) { + throw new GPSException("Unexpected exception on open SerialPort " + + serialPortName + " : " + ex.getMessage(), ex); + } + } + + @Override + public void close() throws GPSException { + try { + if (serialPort != null) { + serialPort.disconnect(); + + if (logger.isInfoEnabled()) { + logger.info("Serial port {} is closed", serialPortName); + } + } + + } catch (NativeResourceException ex) { + throw new GPSException("Native exception on close SerialPort " + + serialPortName + " : " + ex.getMessage(), ex); + + } catch (Exception ex) { + throw new GPSException("Unexpected exception on close SerialPort " + + serialPortName + " : " + ex.getMessage(), ex); + } + } + + @Override + public InputStream getInputStream() throws IOException { + return serialPort != null ? serialPort.getInputStream() : null; + } + + @Override + public OutputStream getOutputStream() throws IOException { + return serialPort != null ? serialPort.getOutputStream() : null; + } +} Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-21 17:18:29 UTC (rev 587) @@ -35,7 +35,6 @@ 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.nmea.SafeGPSNmeaDataProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,7 +79,7 @@ @Override public void open() throws DeviceTechnicalException { - if (getState() == DeviceState.READY) { + if (opened) { if (logger.isWarnEnabled()) { logger.warn("GPS already opened"); } @@ -93,11 +92,11 @@ gpsDataProcessor = new SafeGPSNmeaDataProcessor(); - gpsDevice = new GPSSerialDevice(); + gpsDevice = new GPSNRSerialDevice(); Hashtable<String, Object> options = new Hashtable<String, Object>(); - options.put(GPSSerialDevice.PORT_NAME_KEY, getConfig().getDevice()); - options.put(GPSSerialDevice.PORT_SPEED_KEY, getConfig().getSpeed()); + options.put(GPSNRSerialDevice.PORT_NAME_KEY, getConfig().getDevice()); + options.put(GPSNRSerialDevice.PORT_SPEED_KEY, getConfig().getSpeed()); if (logger.isDebugEnabled()) { logger.debug("GPS options: " + options); @@ -111,13 +110,9 @@ logAvailablePorts("beforeOpen"); - gpsDataProcessor.open(); - gpsDataProcessor.addGPSDataChangeListener(gpsDataProcessorListener); - logger.info("Connected to GPS device"); - - setState(DeviceState.READY, null); + gpsDataProcessor.open(); opened = true; logAvailablePorts("openedSuccessful"); @@ -135,7 +130,7 @@ stop(); - if (gpsDataProcessor != null && getState() != DeviceState.UNAVAILABLE) { + if (opened) { logger.info("Closing GPS device..."); try { @@ -317,10 +312,16 @@ String property = evt.getPropertyName(); - if (logger.isTraceEnabled()) { - logger.trace("Gps data received {} {}", property, evt.getNewValue()); + if (logger.isDebugEnabled()) { + logger.debug("Gps data received {} {}", property, evt.getNewValue()); } + if (state == DeviceState.UNAVAILABLE) { + logger.info("Connected to GPS device"); + + setState(DeviceState.READY, null); + } + if (GPSDataProcessor.LOCATION.equals(property)) { lastPositionDate = getDate(); lastPosition = (GPSPosition) evt.getNewValue(); Deleted: 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-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/SafeGPSSerialDevice.java 2012-09-21 17:18:29 UTC (rev 587) @@ -1,60 +0,0 @@ -package org.dinopolis.gpstool.gpsinput; -/* - * #%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.Throwables; - -import java.io.IOException; - -/** - * There is an issue with closing on {@link gnu.io.SerialPort}. See - * <a href="https://forums.oracle.com/forums/thread.jspa?threadID=1292323"> - * https://forums.oracle.com/forums/thread.jspa?threadID=1292323 - * </a> - * - * Proper close. Need to use also {@link org.dinopolis.gpstool.gpsinput.nmea.SafeGPSNmeaDataProcessor} - * which is listener on the serial device - * - * Created: 06/08/12 - * - * @author fdesbois <florian.desbois(a)codelutin.com> - */ -public class SafeGPSSerialDevice extends GPSSerialDevice { - - @Override - public void close() throws GPSException { - if (serial_port_ != null) { - - serial_port_.removeEventListener(); - try { - serial_port_.getOutputStream().flush(); - serial_port_.getOutputStream().close(); - serial_port_.getInputStream().close(); - } catch (IOException e) { - throw Throwables.propagate(e); - } - serial_port_.close(); - } - } -} 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-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-application/src/main/java/org/dinopolis/gpstool/gpsinput/nmea/SafeGPSNmeaDataProcessor.java 2012-09-21 17:18:29 UTC (rev 587) @@ -24,6 +24,8 @@ */ import org.dinopolis.gpstool.gpsinput.GPSException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.OutputStream; @@ -36,6 +38,12 @@ */ public class SafeGPSNmeaDataProcessor extends GPSNmeaDataProcessor { + /** Logger. */ + private static final Logger logger = LoggerFactory.getLogger(SafeGPSNmeaDataProcessor.class); + + protected volatile boolean open_; + + // Override to avoid using daemon for read_thread @Override public void open() throws GPSException { @@ -50,9 +58,7 @@ // start this runnable as thread: read_thread_ = new Thread(this, "GPSNmeaDataProcessor"); - // >> START fix - // Remove daemon line from superclass implementation - + // >> START fix : remove daemon line from superclass implementation // read_thread_.setDaemon(true); // so thread is finished after exit of application // << END fix @@ -68,28 +74,219 @@ } } + // Override to clean read_thread on close @Override public void close() throws GPSException { -// for (Object rawDataListener : raw_data_listener_) { -// removeGPSRawDataListener((GPSRawDataListener) rawDataListener); -// } + + if (gps_device_ == null) { + throw new GPSException("no GPSDevice set!"); + } + + open_ = false; if (read_thread_ != null) { - read_thread_.interrupt(); + try { + read_thread_.join(); + } catch (InterruptedException ex) { + throw new GPSException("Error on thread join", ex); + } read_thread_ = null; } - super.close(); + gps_device_.close(); } + // Override to allow stop loop with open flag @Override + protected void readMessages() + { + if (logger.isDebugEnabled()) { + logger.debug("start reading from GPSDevice..."); + } + + char[] buffer; + int count; + int data; + NMEA0183Sentence message; + try + { + + if (logger.isDebugEnabled()) { + logger.debug("inputstream: " + in_stream_); + } + + if (!readGarbage()) // try to (re)sync with nmea stream + return; + + int loopcount = 0; + // >> START fix : add open_ flag to stop loop on close + while (open_) + // << END fix + { + loopcount++; + count = 0; + buffer = new char[MAX_NMEA_MESSAGE_LENGTH]; + + // >> START fix : add open_ flag to stop loop on close + while (open_ && (data = getNextByte()) != (char) 13) // read data until CR + // << END fix + { + + if (count >= MAX_NMEA_MESSAGE_LENGTH - 1) + { + System.err.println("ERROR: max. message length exceeded! (" + count + "):" + new String(buffer)); + if (!readGarbage()) // try to (re)sync with nmea stream + return; + loopcount++; + count = 0; + buffer = new char[MAX_NMEA_MESSAGE_LENGTH]; + } else + { + if (data != (char) 10) // ignore LF + { + buffer[count] = (char) data; // add data to the buffer + count++; + } + } + } // end of while (read until end of line) + + if (buffer[0] != '$') // no valid nmea sentence + { + if (!readGarbage()) // try to (re)sync with nmea stream + return; + } else + { // valid sentence, no garbage + try + { + message = new NMEA0183Sentence(buffer, 0, count); + + buffer[count] = 13; // add CR from NMEA message + buffer[count + 1] = 10; // add LF from NMEA message + fireRawDataReceived(buffer, 0, count + 2); + if (logger.isDebugEnabled()) + { + logger.debug("message: '" + message + "'"); + logger.debug("sentenceId: '" + message.getSentenceId() + "'"); + } + + if (!message.isValid() && ignore_invalid_checksum_ && print_ignore_warning_) + { + logger.error("ERORR: invalid checksum in NMEA message: " + message); + logger.error("checksum of sentence: " + message.getChecksum() + ", calculated checksum: " + message.getCalculatedChecksum()); + logger.warn("WARNING: As you chose to ingore invalid messages, this message is only printed once!"); + print_ignore_warning_ = false; + } + + if (ignore_invalid_checksum_ || message.isValid() || message.getSentenceId().equals("RFTXT")) + { + try + { + processNmeaSentence(message); + } + catch (Exception e) + { + logger.error("ERROR: Exception thrown on processing of NMEA sentences:"); + logger.error(message.toString()); + e.printStackTrace(); + } + } else + { + logger.error("ERORR: invalid checksum in NMEA message: " + message); + logger.error("checksum of sentence: " + message.getChecksum() + ", calculated checksum: " + message.getCalculatedChecksum()); + } + } + catch (Exception e) + { + logger.error("ERROR: Exception thrown on creation or processing of NMEA sentences:"); + logger.error(new String(buffer)); + e.printStackTrace(); + } + } + + if (delay_time_ > 0) + { + try + { + Thread.sleep(delay_time_); + } + catch (InterruptedException ie) + { + } + } + } + } + catch (IOException ioe) + { + if (open_) // otherwise, this is the reason for the exception! + ioe.printStackTrace(); + } + } + + // Copy from superclass (private access) + protected int getNextByte() throws IOException + { + int data = -1; + // rxtx 2.1.7 on windows has the problem (?) that even if the stream is not ended + // it returns -1 here (happens in between nmea sentences) + // so we just wait a little and then retry to read + + // >> START fix : add open_ flag to stop loop on close + while (open_ && (data = in_stream_.read()) < 0) + // << END fix + { + + try + { + Thread.sleep(50); + } catch (InterruptedException ignore) + { + } + } + return data; + } + + // Override to add open_ flag in loops + @Override + protected boolean readGarbage() + { + int data; + try + { + // >> START fix : add open_ flag to stop loops on close + while (open_) + { + // read until CR/LF> + while (open_ && (data = getNextByte()) != (char) 13) // read data until CR + { + } + // << END fix + + data = getNextByte(); // char after CR + if (data == (char) 10) // linefeed + { + return true; + } + if (logger.isDebugEnabled()) + logger.debug("reading garbage..."); + } + } + catch (IOException ioe) + { + System.err.println("GPS Nmea Reading: IOException on beginning of reading, try once more: " + ioe.getMessage()); + return false; + } + return false; + } + + // Override to fix parse issue with empty String + @Override protected void processGSA(NMEA0183Sentence sentence) { -// if (logger_nmea_.isDebugEnabled()) -// logger_nmea_.debug("GSA detected: " + sentence); + if (logger.isDebugEnabled()) { + logger.debug("GSA detected: " + sentence); + } List data_fields = sentence.getDataFields(); Integer[] satellites_ids = new Integer[12]; String pdop = (String) data_fields.get(14); String hdop = (String) data_fields.get(15); String vdop = (String) data_fields.get(16); -// int valid_fix = Integer.parseInt((String) data_fields.get(1)); for (int i = 0; i < 12; i++) { String id = (String) data_fields.get(i + 2); @@ -98,9 +295,7 @@ } } - // >> START fix - // Resolve NumberFormatException on new Float with empty String - + // >> START fix : resolve NumberFormatException on new Float with empty String changeGPSData(PDOP, pdop.isEmpty() ? 0 : new Float(pdop)); changeGPSData(HDOP, hdop.isEmpty() ? 0 : new Float(hdop)); Modified: trunk/sammoa-ui-swing/src/main/assembly/bin.xml =================================================================== (Binary files differ) Modified: trunk/sammoa-ui-swing/src/main/assembly/sammoa.bat =================================================================== --- trunk/sammoa-ui-swing/src/main/assembly/sammoa.bat 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-ui-swing/src/main/assembly/sammoa.bat 2012-09-21 17:18:29 UTC (rev 587) @@ -1,2 +1,2 @@ -java -Xmx1024M -Djava.library.path=x86 -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 Modified: trunk/sammoa-ui-swing/src/main/assembly/sammoa.sh =================================================================== --- trunk/sammoa-ui-swing/src/main/assembly/sammoa.sh 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-ui-swing/src/main/assembly/sammoa.sh 2012-09-21 17:18:29 UTC (rev 587) @@ -1,6 +1,5 @@ #!/bin/bash MEMORY="-Xmx1024M" -JRIARGS="-Djava.library.path=x86" -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* +java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* Deleted: trunk/sammoa-ui-swing/src/main/assembly/sammoa64.bat =================================================================== --- trunk/sammoa-ui-swing/src/main/assembly/sammoa64.bat 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-ui-swing/src/main/assembly/sammoa64.bat 2012-09-21 17:18:29 UTC (rev 587) @@ -1,2 +0,0 @@ - -java -Xmx1024M -Djava.library.path=x64 -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 Deleted: trunk/sammoa-ui-swing/src/main/assembly/sammoa64.sh =================================================================== --- trunk/sammoa-ui-swing/src/main/assembly/sammoa64.sh 2012-09-21 13:00:10 UTC (rev 586) +++ trunk/sammoa-ui-swing/src/main/assembly/sammoa64.sh 2012-09-21 17:18:29 UTC (rev 587) @@ -1,6 +0,0 @@ -#!/bin/bash - -MEMORY="-Xmx1024M" -JRIARGS="-Djava.library.path=x64" - -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* Deleted: trunk/sammoa-ui-swing/src/main/assembly/x64/librxtxSerial.so =================================================================== (Binary files differ) Deleted: trunk/sammoa-ui-swing/src/main/assembly/x64/rxtxSerial.dll =================================================================== (Binary files differ) Deleted: trunk/sammoa-ui-swing/src/main/assembly/x86/librxtxSerial.so =================================================================== (Binary files differ) Deleted: trunk/sammoa-ui-swing/src/main/assembly/x86/rxtxSerial.dll =================================================================== (Binary files differ)

1 0

r586 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/test/java/fr/ulr/sammoa/application sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action src/site/rst
by fdesbois＠users.forge.codelutin.com 21 Sep '12

21 Sep '12

Author: fdesbois Date: 2012-09-21 15:00:10 +0200 (Fri, 21 Sep 2012) New Revision: 586 Url: http://forge.codelutin.com/repositories/revision/sammoa/586 Log: fixes #1511 : improve crossingNumber behavior, do not use nbTimes any longer except for init case (from import) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java trunk/src/site/rst/model.rst 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-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-09-21 13:00:10 UTC (rev 586) @@ -309,13 +309,13 @@ } } - public void deleteTansectFlight(Flight flight, - TransectFlight transectFlight) { + public void deleteTransectFlight(Flight flight, + TransectFlight transectFlight) { TopiaContext tx = beginTransaction(); try { - deleteTansectFlight(tx, flight, transectFlight); + deleteTransectFlight(tx, flight, transectFlight); tx.commitTransaction(); @@ -326,9 +326,9 @@ } } - protected void deleteTansectFlight(TopiaContext tx, - Flight flight, - TransectFlight transectFlight) + protected void deleteTransectFlight(TopiaContext tx, + Flight flight, + TransectFlight transectFlight) throws TopiaException { SammoaDAOHelper.getObserverPositionDAO(tx).deleteAll( @@ -868,13 +868,12 @@ TransectFlightDAO transectFlightDAO = SammoaDAOHelper.getTransectFlightDAO(transaction); - TransectFlight result = - transectFlightDAO.create(TransectFlight.PROPERTY_TRANSECT, - transect); + int crossingNumber = + transectFlightDAO.getMaxCrossingNumberByTransect(transect) + 1; - int crossingNumber = transect.getNbTimes() + 1; + TransectFlight result = transectFlightDAO.create(); + result.setTransect(transect); result.setCrossingNumber(crossingNumber); - transect.setNbTimes(crossingNumber); // Update transect for nbTimes TransectDAO transectDAO = SammoaDAOHelper.getTransectDAO(transaction); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java 2012-09-21 13:00:10 UTC (rev 586) @@ -58,7 +58,7 @@ if (transectFlight.isDeleted()) { // Use FlightService for delete - context.getService(FlightService.class).deleteTansectFlight(tx, flight, transectFlight); + context.getService(FlightService.class).deleteTransectFlight(tx, flight, transectFlight); result = null; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2012-09-21 13:00:10 UTC (rev 586) @@ -24,6 +24,7 @@ */ package fr.ulr.sammoa.application; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; @@ -46,6 +47,9 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import java.util.List; +import java.util.Map; + /** * Created: 08/06/12 * @@ -133,9 +137,10 @@ FlightService service = context.getService(FlightService.class); Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); - - // Create the strate Strate strate = createStrate(campaign, 1, StrateType.COAST); + Transect transect1 = createTransect("C1", strate); + Transect transect2 = createTransect("C2", strate); + Transect transect3 = createTransect("C3", strate); Flight flight = service.createFlight(campaign, service.getNextFlightNumber()); @@ -144,10 +149,6 @@ flight.addObserver(createObserver(String.valueOf(i), campaign)); } - Transect transect1 = createTransect("C1", strate); - Transect transect2 = createTransect("C2", strate); - Transect transect3 = createTransect("C3", strate); - // Add transect1 and transect2 Iterable<Transect> transects = Lists.newArrayList(transect1, transect2); @@ -156,8 +157,10 @@ Assert.assertEquals(2, flight.getTransectFlight().size()); TransectFlight transectFlight1 = flight.getTransectFlight().get(0); Assert.assertEquals(transect1, transectFlight1.getTransect()); + Assert.assertEquals(1, transectFlight1.getCrossingNumber()); TransectFlight transectFlight2 = flight.getTransectFlight().get(1); Assert.assertEquals(transect2, transectFlight2.getTransect()); + Assert.assertEquals(1, transectFlight2.getCrossingNumber()); // Add an other transectFlight for transect2 and transect3 transects = Lists.newArrayList(transect2, transect3); @@ -167,10 +170,154 @@ Assert.assertEquals(4, flight.getTransectFlight().size()); TransectFlight transectFlight3 = flight.getTransectFlight().get(2); Assert.assertEquals(transect3, transectFlight3.getTransect()); + Assert.assertEquals(1, transectFlight3.getCrossingNumber()); TransectFlight transectFlightAtIndex2 = flight.getTransectFlight().get(1); Assert.assertNotSame(transectFlight2, transectFlightAtIndex2); + Assert.assertEquals(transect2, transectFlightAtIndex2.getTransect()); + Assert.assertEquals(2, transectFlightAtIndex2.getCrossingNumber()); } + @Test + public void testDeleteTransectFlight() throws Exception { + + SammoaContext context = new SammoaContext(config, database.getPersistence()); + + FlightService service = context.getService(FlightService.class); + + Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); + Strate strate = createStrate(campaign, 1, StrateType.COAST); + Transect transect = createTransect("C1", strate); + + Flight flight = service.createFlight(campaign, service.getNextFlightNumber()); + + List<TransectFlight> transectFlights = + service.addTransects(flight, 0, ImmutableList.of(transect)); + + TransectFlight transectFlight = transectFlights.get(0); + Assert.assertEquals(1, transectFlight.getCrossingNumber()); + + service.deleteTransectFlight(flight, transectFlight); + + transectFlights = + service.addTransects(flight, 0, ImmutableList.of(transect)); + transectFlight = transectFlights.get(0); + Assert.assertEquals(1, transectFlight.getCrossingNumber()); + } + + @Test + public void testCrossingNumber() throws Exception { + + SammoaContext context = new SammoaContext(config, database.getPersistence()); + + FlightService service = context.getService(FlightService.class); + + Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); + + Strate strate = createStrate(campaign, 1, StrateType.COAST); + Transect transect = createTransect("C1/01", strate); + + Flight flight1 = service.createFlight(campaign, service.getNextFlightNumber()); + Flight flight2 = service.createFlight(campaign, service.getNextFlightNumber()); + Flight flight3 = service.createFlight(campaign, service.getNextFlightNumber()); + + int index = 0; + // 1st crossing on flight 1 + { + service.addTransects(flight1, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight1.getTransectFlight().get(index); + Assert.assertEquals(1, transectFlight.getCrossingNumber()); + } + // 2nd crossing on flight 1 + { + service.addTransects(flight1, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight1.getTransectFlight().get(index); + Assert.assertEquals(2, transectFlight.getCrossingNumber()); + } + // 3rd crossing on flight 2 + { + service.addTransects(flight2, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight2.getTransectFlight().get(index); + Assert.assertEquals(3, transectFlight.getCrossingNumber()); + } + // 6th crossing on flight 3 + // manual set because an other system does the 4th and 5th crossings + { + service.addTransects(flight3, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight3.getTransectFlight().get(index); + Assert.assertEquals(4, transectFlight.getCrossingNumber()); + transectFlight.setCrossingNumber(6); + } + // 7th crossing on flight 3 + { + service.addTransects(flight3, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight3.getTransectFlight().get(index); + Assert.assertEquals(7, transectFlight.getCrossingNumber()); + } + // We delete the flight3, the next crossing become the 4th + { + service.deleteFlight(campaign.getTopiaId(), flight3.getTopiaId()); + } + // 4th crossing on flight 2 + { + service.addTransects(flight2, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight2.getTransectFlight().get(index); + Assert.assertEquals(4, transectFlight.getCrossingNumber()); + } + // We update the transect nbTimes (usually done by import) + { + transect.setNbTimes(5); + } + // 6th crossing on flight 2 + { + service.addTransects(flight2, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight2.getTransectFlight().get(index); + Assert.assertEquals(6, transectFlight.getCrossingNumber()); + } + // Mark 2nd crossing as deleted + { + TransectFlight transectFlight = flight1.getTransectFlight().get(index); + Assert.assertEquals(2, transectFlight.getCrossingNumber()); + transectFlight.setDeleted(true); + } + // 5th crossing on flight 1 (manual change) + { + service.addTransects(flight1, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight1.getTransectFlight().get(index); + Assert.assertEquals(7, transectFlight.getCrossingNumber()); + transectFlight.setCrossingNumber(5); + } + // Change the 6th crossingNumber to 2nd (2nd is marked deleted) + { + TransectFlight transectFlight = flight2.getTransectFlight().get(index); + Assert.assertEquals(6, transectFlight.getCrossingNumber()); + transectFlight.setCrossingNumber(2); + } + // Check that 6 transectFlight are attached to the transect + // but one is deleted + { + TopiaContext tx = database.beginTransaction(); + Map<Transect, Long> map = SammoaDAOHelper.getTransectFlightDAO(tx). + countAllByTransect(); + Assert.assertEquals(new Long(6), map.get(transect)); + } + // 6th crossing on flight 1 marked as 1st one (strange but not forbidden) + { + service.addTransects(flight1, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight1.getTransectFlight().get(index); + Assert.assertEquals(6, transectFlight.getCrossingNumber()); + transectFlight.setCrossingNumber(1); + } + // 7th crossing on flight 2 + // There is 6 transectFlight not deleted, 2 as 1st crossing and no 6th crossing + // No check is done, but here we assume that there is 6 valid crossing + // So the next one is the 7th + { + service.addTransects(flight2, index, ImmutableList.of(transect)); + TransectFlight transectFlight = flight2.getTransectFlight().get(index); + Assert.assertEquals(7, transectFlight.getCrossingNumber()); + } + } + protected Observer createObserver(String initials, Campaign campaign) throws TopiaException { TopiaContext transaction = database.beginTransaction(); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2012-09-21 13:00:10 UTC (rev 586) @@ -76,6 +76,34 @@ } } + public int getMaxCrossingNumberByTransect(Transect transect) { + + String ql = "SELECT max(crossingNumber), count(*), transect.nbTimes " + + "FROM TransectFlightImpl " + + "WHERE transect = :transect " + + "AND deleted = :deleted " + + "GROUP BY transect"; + try { + Object[] queryResults = (Object[]) getContext().findUnique( + ql, "transect", transect, "deleted", false); + + int result; + if (queryResults == null) { + // By default we use the transect nbTimes set by import + result = transect.getNbTimes(); + + } else { + int maxCrossingNumber = (Integer) queryResults[0]; + int nbTransectFlights = ((Long) queryResults[1]).intValue(); + int transectNbTimes = (Integer) queryResults[2]; + result = Math.max(Math.max(maxCrossingNumber, nbTransectFlights), transectNbTimes); + } + return result; + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + public void reAttachIndexInFlight(Iterable<TransectFlight> transectFlights) throws TopiaException { StringBuilder builder = new StringBuilder(); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectFlightModel.java 2012-09-21 13:00:10 UTC (rev 586) @@ -140,14 +140,6 @@ public void setCrossingNumber(int crossingNumber) { int oldValue = getCrossingNumber(); getSource().setCrossingNumber(crossingNumber); - - // We need to update the manual nbTimes from transect to ensure next crossingNumber value - // only if the nbTimes is inferior to the new value manually set - int nbTimes = getTransect().getSource().getNbTimes(); - if (crossingNumber > nbTimes) { - getTransect().getSource().setNbTimes(crossingNumber); - } - firePropertyChange(PROPERTY_CROSSING_NUMBER, oldValue, crossingNumber); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2012-09-21 13:00:10 UTC (rev 586) @@ -80,7 +80,7 @@ FlightService service = getSammoaUIContext().getService(FlightService.class); - service.deleteTansectFlight(getModel().getFlight(), transectFlight.getSource()); + service.deleteTransectFlight(getModel().getFlight(), transectFlight.getSource()); if (logger.isDebugEnabled()) { logger.debug("Delete transect {} ", Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2012-09-20 12:45:28 UTC (rev 585) +++ trunk/src/site/rst/model.rst 2012-09-21 13:00:10 UTC (rev 586) @@ -737,18 +737,14 @@ +----------------------+----------------------------------+--------------------+----------------+ | nbTimes | Nombre de fois sur lequel a été | int | | | | effectué le transect. Ce nombre | | | -| | est incrémenté en fonction du | | | -| | numéro de passage | | | -| | (*crossingNumber*) d'un nouveau | | | -| | TransectFlight_. Le numéro de | | | -| | passage est modifié manuellement | | | -| | par l'utilisateur. Le nombre de | | | -| | TransectFlight_ rattaché à ce | | | -| | transect depuis la base peut | | | -| | être différent, car d'anciens | | | -| | vols ayant un lien avec ce | | | -| | transect ont pu être supprimés | | | -| | de la base. | | | +| | est importé et n'est utilisé | | | +| | comme base pour le prochain | | | +| | *crossingNumber* des | | | +| | TransectFlight_ que si il est | | | +| | supérieur à la plus grande | | | +| | valeur existante de | | | +| | *crossingNumber* pour ce | | | +| | transect. | | | +----------------------+----------------------------------+--------------------+----------------+ | graphicIndex | Index de l'objet graphique | Integer | | | | depuis le fichier SHP importé. | | |

1 0