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

r635 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by bleny＠users.forge.codelutin.com Oct. 13, 2012

Oct. 13, 2012

Author: bleny Date: 2012-10-13 08:32:33 +0200 (Sat, 13 Oct 2012) New Revision: 635 Url: http://forge.codelutin.com/repositories/revision/sammoa/635 Log: [maven-release-plugin] prepare release sammoa-1.0 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 2012-10-12 19:12:10 UTC (rev 634) +++ trunk/pom.xml 2012-10-13 06:32:33 UTC (rev 635) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</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</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 </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 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-12 19:12:10 UTC (rev 634) +++ trunk/sammoa-application/pom.xml 2012-10-13 06:32:33 UTC (rev 635) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-12 19:12:10 UTC (rev 634) +++ trunk/sammoa-persistence/pom.xml 2012-10-13 06:32:33 UTC (rev 635) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-12 19:12:10 UTC (rev 634) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-13 06:32:33 UTC (rev 635) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r634 - trunk/sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 21:12:10 +0200 (Fri, 12 Oct 2012) New Revision: 634 Url: http://forge.codelutin.com/repositories/revision/sammoa/634 Log: optimize dependencies Modified: trunk/sammoa-ui-swing/pom.xml Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-12 19:03:27 UTC (rev 633) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-12 19:12:10 UTC (rev 634) @@ -74,6 +74,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency>

1 0

r633 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 21:03:27 +0200 (Fri, 12 Oct 2012) New Revision: 633 Url: http://forge.codelutin.com/repositories/revision/sammoa/633 Log: prepare release 1.0 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 2012-10-12 18:44:01 UTC (rev 632) +++ trunk/pom.xml 2012-10-12 19:03:27 UTC (rev 633) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc5-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-12 18:44:01 UTC (rev 632) +++ trunk/sammoa-application/pom.xml 2012-10-12 19:03:27 UTC (rev 633) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc5-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-12 18:44:01 UTC (rev 632) +++ trunk/sammoa-persistence/pom.xml 2012-10-12 19:03:27 UTC (rev 633) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc5-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-12 18:44:01 UTC (rev 632) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-12 19:03:27 UTC (rev 633) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc5-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r632 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 20:44:01 +0200 (Fri, 12 Oct 2012) New Revision: 632 Url: http://forge.codelutin.com/repositories/revision/sammoa/632 Log: clean poms + remove desbois from codelutin organisation 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 2012-10-12 18:31:21 UTC (rev 631) +++ trunk/pom.xml 2012-10-12 18:44:01 UTC (rev 632) @@ -55,9 +55,6 @@ <developer> <id>desbois</id> <name>Florian Desbois</name> - <email>desbois(a)codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> <roles> <role>developer</role> </roles> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-12 18:31:21 UTC (rev 631) +++ trunk/sammoa-application/pom.xml 2012-10-12 18:44:01 UTC (rev 632) @@ -2,10 +2,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> @@ -17,9 +13,6 @@ <name>SAMMOA :: Application</name> <description>Main application</description> - <properties> - </properties> - <dependencies>  Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-12 18:31:21 UTC (rev 631) +++ trunk/sammoa-persistence/pom.xml 2012-10-12 18:44:01 UTC (rev 632) @@ -2,10 +2,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-12 18:31:21 UTC (rev 631) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-12 18:44:01 UTC (rev 632) @@ -2,10 +2,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> @@ -359,9 +355,6 @@ </build> -  -  -  <profiles> <profile>

1 0

r631 - trunk
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 20:31:21 +0200 (Fri, 12 Oct 2012) New Revision: 631 Url: http://forge.codelutin.com/repositories/revision/sammoa/631 Log: fixes #1589: Updates to jaxx 2.5.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-12 12:00:41 UTC (rev 630) +++ trunk/pom.xml 2012-10-12 18:31:21 UTC (rev 631) @@ -118,7 +118,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.4</xworkVersion>

1 0

