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

r688 - tags
by maven-release＠users.forge.codelutin.com 28 May '14

28 May '14

Author: maven-release Date: 2014-05-28 09:11:00 +0200 (Wed, 28 May 2014) New Revision: 688 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/688 Log: [maven-release-plugin] copy for tag sammoa-1.0.3 Added: tags/sammoa-1.0.3/

1 0

r687 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 28 May '14

28 May '14

Author: maven-release Date: 2014-05-28 09:10:54 +0200 (Wed, 28 May 2014) New Revision: 687 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/687 Log: [maven-release-plugin] prepare release sammoa-1.0.3 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-05-28 07:08:33 UTC (rev 686) +++ trunk/pom.xml 2014-05-28 07:10:54 UTC (rev 687) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> <modules> <module>sammoa-persistence</module> @@ -78,12 +78,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0.3 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-28 07:08:33 UTC (rev 686) +++ trunk/sammoa-application/pom.xml 2014-05-28 07:10:54 UTC (rev 687) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-05-28 07:08:33 UTC (rev 686) +++ trunk/sammoa-persistence/pom.xml 2014-05-28 07:10:54 UTC (rev 687) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-05-28 07:08:33 UTC (rev 686) +++ trunk/sammoa-ui-swing/pom.xml 2014-05-28 07:10:54 UTC (rev 687) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r686 - trunk/sammoa-application
by sbavencoff＠users.forge.codelutin.com 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 09:08:33 +0200 (Wed, 28 May 2014) New Revision: 686 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/686 Log: use stable version Modified: trunk/sammoa-application/pom.xml Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-28 06:59:49 UTC (rev 685) +++ trunk/sammoa-application/pom.xml 2014-05-28 07:08:33 UTC (rev 686) @@ -143,7 +143,6 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>3.0-SNAPSHOT</version> </dependency> </dependencies>

1 0

r685 - trunk
by sbavencoff＠users.forge.codelutin.com 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 08:59:49 +0200 (Wed, 28 May 2014) New Revision: 685 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/685 Log: use stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 06:44:45 UTC (rev 684) +++ trunk/pom.xml 2014-05-28 06:59:49 UTC (rev 685) @@ -114,7 +114,7 @@ <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.9</eugeneVersion> <topiaVersion>3.0-beta-4</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version>

1 0

r684 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 08:44:45 +0200 (Wed, 28 May 2014) New Revision: 684 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/684 Log: svn keywords and eol-style Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java trunk/sammoa-ui-swing/profiling.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml Property changes on: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -2,8 +2,8 @@ * #%L * SAMMOA :: Persistence * - * $Id: FlightDAOImpl.java 500 2012-08-30 15:58:32Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.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/GeoPointTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: GeoPointDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.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/ObservationTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -1,8 +1,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: ObservationDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.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/RouteTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -1,8 +1,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: RouteDAOImpl.java 524 2012-09-05 14:03:46Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.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/StrateTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: StrateDAOImpl.java 494 2012-08-30 13:27:15Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.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/TransectFlightTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: TransectFlightDAOImpl.java 586 2012-09-21 13:00:10Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java 2014-05-28 06:42:30 UTC (rev 683) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java 2014-05-28 06:44:45 UTC (rev 684) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id: TransectDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ - * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Property changes on: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/sammoa-ui-swing/profiling.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r683 - in trunk: sammoa-application/src/license sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-persistence/src/license sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 08:42:30 +0200 (Wed, 28 May 2014) New Revision: 683 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/683 Log: add header, licences Modified: trunk/sammoa-application/src/license/THIRD-PARTY.properties trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java trunk/sammoa-persistence/src/license/THIRD-PARTY.properties trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml Modified: trunk/sammoa-application/src/license/THIRD-PARTY.properties =================================================================== --- trunk/sammoa-application/src/license/THIRD-PARTY.properties 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-application/src/license/THIRD-PARTY.properties 2014-05-28 06:42:30 UTC (rev 683) @@ -1,12 +1,20 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software Licenses # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. +# - GNU Library or Lesser General Public License # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -14,15 +22,15 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License +# - OpenMap Software License Agreement +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jun 13 18:25:14 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Wed May 28 08:38:41 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java 2014-05-28 06:42:30 UTC (rev 683) @@ -1,5 +1,27 @@ package fr.ulr.sammoa.application.device.audio; +/* + * #%L + * SAMMOA :: Application + * %% + * Copyright (C) 2012 - 2014 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/sammoa-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/sammoa-persistence/src/license/THIRD-PARTY.properties 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-persistence/src/license/THIRD-PARTY.properties 2014-05-28 06:42:30 UTC (rev 683) @@ -1,46 +1,31 @@ -### -# #%L -# SAMMOA :: Persistence -# %% -# 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% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 -# - license.txt +# - The H2 License, Version 1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 11 14:40:47 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Wed May 28 08:38:13 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-28 06:42:30 UTC (rev 683) @@ -1,5 +1,27 @@ package fr.ulr.sammoa.persistence; +/* + * #%L + * SAMMOA :: Persistence + * %% + * Copyright (C) 2012 - 2014 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java 2014-05-28 06:42:30 UTC (rev 683) @@ -1,5 +1,27 @@ package fr.ulr.sammoa.ui.swing.flight.effort; +/* + * #%L + * SAMMOA :: UI Swing + * %% + * Copyright (C) 2012 - 2014 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java 2014-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java 2014-05-28 06:42:30 UTC (rev 683) @@ -1,5 +1,27 @@ package fr.ulr.sammoa.ui.swing.util; +/* + * #%L + * SAMMOA :: UI Swing + * %% + * Copyright (C) 2012 - 2014 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ulr.sammoa.application.SammoaTechnicalException; import fr.ulr.sammoa.application.device.audio.AudioLevel; 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-05-28 06:27:58 UTC (rev 682) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-05-28 06:42:30 UTC (rev 683) @@ -1,5 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">