r630 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 14:00:41 +0200 (Fri, 12 Oct 2012) New Revision: 630 Url: http://forge.codelutin.com/repositories/revision/sammoa/630 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus (add log if shortcut not found) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 11:57:59 UTC (rev 629) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 12:00:41 UTC (rev 630) @@ -961,6 +961,11 @@ protected void putAction(String actionName, Action action) { getActionMap().put(actionName, action); KeyStroke keyStroke = context.getConfig().getShortCut(actionName); + if (keyStroke == null) { + if (logger.isWarnEnabled()) { + logger.warn("Shortcut not found for action " + actionName); + } + } getInputMap().put(keyStroke, actionName); }

1 0

r629 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 13:57:59 +0200 (Fri, 12 Oct 2012) New Revision: 629 Url: http://forge.codelutin.com/repositories/revision/sammoa/629 Log: revert bad commit Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 11:57:32 UTC (rev 628) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 11:57:59 UTC (rev 629) @@ -59,7 +59,6 @@ public TransectImportModel() { super(';'); - newIgnoredColumn("Shape_Leng"); newMandatoryColumn("Length", Transect.PROPERTY_LENGTH, Common.DOUBLE_PRIMITIVE

1 0

r628 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 13:57:32 +0200 (Fri, 12 Oct 2012) New Revision: 628 Url: http://forge.codelutin.com/repositories/revision/sammoa/628 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus (with correct file it works better...) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 11:30:58 UTC (rev 627) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 11:57:32 UTC (rev 628) @@ -960,8 +960,7 @@ protected void putAction(String actionName, Action action) { getActionMap().put(actionName, action); - ApplicationConfig applicationConfig = context.getConfig().getApplicationConfig(); - KeyStroke keyStroke = applicationConfig.getOptionAsKeyStroke("ui." + actionName); + KeyStroke keyStroke = context.getConfig().getShortCut(actionName); getInputMap().put(keyStroke, actionName); }

1 0

r627 - trunk/sammoa-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 13:30:58 +0200 (Fri, 12 Oct 2012) New Revision: 627 Url: http://forge.codelutin.com/repositories/revision/sammoa/627 Log: fixes #1587: Am?\195?\169liorer le controle du subjective condition Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 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-10-12 10:34:55 UTC (rev 626) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-12 11:30:58 UTC (rev 627) @@ -302,7 +302,7 @@ sammoa.validator.route.skyGlint.invalidRange=The sky glint must be between %1$s and %2$s sammoa.validator.route.subjectiveConditions.badLength=The subjective conditions must have %1$s characters (one letter for each side) sammoa.validator.route.subjectiveConditions.required=The subjective conditions is mandatory -sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be \: E for excellent, G for good, M for medium, P for poor +sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be\: E for excellent, G for good, M for medium, P for poor, L for Land, X for exceptional sammoa.validator.route.swell.invalidRange=The swell must be between %1$s and %2$s (0 means no swell) sammoa.validator.route.turbidity.unkownValue=The turbidity must be between 0 (clear water) and 2 (turbid water) or 9 for unkown sammoa.validator.transect.name.required=The transect name must be defined

1 0

r626 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: . io/input/map
by tchemit＠users.forge.codelutin.com Oct. 12, 2012

Oct. 12, 2012

Author: tchemit Date: 2012-10-12 12:34:55 +0200 (Fri, 12 Oct 2012) New Revision: 626 Url: http://forge.codelutin.com/repositories/revision/sammoa/626 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-10-11 02:55:56 UTC (rev 625) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-10-12 10:34:55 UTC (rev 626) @@ -241,6 +241,12 @@ return result; } + public KeyStroke getShortCut(String actionName) { + KeyStroke result = applicationConfig.getOptionAsKeyStroke( + "sammoa.ui." + actionName); + return result; + } + /** * @param topiaId {@link SammoaConfigOption#CAMPAIGN_ID} value * @since 0.2 Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-11 02:55:56 UTC (rev 625) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 10:34:55 UTC (rev 626) @@ -59,6 +59,7 @@ public TransectImportModel() { super(';'); + newIgnoredColumn("Shape_Leng"); newMandatoryColumn("Length", Transect.PROPERTY_LENGTH, Common.DOUBLE_PRIMITIVE

1 0