1 0

r682 - trunk
by sbavencoff＠users.forge.codelutin.com 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 08:27:58 +0200 (Wed, 28 May 2014) New Revision: 682 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/682 Log: use previous version of H2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-27 13:35:17 UTC (rev 681) +++ trunk/pom.xml 2014-05-28 06:27:58 UTC (rev 682) @@ -117,7 +117,7 @@ <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> <topiaVersion>3.0-beta-4</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> - <h2Version>1.4.178</h2Version> + <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <jaxxVersion>2.8.5</jaxxVersion>

1 0

r681 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort
by sbavencoff＠users.forge.codelutin.com 27 May '14

27 May '14

Author: sbavencoff Date: 2014-05-27 15:35:17 +0200 (Tue, 27 May 2014) New Revision: 681 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/681 Log: fix observations number order Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java 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-05-27 13:34:05 UTC (rev 680) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/ObservationTableModel.java 2014-05-27 13:35:17 UTC (rev 681) @@ -132,7 +132,7 @@ public enum ObservationColumn { - OBSERVATION_NUMBER(false, int.class, Observation.PROPERTY_OBSERVATION_NUMBER), + OBSERVATION_NUMBER(false, Integer.class, Observation.PROPERTY_OBSERVATION_NUMBER), OBSERVATION_TIME(true, Date.class, Observation.PROPERTY_OBSERVATION_TIME) { @Override

1 0

r680 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio
by sbavencoff＠users.forge.codelutin.com 27 May '14

27 May '14

Author: sbavencoff Date: 2014-05-27 15:34:05 +0200 (Tue, 27 May 2014) New Revision: 680 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/680 Log: refs #4762 : vu-meter scale Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java 2014-05-27 13:32:11 UTC (rev 679) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioLevel.java 2014-05-27 13:34:05 UTC (rev 680) @@ -20,7 +20,7 @@ protected static final int SAMPLE_LENGTH = 1000; - protected static final float ATTENUATION = 90; + protected static final float ATTENUATION = 70; protected TargetDataLine line;

1 0

r679 - in trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight: . effort
by sbavencoff＠users.forge.codelutin.com 27 May '14

27 May '14

Author: sbavencoff Date: 2014-05-27 15:32:11 +0200 (Tue, 27 May 2014) New Revision: 679 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/679 Log: fixes #4764 : validation : lenteur surlignage Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 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/FlightUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 2014-05-26 09:22:15 UTC (rev 678) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 2014-05-27 13:32:11 UTC (rev 679) @@ -116,6 +116,8 @@ */ protected Observation observationEditBean; + protected boolean observationValueIsAdjusting; + /** * La route en cours d'édition. * @@ -337,11 +339,20 @@ } public void setObservationEditBean(Observation observationEditBean) { - Observation oldObservationEditBean = this.observationEditBean; - this.observationEditBean = observationEditBean; - firePropertyChange(PROPERTY_OBSERVATION_EDIT_BEAN, oldObservationEditBean, observationEditBean); + try { + observationValueIsAdjusting = true; + Observation oldObservationEditBean = this.observationEditBean; + this.observationEditBean = observationEditBean; + firePropertyChange(PROPERTY_OBSERVATION_EDIT_BEAN, oldObservationEditBean, observationEditBean); + } finally { + observationValueIsAdjusting = false; + } } + public boolean isObservationValueIsAdjusting() { + return observationValueIsAdjusting; + } + public Route getRouteEditBean() { return routeEditBean; } 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-05-26 09:22:15 UTC (rev 678) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-27 13:32:11 UTC (rev 679) @@ -902,7 +902,7 @@ fireObservationsUpdated(oldValue, false); } if (newValue != null) { - fireObservationsUpdated(newValue, true); + fireObservationsUpdated(newValue, !getModel().isObservationValueIsAdjusting()); } }

1 0