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

Build failed in Jenkins: sammoa-nightly » SAMMOA :: Persistence #8
by admin+ci-codelutin.com＠codelutin.com 23 May '14

23 May '14

See <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> Changes: [sbavencoff] refs #4768 : optimise validation action ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building SAMMOA :: Persistence 1.0.3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 12.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (2 KB at 3.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (1017 B at 43.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (1017 B at 5.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 32.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… (2 KB at 6.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (806 B at 35.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… (806 B at 2.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ sammoa-persistence --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ sammoa-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ sammoa-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ sammoa-persistence --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- eugene-maven-plugin:2.9-SNAPSHOT:generate (generate-entities) @ sammoa-persistence --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 21.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… (2 KB at 4.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 53.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (2 KB at 5.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 53.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (2 KB at 5.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 51.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (2 KB at 5.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 53.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/eugene… (2 KB at 3.2 KB/sec) [INFO] Process phase [zargo] [INFO] Generate one file in 126.814ms. [INFO] Process phase [xmi] [INFO] Generate one file in 892.735ms. [INFO] Process phase [model] WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:548) loadStereotype - Deprecated stereotype usage [fr.ulr.sammoa.persistence.Flight.attribute.transectFlight.stereotype] : indexed WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:656) getObjectElements - Invalid tagvalue [fr.ulr.sammoa.persistence.Observation.attribute.observerPosition.tagvalue.lazy] : Element 'observerPosition' of type 'attribute' on classifier 'fr.ulr.sammoa.persistence.Observation' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:351) loadModelTagValue - Invalid model tag value [model.tagValue.contextable] : this tagvalue 'contextable' can not be apply on the model. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:340) loadModelTagValue - Invalid model tag value [model.tagValue.generateStandaloneEnumForDAOHelper] : the tagvalue 'generateStandaloneEnumForDAOHelper' is unknown. [INFO] Process phase [generator] [INFO] Apply generator JavaEnumerationTransformer [INFO] Apply generator JavaInterfaceTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] Generate 82 files in 568.592ms. [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ sammoa-persistence --- [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ sammoa-persistence --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [WARNING] dependency [javax.transaction--jta--1.1] does not exist in project, remove it from the missing file. [WARNING] dependency [antlr--antlr--2.7.6] does not exist in project, remove it from the missing file. [INFO] Missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] Regenerate missing license file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ sammoa-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] Copying 13 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ sammoa-persistence --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] Scan 136 files header done in 501.87ms. [INFO] * uptodate header on 53 files. * add header on 83 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ sammoa-persistence --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[130,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[124,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[125,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[119,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[28,48] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[36,26] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[28,64] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[71,42] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[75,18] org.nuiton.topia.persistence.TopiaPersistenceHelper in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[136,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[130,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[145,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[139,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[115,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[109,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[159,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[153,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[224,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[218,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[141,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[135,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[145,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[139,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[191,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[185,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[135,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[129,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[155,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[149,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[133,30] getAggregate() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[127,30] getComposite() in org.nuiton.topia.persistence.TopiaEntityContextable has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>: Recompile with -Xlint:unchecked for details. [INFO] 34 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-persistenc…>:[28,8] cannot access org.nuiton.util.pagination.PaginationResult class file for org.nuiton.util.pagination.PaginationResult not found [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

Jenkins build is back to normal : sammoa-nightly » SAMMOA :: UI Swing #9
by admin+ci-codelutin.com＠codelutin.com 23 May '14

23 May '14

See <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/9/>

1 0

r677 - trunk
by sbavencoff＠users.forge.codelutin.com 23 May '14

23 May '14

Author: sbavencoff Date: 2014-05-23 08:46:55 +0200 (Fri, 23 May 2014) New Revision: 677 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/677 Log: use stable version of Topia 3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-22 09:01:35 UTC (rev 676) +++ trunk/pom.xml 2014-05-23 06:46:55 UTC (rev 677) @@ -115,7 +115,7 @@ <nuitonI18nVersion>3.1</nuitonI18nVersion> <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-4</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.4.178</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>

1 0

r676 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 22 May '14

22 May '14

Author: sbavencoff Date: 2014-05-22 11:01:35 +0200 (Thu, 22 May 2014) New Revision: 676 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/676 Log: refs #4768 : optimise validation action Added: trunk/sammoa-ui-swing/profiling.xml Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 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 2014-05-20 08:44:47 UTC (rev 675) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java 2014-05-22 09:01:35 UTC (rev 676) @@ -76,8 +76,6 @@ tx.commit(); - } catch (TopiaException ex) { - throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -100,9 +98,6 @@ transectFlight.setValid(valid); return result; - - } catch (TopiaException ex) { - throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -125,8 +120,6 @@ route.setValid(valid); return result; - } catch (TopiaException ex) { - throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -150,8 +143,6 @@ observation.setValid(valid); return result; - } catch (TopiaException ex) { - throw new TopiaException(ex); } finally { endTransaction(tx); } 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 2014-05-20 08:44:47 UTC (rev 675) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2014-05-22 09:01:35 UTC (rev 676) @@ -235,25 +235,40 @@ private static class InRoutePredicate implements Predicate<Observation> { - protected Route route; + protected Date begin; - protected Iterable<Route> routes; + protected Date end; - protected boolean ignoreDeleted; - public InRoutePredicate(Route route, Iterable<Route> routes, boolean ignoreDeleted) { Preconditions.checkNotNull(route); Preconditions.checkNotNull(routes); - this.route = route; - this.routes = routes; - this.ignoreDeleted = ignoreDeleted; + + if (ignoreDeleted) { + routes = Routes.filterNotDeleted(routes); + } + + Route previousRoute = route; + if (ignoreDeleted && route.isDeleted()) { + previousRoute = Routes.findPrevious(routes, route); + } + if (previousRoute == null) { + previousRoute = Routes.findNext(routes, route); + } + + Preconditions.checkNotNull(previousRoute); + + Route nextRoute = Routes.findNext(routes, previousRoute); + + begin = previousRoute.getBeginTime(); + end = nextRoute != null ? nextRoute.getBeginTime() : null; + } @Override public boolean apply(Observation input) { - return Observations.inRoute(input, route, routes, ignoreDeleted); + return Dates.inInterval(input.getObservationTime(), begin, end); } } Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-05-20 08:44:47 UTC (rev 675) +++ trunk/sammoa-ui-swing/pom.xml 2014-05-22 09:01:35 UTC (rev 676) @@ -134,6 +134,16 @@ <artifactId>jxlayer</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> +  <dependency> <groupId>org.nuiton</groupId> @@ -353,7 +363,7 @@ <configuration> <archive> <manifest> - <useUniqueVersions>true</useUniqueVersions> + <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> </manifest> Added: trunk/sammoa-ui-swing/profiling.xml =================================================================== --- trunk/sammoa-ui-swing/profiling.xml (rev 0) +++ trunk/sammoa-ui-swing/profiling.xml 2014-05-22 09:01:35 UTC (rev 676) @@ -0,0 +1,15 @@ +<!DOCTYPE aspectj PUBLIC + "-//AspectJ//DTD//EN" + "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> +<aspectj> + <weaver options="-verbose"/> + <aspects> + <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" + extends="org.nuiton.profiling.NuitonTrace"> + <pointcut name="executeMethod" + expression=" + execution(* org.nuiton..*(..)) + || execution(* fr.ulr.sammoa..*(..))"/> + </concrete-aspect> + </aspects> +</aspectj> \ No newline at end of file Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-20 08:44:47 UTC (rev 675) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-22 09:01:35 UTC (rev 676) @@ -99,7 +99,7 @@ boolean hasDeletedObservation = false; for (Route route : routes) { hasDeletedObservation |= Observations.isAnyDeletedFromRoute( - getModel().getObservations(), route, routes); + getModel().getObservations(), route, getModel().getRoutes()); } if (!hasDeletedObservation Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-05-20 08:44:47 UTC (rev 675) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-05-22 09:01:35 UTC (rev 676) @@ -44,12 +44,9 @@ <message>sammoa.validator.observation.species.required</message> </field-validator> - <field-validator type="speciesCode" short-circuit="true"> - <param name="keys">code</param> - <param name="mode">AT_LEAST_ONE</param> - <param name="useSensitiveContext">true</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ species.code == current.code ]]></param> + <![CDATA[ !species.localCreation ]]></param> <message>sammoa.validator.observation.unknown.species##${species.code}</message> </field-validator>

1 0

Build failed in Jenkins: sammoa-nightly » SAMMOA :: UI Swing #6
by admin+ci-codelutin.com＠codelutin.com 20 May '14

20 May '14

See <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/6/> ------------------------------------------ [...truncated 16 lines...] [INFO] use project compile scope class-path [INFO] Detects 13 modified jaxx file(s). [WARNING] JAXX detects 1 warning : <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> jaxx supports i18n, no need to add explicit call to I18n.t for attribute 'text' in component 'audioTime' : [dateFormat.format(model.getCurrentRoute().getBeginTime())] [INFO] Generated 13 file(s) in 6.086s [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ sammoa-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ sammoa-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ sammoa-ui-swing --- [INFO] Copying sammoa-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-ui-swing --- [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ sammoa-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ sammoa-ui-swing --- [INFO] collected 10 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ sammoa-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ sammoa-ui-swing --- [WARNING] bundle en_GB contains 5/566 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ sammoa-ui-swing --- [INFO] Will create or update license file [gpl_v3] to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ sammoa-ui-swing --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ sammoa-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 50 resources [INFO] Copying 2 resources [INFO] Copying 4 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ sammoa-ui-swing --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Scan 157 files header done in 504.97ms. [INFO] * uptodate header on 142 files. * add header on 15 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ sammoa-ui-swing --- [INFO] Compiling 116 source files to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[35,30] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[27,30] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[28,30] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[334,17] addOption(org.nuiton.config.ConfigOptionDef,java.lang.String) in jaxx.runtime.swing.config.model.ConfigUIModelBuilder has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[121,33] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[29,18] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[586,85] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[592,85] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[668,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[672,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[676,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[680,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[1102,58] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[1104,60] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[1125,54] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[61,46] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[836,36] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[838,37] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[846,34] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[847,35] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[402,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[415,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[419,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[423,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[621,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[634,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[638,21] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[71,77] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[77,57] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[179,77] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[192,57] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[220,38] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[157,41] getCurrentDirectory() in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[398,34] getSelectedValues() in javax.swing.JList has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[170,41] getCurrentDirectory() in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[42,25] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[80,44] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[96,48] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[158,39] getCurrentDirectory() in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[55,27] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[259,35] getCurrentDirectory() in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[268,25] setCurrentDirectory(java.io.File) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[271,29] getFile(java.lang.String,java.lang.String,java.awt.Component,java.lang.String...) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[275,17] setCurrentDirectory(java.io.File) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[294,35] getCurrentDirectory() in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[303,25] setCurrentDirectory(java.io.File) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[306,31] getDirectory(java.awt.Component,java.lang.String,java.lang.String) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[310,17] setCurrentDirectory(java.io.File) in org.nuiton.util.FileUtil has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:[54,34] fr.ulr.sammoa.ui.swing.SammoaColors in fr.ulr.sammoa.ui.swing has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ sammoa-ui-swing --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- maven-dependency-plugin:2.8:copy-dependencies (copy-dependencies) @ sammoa-ui-swing --- [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ sammoa-ui-swing --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ sammoa-ui-swing --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ sammoa-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ sammoa-ui-swing --- [INFO] Compiling 1 source file to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> uses unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ sammoa-ui-swing --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ulr.sammoa.ui.swing.BeanValidatorDetectorTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.167 sec - in fr.ulr.sammoa.ui.swing.BeanValidatorDetectorTest Results : Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ sammoa-ui-swing --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-ui-swing >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ sammoa-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ sammoa-ui-swing --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ sammoa-ui-swing --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-ui-swing <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-ui-swing --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ sammoa-ui-swing --- [INFO] 1 warning [WARNING] Javadoc Warnings [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…>:280: warning - @return tag has no arguments. [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ sammoa-ui-swing --- [INFO] [INFO] --- maven-assembly-plugin:2.4:single (default) @ sammoa-ui-swing --- [INFO] Reading assembly descriptor: src/main/assembly/bin.xml [INFO] Building zip: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-ui-swing/w…> [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ sammoa-ui-swing --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ sammoa-ui-swing --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect-artifacts.txt [INFO] Copying sammoa-ui-swing-1.0.3-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-ui-swing/sammoa-ui-swing-1.0.3-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-ui-swing/THIRD-PARTY.properties [INFO] Copying sammoa-ui-swing-1.0.3-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-ui-swing/sammoa-ui-swing-1.0.3-SNAPSHOT-sources.jar [INFO] Copying sammoa-ui-swing-1.0.3-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-ui-swing/sammoa-ui-swing-1.0.3-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ sammoa-ui-swing --- [INFO] Copying sammoa-ui-swing-1.0.3-SNAPSHOT-bin.zip to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-ui-swing/sammoa-ui-swing-1.0.3-SNAPSHOT-bin.zip [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ sammoa-ui-swing --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ sammoa-ui-swing --- [INFO] Used declared dependencies found: [INFO] fr.ulr:sammoa-persistence:jar:1.0.3-SNAPSHOT:compile [INFO] fr.ulr:sammoa-application:jar:1.0.3-SNAPSHOT:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] commons-collections:commons-collections:jar:3.2.1:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] commons-beanutils:commons-beanutils:jar:1.9.1:compile [INFO] joda-time:joda-time:jar:2.3:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [INFO] org.nuiton:nuiton-csv:jar:3.0-rc-1:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton.jaxx:jaxx-runtime:jar:2.8.5:compile [INFO] org.nuiton.jaxx:jaxx-widgets:jar:2.8.5:compile [INFO] org.nuiton.jaxx:jaxx-config:jar:2.8.5:compile [INFO] org.swinglabs:jxlayer:jar:3.0.4:compile [INFO] org.nuiton:nuiton-widgets:jar:1.1.1:compile [INFO] org.swinglabs.swingx:swingx-core:jar:1.6.5-1:compile [INFO] org.swinglabs.swingx:swingx-common:jar:1.6.5-1:compile [INFO] com.ezware.oxbow:swing-bits:jar:0.5.0:compile [INFO] org.nuiton.jaxx:jaxx-validator:jar:2.8.5:compile [INFO] org.nuiton:nuiton-validator:jar:3.0-rc-1:compile [INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.3:compile [INFO] com.bbn:openmap:jar:5.0.4:compile [INFO] org.slf4j:slf4j-api:jar:1.7.7:compile [INFO] org.slf4j:jcl-over-slf4j:jar:1.7.7:runtime [INFO] ch.qos.logback:logback-core:jar:1.1.2:compile [INFO] ch.qos.logback:logback-classic:jar:1.1.2:compile [INFO] junit:junit:jar:4.11:test [INFO] org.nuiton:nuiton-validator:jar:tests:3.0-rc-1:test [WARNING] Used undeclared dependencies found: [WARNING] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile [WARNING] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile [JENKINS] Archiving disabled

1 1

r675 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController 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/effort sammoa-ui-swing/src/main/resources sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/resources/i18n
by sbavencoff＠users.forge.codelutin.com 20 May '14

20 May '14

Author: sbavencoff Date: 2014-05-20 10:44:47 +0200 (Tue, 20 May 2014) New Revision: 675 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/675 Log: refs #4791 : on validation flight; show all geoPoint, indicate if observation's geo point is out of date. Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.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-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/FlightUIModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties trunk/sammoa-ui-swing/src/main/resources/logback.xml Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2014-05-20 08:44:47 UTC (rev 675) @@ -25,6 +25,7 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; +import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.Observer; import fr.ulr.sammoa.persistence.Position; @@ -105,6 +106,8 @@ registerJXPathDecorator(Region.class, "${code}$s"); registerMultiJXPathDecorator(Campaign.class, "${code}$s##${region/code}$s", "##", " - "); + registerJXPathDecorator(GeoPoint.class, "${recordTime}$tT => Lat ${latitude}$s - Lon ${longitude}$S"); + registerDecorator(new Decorator<Flight>(Flight.class) { private static final long serialVersionUID = 1L; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2014-05-20 08:44:47 UTC (rev 675) @@ -393,9 +393,6 @@ timeLog.log(startTime, "begin()", "Fired"); - } catch (TopiaException e) { - throw new TopiaException(e); - } finally { endTransaction(tx); } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2014-05-20 08:44:47 UTC (rev 675) @@ -101,6 +101,10 @@ return new WithDatePredicate(date); } + public static Predicate<GeoPoint> afterDate(Date date) { + return new AfterDatePredicate(date); + } + private static Function<GeoPoint, Date> TO_DATE_FUNCTION = new Function<GeoPoint, Date>() { @Override @@ -131,6 +135,20 @@ } } + private static class AfterDatePredicate implements Predicate<GeoPoint> { + + protected Date date; + + private AfterDatePredicate(Date date) { + this.date = date; + } + + @Override + public boolean apply(GeoPoint input) { + return date != null && (date.equals(input.getRecordTime()) || input.getRecordTime().after(date)); + } + } + private static class ToClosestPointFunction implements Function<Date, GeoPoint> { protected Date date; 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-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java 2014-05-20 08:44:47 UTC (rev 675) @@ -59,19 +59,22 @@ && species.getTopiaId() == null) { SpeciesTopiaDao speciesDAO = topiaDaoSupplier.getDao(Species.class, SpeciesTopiaDao.class); - Species existSpecies = speciesDAO.findByNaturalId(species.getCode(), species.getRegion()); - if (existSpecies == null) { + if (speciesDAO.existByNaturalId(species.getCode(), species.getRegion())) { + + Species existSpecies = speciesDAO.findByNaturalId(species.getCode(), species.getRegion()); + + logger.debug("Use existing species '{}'", existSpecies.getCode()); + + e.setSpecies(existSpecies); + + } else { + logger.debug("Create a new species '{}'", species.getCode()); species.setLocalCreation(true); speciesDAO.create(species); - } else { - - logger.debug("Use existing species '{}'", existSpecies.getCode()); - - e.setSpecies(existSpecies); } } 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-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java 2014-05-20 08:44:47 UTC (rev 675) @@ -115,7 +115,7 @@ ImmutableMap<String, Object> parameters = ImmutableMap.of( "flight", (Object) flight); - Integer queryResult = findFirstOrNull(hql, parameters ); + Integer queryResult = findAnyOrNull(hql, parameters ); int result = queryResult == null ? 1 : queryResult + 1; 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 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2014-05-20 08:44:47 UTC (rev 675) @@ -41,6 +41,7 @@ import com.bbn.openmap.proj.coords.LatLonPoint; import com.bbn.openmap.util.PropUtils; import com.google.common.base.Objects; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Strings; @@ -1315,6 +1316,23 @@ } } + protected void selectGeoPointFromTime(Date time) { + + Optional<GeoPoint> geoPointOptional = FluentIterable + .from(getModel().getGeoPoints()) + .filter(GeoPoints.afterDate(time)) + .first(); + + if (geoPointOptional.isPresent()) { + + int geoPointIndex = getModel().indexOfGeoPoint(geoPointOptional.get()); + SammoaUtil.selectTableRow(ui.getEffortPanel().getGeoPointTable(), geoPointIndex); + + } else { + SammoaUtil.unselectAll(ui.getEffortPanel().getGeoPointTable()); + } + } + protected GeoPoint ensureGeoPoint(Date date) { List<GeoPoint> modelPoints = getModel().getGeoPoints(); @@ -1384,6 +1402,9 @@ // Reset the ValidModel getValidModel().resetRouteValid(newValue); + + // set geo point + selectGeoPointFromTime(newValue.getBeginTime()); } } @@ -1405,6 +1426,9 @@ // Reset the ValidModel getValidModel().resetObservationValid(newValue); + + // set geo point + selectGeoPointFromTime(newValue.getObservationTime()); } } 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-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 2014-05-20 08:44:47 UTC (rev 675) @@ -491,4 +491,8 @@ this.validationMode = validationMode; firePropertyChange(PROPERTY_VALIDATION_MODE, oldValue, validationMode); } + + public int indexOfGeoPoint(GeoPoint geoPoint) { + return getGeoPoints().indexOf(geoPoint); + } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.css 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.css 2014-05-20 08:44:47 UTC (rev 675) @@ -162,3 +162,18 @@ _actionName: {"rightObservation"}; background: {SammoaColors.POSITION_RIGHT_COLOR}; } + +#geoPointTable { + model:{geoPointTableModel}; + selectionMode: {ListSelectionModel.SINGLE_SELECTION}; + selectionBackground: {null}; + selectionForeground: {Color.BLACK}; + sortable: false; + _terminateEditOnFocusLost: {true}; +} + +JSplitPane { + oneTouchExpandable: true; + continuousLayout: true; + dividerSize: 12; +} Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-20 08:44:47 UTC (rev 675) @@ -33,6 +33,7 @@ fr.ulr.sammoa.persistence.Route fr.ulr.sammoa.persistence.Observer fr.ulr.sammoa.persistence.Observation + fr.ulr.sammoa.persistence.GeoPoint fr.ulr.sammoa.ui.swing.SammoaColors fr.ulr.sammoa.ui.swing.flight.FlightUIModel @@ -74,6 +75,9 @@  + <GeoPointTableModel id='geoPointTableModel' + constructorParams='model'/> +  <BeanListValidator id='routeValidator' genericType='Route' initializer='BeanListValidator.newValidator(Route.class, null)'/> @@ -81,6 +85,9 @@ <BeanListValidator id='observationValidator' genericType='Observation' initializer='BeanListValidator.newValidator(Observation.class, null)'/> + <BeanListValidator id='geoPointValidator' genericType='GeoPoint' + initializer='BeanListValidator.newValidator(GeoPoint.class, null)'/> + <script><![CDATA[ protected void $afterCompleteSetup() { @@ -161,12 +168,16 @@ </row> <row> <cell fill='both' weightx='1.0' weighty='1.0' columns='4'> - <JScrollPane id='observationTableScroll'> - <JXTable id='observationTable' /> - </JScrollPane> + <JSplitPane> + <JScrollPane id='observationTableScroll'> + <JXTable id='observationTable' /> + </JScrollPane> + <JScrollPane id='geoPointTableScroll'> + <JXTable id='geoPointTable'/> + </JScrollPane> + </JSplitPane> </cell> </row> - </Table> </cell> </row> 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-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-20 08:44:47 UTC (rev 675) @@ -25,8 +25,11 @@ import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.google.common.base.Objects; +import com.google.common.base.Optional; import com.google.common.base.Supplier; +import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; @@ -34,6 +37,8 @@ import fr.ulr.sammoa.application.device.audio.AudioRecorder; import fr.ulr.sammoa.application.device.gps.GpsHandler; import fr.ulr.sammoa.application.flightController.FlightController; +import fr.ulr.sammoa.persistence.GeoPoint; +import fr.ulr.sammoa.persistence.GeoPoints; import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.ObservationStatus; import fr.ulr.sammoa.persistence.Observations; @@ -76,6 +81,8 @@ import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; @@ -97,9 +104,10 @@ import java.beans.PropertyChangeListener; import java.util.Date; import java.util.List; +import java.util.Set; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; /** * Handler of {@link EffortPanel} ui. @@ -120,6 +128,9 @@ public static final String OBSERVATION_VALIDATOR_CONTEXT_VALUE = "observationValidator"; + public static final String GEO_POINT_VALIDATOR_CONTEXT_VALUE = + "geoPointValidator"; + protected boolean comboIsAdjusting; private final SammoaUIContext context; @@ -175,6 +186,8 @@ initRouteTable(); initObservationTable(); + + initGeoPointTable(); } @@ -184,6 +197,7 @@ * @param validator the validator where to find bean states * @param editor the editor of beans * @param dataLocator the data locator + * @param isToValidate the predicate if bean is to validate (may be null) * @param scopes scopes to hightlight * @param <O> type of bean to validate * @since 2.5.3 @@ -191,15 +205,20 @@ public static <O> void addHightLighterOnEditor(BeanListValidator<O> validator, JXTable editor, SwingListValidatorDataLocator<O> dataLocator, + HighlightPredicate isToValidate, NuitonValidatorScope... scopes) { for (NuitonValidatorScope scope : scopes) { - SwingListValidatorHighlightPredicate<O> predicate = SwingListValidatorHighlightPredicate.newPredicate( + HighlightPredicate predicate = SwingListValidatorHighlightPredicate.newPredicate( scope, validator, dataLocator ); + if (isToValidate != null) { + predicate = new HighlightPredicate.AndHighlightPredicate(isToValidate, predicate); + } + Highlighter highlighter = SammoaUtil.newBackgroundColorHighlighter( predicate, SwingValidatorUtil.getColor(scope)); editor.addHighlighter(highlighter); @@ -406,6 +425,7 @@ validator, table, dataLocator, + null, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING ); @@ -625,6 +645,7 @@ validator, table, dataLocator, + null, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING ); @@ -640,6 +661,121 @@ } } + public void initGeoPointTable() { + JXTable table = ui.getGeoPointTable(); + + if (getModel().isValidationMode()) { + + SwingUtil.setI18nTableHeaderRenderer( + table, + n("sammoa.geoPoints.geoPointTable.column.recordTime"), + n("sammoa.geoPoints.geoPointTable.column.recordTime.tip"), + n("sammoa.geoPoints.geoPointTable.column.latitude"), + n("sammoa.geoPoints.geoPointTable.column.latitude.tip"), + n("sammoa.geoPoints.geoPointTable.column.longitude"), + n("sammoa.geoPoints.geoPointTable.column.longitude.tip"), + n("sammoa.geoPoints.geoPointTable.column.altitude"), + n("sammoa.geoPoints.geoPointTable.column.altitude.tip"), + n("sammoa.geoPoints.geoPointTable.column.speed"), + n("sammoa.geoPoints.geoPointTable.column.speed.tip"), + n("sammoa.geoPoints.geoPointTable.column.captureDelay"), + n("sammoa.geoPoints.geoPointTable.column.captureDelay.tip") + ); + + init(table, new SelectionModelAdapter<GeoPoint>() { + + @Override + public List<GeoPoint> getElements() { + return getModel().getGeoPoints(); + } + + @Override + public void setSelectedElement(GeoPoint element) { + + } + }); + + // Validation + BeanListValidator<GeoPoint> validator = ui.getGeoPointValidator(); + final GeoPointValidatorDataLocator dataLocator = + new GeoPointValidatorDataLocator(); + + JTable errorTable = ui.getErrorTable(); + SwingListValidatorMessageTableModel errorTableModel = ui.getErrorTableModel(); + + validator.setContext(getValidatorContext()); + getParentUI().setContextValue(validator, GEO_POINT_VALIDATOR_CONTEXT_VALUE); + + SwingValidatorUtil.registerListValidator( + validator, + errorTableModel, + table, + errorTable, + dataLocator + ); + + final Set<GeoPoint> geoPointsToValidate = Sets.newHashSet(); + + for (Observation observation : ui.getObservationTableModel().getBean()) { + Optional<GeoPoint> geoPointOptional = FluentIterable + .from(getModel().getGeoPoints()) + .filter(GeoPoints.afterDate(observation.getObservationTime())) + .first(); + + if (geoPointOptional.isPresent()) { + geoPointsToValidate.add(geoPointOptional.get()); + } + } + + validator.addAllBeans(geoPointsToValidate); + + + // listener + + // Refresh matching observations from selected route + getModel().addPropertyChangeListener( + FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + onObservationChanged((Observation) evt.getOldValue(), + (Observation) evt.getNewValue()); + } + } + ); + + table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter( + new GoePointForSelectedObservationHighlightPredicate(getModel()), + SammoaColors.OBSERVATION_FOR_ROUTE_ROW_COLOR) + ); + + addHightLighterOnEditor( + validator, + table, + dataLocator, + new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { + + int rowIndex = adapter.convertRowIndexToModel(adapter.row); + JTable component = (JTable) adapter.getComponent(); + Object bean = dataLocator.locateBean(component.getModel(), rowIndex); + + boolean result = geoPointsToValidate.contains(bean); + + return result; + } + }, + NuitonValidatorScope.ERROR, + NuitonValidatorScope.WARNING + ); + } else { + + ui.getGeoPointTableScroll().setVisible(false); + + } + } + public <T> void init(final JXTable table, SelectionModelAdapter<T> selectionModelAdapter) { @@ -698,6 +834,17 @@ // textField.setBorder(BasicBorders.getTextFieldBorder()); table.setDefaultEditor(int.class, editor); table.setDefaultEditor(Integer.class, editor); + + NumberCellEditor<Double> editorDouble = + JAXXWidgetUtil.newNumberTableCellEditor(Double.class, true); + editorDouble.getNumberEditor().setSelectAllTextOnError(true); + JTextField textFieldDouble = editorDouble.getNumberEditor().getTextField(); + textFieldDouble.addKeyListener(goNextCellAdapter); + textFieldDouble.setBorder(new LineBorder(Color.GRAY, 2)); +// textField.setBorder(BasicBorders.getTextFieldBorder()); + table.setDefaultEditor(double.class, editorDouble); + table.setDefaultEditor(Double.class, editorDouble); + } // Boolean @@ -993,6 +1140,38 @@ } } + private static class GeoPointValidatorDataLocator implements SwingListValidatorDataLocator<GeoPoint> { + + @Override + public boolean acceptType(Class<?> beanType) { + return GeoPoint.class.isAssignableFrom(beanType); + } + + @Override + public Pair<Integer, Integer> locateDataCell(TableModel tableModel, + GeoPoint bean, + String fieldName) { + GeoPointTableModel model = (GeoPointTableModel) tableModel; + + Pair<Integer, Integer> cell = + model.getCell(bean, fieldName); + return cell; + } + + @Override + public int locateBeanRowIndex(TableModel tableModel, GeoPoint bean) { + GeoPointTableModel model = (GeoPointTableModel) tableModel; + return model.getBeanIndex(bean); + } + + @Override + public GeoPoint locateBean(TableModel tableModel, int rowIndex) { + GeoPointTableModel model = + (GeoPointTableModel) tableModel; + return model.getBean(rowIndex); + } + } + public static class RouteForSelectedTransectFlightHighlightPredicate extends AbstractRowHighlightPredicate { protected FlightUIModel UIModel; @@ -1093,4 +1272,36 @@ return model.getRow(rowIndex); } } + + public static class GoePointForSelectedObservationHighlightPredicate extends AbstractRowHighlightPredicate { + + protected FlightUIModel UIModel; + + public GoePointForSelectedObservationHighlightPredicate(FlightUIModel UIModel) { + this.UIModel = UIModel; + } + + @Override + protected boolean isHighlighted(int rowIndex) { + + Observation observation = UIModel.getObservationEditBean(); + + boolean result; + if (observation != null) { + + GeoPoint geoPoint = getValueAt(rowIndex); + + result = observation.getObservationTime().equals(geoPoint.getRecordTime()); + + } else { + result = false; + } + return result; + } + + @Override + protected GeoPoint getValueAt(int rowIndex) { + return UIModel.getGeoPoints().get(rowIndex); + } + } } Added: 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 (rev 0) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java 2014-05-20 08:44:47 UTC (rev 675) @@ -0,0 +1,181 @@ +package fr.ulr.sammoa.ui.swing.flight.effort; + +import fr.ulr.sammoa.persistence.GeoPoint; +import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; +import fr.ulr.sammoa.ui.swing.util.SammoaUtil; +import jaxx.runtime.SwingUtil; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.table.AbstractTableModel; +import java.util.Date; +import java.util.List; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class GeoPointTableModel extends AbstractTableModel { + + private static final long serialVersionUID = 1L; + + protected FlightUIModel flightUIModel; + + public GeoPointTableModel(FlightUIModel flightUIModel) { + this.flightUIModel = flightUIModel; + } + + @Override + public int getRowCount() { + return getBean().size(); + } + + @Override + public int getColumnCount() { + return GeoPointColumn.values().length; + } + + @Override + public String getColumnName(int column) { + GeoPointColumn geoPointColumn = GeoPointColumn.valueOf(column); + return geoPointColumn.getColumnName(); + } + + @Override + public Class<?> getColumnClass(int column) { + GeoPointColumn geoPointColumn = GeoPointColumn.valueOf(column); + return geoPointColumn.getType(); + } + + @Override + public boolean isCellEditable(int row, int column) { + GeoPoint geoPoint = getBean(row); + GeoPointColumn geoPointColumn = GeoPointColumn.valueOf(column); + boolean result = geoPointColumn.isEditable(geoPoint, flightUIModel.isValidationMode()); + return result; + } + + @Override + public Object getValueAt(int row, int column) { + GeoPoint geoPoint = getBean(row); + GeoPointColumn geoPointColumn = GeoPointColumn.valueOf(column); + Object result = geoPointColumn.getValue(geoPoint); + return result; + } + + @Override + public void setValueAt(Object aValue, int row, int column) { + GeoPoint geoPoint = getBean(row); + GeoPointColumn geoPointColumn = GeoPointColumn.valueOf(column); + geoPointColumn.setValue(geoPoint, aValue); + fireTableRowsUpdated(row, row); + } + + public int getBeanIndex(GeoPoint bean) { + int row = getBean().indexOf(bean); + return row; + } + + public List<GeoPoint> getBean() { + return flightUIModel.getGeoPoints(); + } + + public GeoPoint getBean(int row) { + SwingUtil.ensureRowIndex(this, row); + GeoPoint bean = getBean().get(row); + return bean; + } + + public Pair<Integer, Integer> getCell(GeoPoint bean, String fieldName) { + + int row = getBeanIndex(bean); + int col = GeoPointColumn.getValueFromFieldName(fieldName).ordinal(); + + Pair<Integer, Integer> cell = Pair.of(row, col); + return cell; + } + + public FlightUIModel getFlightUIModel() { + return flightUIModel; + } + + + public enum GeoPointColumn { + + RECORD_TIME(false, Date.class, GeoPoint.PROPERTY_RECORD_TIME), + LATITUDE(true, double.class, GeoPoint.PROPERTY_LATITUDE), + LONGITUDE(true, double.class, GeoPoint.PROPERTY_LONGITUDE), + ALTITUDE(true, double.class, GeoPoint.PROPERTY_ALTITUDE), + SPEED(true, double.class, GeoPoint.PROPERTY_SPEED), + CAPTURE_DELAY(true, int.class, GeoPoint.PROPERTY_CAPTURE_DELAY); + + private boolean editable; + + private String[] beanProperties; + + private Class<?> type; + + private final String columnName; + + private GeoPointColumn(boolean editable, + Class<?> type, + String... beanProperties) { + this.editable = editable; + this.type = type; + this.beanProperties = beanProperties; + this.columnName = beanProperties[0]; + } + + public Class<?> getType() { + return type; + } + + public String getColumnName() { + return columnName; + } + + public int getColumnIndex() { + return ordinal(); + } + + public Object getValue(GeoPoint bean) { + Object result = SammoaUtil.getPropertyValue(bean, beanProperties); + return result; + } + + public void setValue(GeoPoint bean, Object value) { + if (type.isPrimitive() && value == null) { + // can not set a null value to a primitive field + } else { + SammoaUtil.setPropertyValue(bean, value, beanProperties); + } + } + + public boolean isEditable(GeoPoint bean, boolean validationMode) { + boolean result = editable && validationMode; + return result; + } + + public static GeoPointColumn valueOf(int ordinal) { + for (GeoPointColumn value : values()) { + if (ordinal == value.ordinal()) { + return value; + } + } + throw new EnumConstantNotPresentException(GeoPointColumn.class, + "ordinal=" + ordinal); + } + + public static GeoPointColumn getValueFromFieldName(String fieldName) { + GeoPointColumn result = null; + for (GeoPointColumn value : values()) { + if (fieldName.equals(value.columnName)) { + result = value; + break; + } + } + return result; + } + + + } + +} Added: 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 (rev 0) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-05-20 08:44:47 UTC (rev 675) @@ -0,0 +1,16 @@ +<?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"> +<validators> + + <field name="captureDelay"> + <field-validator type="int" short-circuit="true"> + <param name="max">5</param> + <message>sammoa.validator.observation.position.outOfDate</message> + </field-validator> + + </field> + +</validators> Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-05-20 08:44:47 UTC (rev 675) @@ -105,6 +105,18 @@ sammoa.flightPanel.table.column.position.left=Left sammoa.flightPanel.table.column.position.navigator=Nav sammoa.flightPanel.table.column.position.right=Right +sammoa.geoPoints.geoPointTable.column.altitude=Alt +sammoa.geoPoints.geoPointTable.column.altitude.tip=Altitude +sammoa.geoPoints.geoPointTable.column.captureDelay=delay +sammoa.geoPoints.geoPointTable.column.captureDelay.tip=Capture delay +sammoa.geoPoints.geoPointTable.column.latitude=Lat +sammoa.geoPoints.geoPointTable.column.latitude.tip=Latitude +sammoa.geoPoints.geoPointTable.column.longitude=Lon +sammoa.geoPoints.geoPointTable.column.longitude.tip=Longitude +sammoa.geoPoints.geoPointTable.column.recordTime=Time +sammoa.geoPoints.geoPointTable.column.recordTime.tip=Time +sammoa.geoPoints.geoPointTable.column.speed=Speed +sammoa.geoPoints.geoPointTable.column.speed.tip=Speed sammoa.importApplication.flightTable.column.flightExist=Flight exist sammoa.importApplication.flightTable.column.flightExist.tip=Flight exist sammoa.importApplication.flightTable.column.flightName=Flight name @@ -291,6 +303,7 @@ sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface sammoa.validator.observation.decAngle.invalidRange=The angle must be between %1$s and %2$s degrees or for the band \: 1 (in the band), 2 (outside the band), 3 (put in the band) sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s +sammoa.validator.observation.position.outOfDate=capture delay is out of date sammoa.validator.observation.species.required=The species is mandatory sammoa.validator.observation.swimDir.invalidRange=The swim direction must be between %1$s and %2$s degrees sammoa.validator.observation.unknown.species=The species with code %s does not exist in referential Modified: trunk/sammoa-ui-swing/src/main/resources/logback.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-19 07:34:49 UTC (rev 674) +++ trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-20 08:44:47 UTC (rev 675) @@ -49,7 +49,7 @@ <logger name="fr.ulr.sammoa" level="INFO"/> - <logger name="fr.ulr.sammoa.application.device.gps" level="TRACE"/> +  <root level="ERROR">

1 0

Build failed in Jenkins: sammoa-nightly » SAMMOA :: Application #5
by admin+ci-codelutin.com＠codelutin.com 19 May '14

19 May '14

See <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> Changes: [sbavencoff] refs #4755 : show location and changed detection off line GPS [sbavencoff] update version [Arnaud Thimel] Fix getImplementationClasses() in SammoaDatabase [sbavencoff] update version [Arnaud Thimel] Fix ExportMapServiceTest migration [Arnaud Thimel] Update version ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building SAMMOA :: Application 1.0.3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 18.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… (2 KB at 7.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (4 KB at 149.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/sammoa-group/org/nuiton/topia/… (4 KB at 144.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (42 KB at 1390.0 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ sammoa-application --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ sammoa-application --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ sammoa-application --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ sammoa-application --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ sammoa-application --- [INFO] Will create or update license file [gpl_v3] to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ sammoa-application --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [WARNING] dependency [javax.transaction--jta--1.1] does not exist in project, remove it from the missing file. [WARNING] dependency [antlr--antlr--2.7.6] does not exist in project, remove it from the missing file. [INFO] Missing file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] Regenerate missing license file <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ sammoa-application --- [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-application >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ sammoa-application --- [INFO] Copying sammoa-application.properties to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-application <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ sammoa-application --- [WARNING] bundle en_GB contains 1/53 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ sammoa-application --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ sammoa-application --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] Scan 88 files header done in 370.771ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ sammoa-application --- [INFO] Compiling 79 source files to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ sammoa-application --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ sammoa-application --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ sammoa-application --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ sammoa-application --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ sammoa-application --- [INFO] Compiling 6 source files to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> uses unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ sammoa-application --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ulr.sammoa.application.io.input.csv.ImportCsvServiceTest 2014-05-17 01:01:26,709 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@42c5898a[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@44bdd4d8,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:26,828 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:28,111 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:29,578 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.io.input.csv.ImportCsvService@205d3b06 2014-05-17 01:01:29,598 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.903 sec - in fr.ulr.sammoa.application.io.input.csv.ImportCsvServiceTest Running fr.ulr.sammoa.application.FlightServiceTest 2014-05-17 01:01:30,141 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@23d100f2[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@6e95223c,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:30,144 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:30,378 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:30,640 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@3e116ca2 2014-05-17 01:01:30,647 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:30,805 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 1 for campaign PACOMM 2014-05-17 01:01:30,813 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@7dbd9915[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@2a8d7231[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,816 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 2 for campaign PACOMM 2014-05-17 01:01:30,818 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@b8a7546[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@2f194c95[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,818 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@25f2e25b[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@2f194c95[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,820 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 3 for campaign PACOMM 2014-05-17 01:01:30,822 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@33c38a88[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6abc0144[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,822 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@5cf74e1a[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6abc0144[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,822 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@7028bca4[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6abc0144[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:30,940 INFO [main] fr.ulr.sammoa.application.FlightService [:339] : Delete flight fr.ulr.sammoa.persistence.Flight_c35e9dbf-9498-42fe-bb31-74d469480e95 2014-05-17 01:01:31,004 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@673578d9[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6791237e[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:31,005 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@69b15a50[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6791237e[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:31,005 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@7aa07065[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6791237e[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:31,192 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@1b22e5be[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@10192add,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:31,194 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:31,328 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:31,702 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@21c96b27 2014-05-17 01:01:31,713 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:31,906 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 18 for campaign PACOMM 2014-05-17 01:01:31,908 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@5e78d934[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@4ffc1560[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:31,909 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@51ed4054[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@2f1a74d1,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:31,911 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:32,053 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:32,302 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@49492c45 2014-05-17 01:01:32,307 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:32,409 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 1 for campaign PACOMM 2014-05-17 01:01:32,411 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@549a4267[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@5b7da395[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:32,456 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@7601e2f3[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@75dafc0b,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:32,459 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:32,582 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:32,850 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@480057f5 2014-05-17 01:01:32,855 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:32,967 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@32f0a2bd[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@544c406b,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:32,969 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:33,067 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:33,244 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@7c776caa 2014-05-17 01:01:33,249 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:33,324 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 124 for campaign PACOMM 2014-05-17 01:01:33,326 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@73e5ce92[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@745d0eaf[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:33,328 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@10bcf083[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@6452310a,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:33,330 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:33,414 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:33,594 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@19466564 2014-05-17 01:01:33,600 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:33,693 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 1 for campaign PACOMM 2014-05-17 01:01:33,694 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@1bbe65a[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@57101f99[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.623 sec - in fr.ulr.sammoa.application.FlightServiceTest Running fr.ulr.sammoa.application.output.map.ExportMapServiceTest 2014-05-17 01:01:33,766 INFO [main] fr.ulr.sammoa.application.SammoaConfig [:102] : fr.ulr.sammoa.application.SammoaConfigMock@20e9df17[flightNumber=0,applicationConfig=org.nuiton.config.ApplicationConfig@5a356fe2,gpsConfig=<null>,audioConfig=<null>] is initializing... 2014-05-17 01:01:33,768 INFO [main] fr.ulr.sammoa.application.SammoaDatabase [:124] : Use jdbc:h2:<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:33,861 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:34,025 WARN [main] org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl [:93] : HHH000402: Using Hibernate built-in connection pool (not for production use!) 2014-05-17 01:01:34,116 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.FlightService@39d61fe4 2014-05-17 01:01:34,121 INFO [main] fr.ulr.sammoa.application.FlightService [:218] : Create new flight 1 for campaign PACOMM 2014-05-17 01:01:34,123 INFO [main] fr.ulr.sammoa.application.io.CampaignStorage [:154] : Add flightStorage fr.ulr.sammoa.application.io.FlightStorage@28a3231f[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> to store fr.ulr.sammoa.application.io.CampaignStorage@6e56dd10[directory=<http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…]> 2014-05-17 01:01:34,134 INFO [main] fr.ulr.sammoa.application.SammoaContext [:75] : New service fr.ulr.sammoa.application.io.output.map.ExportMapService@2ea1c3a6 2014-05-17 01:01:34,134 INFO [main] fr.ulr.sammoa.application.io.output.map.ExportMapService [:581] : Start GeoPointsMap export to <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> 2014-05-17 01:01:34,404 INFO [main] fr.ulr.sammoa.application.io.output.map.ExportMapService [:620] : Export GeoPoints from flight 1 - A - PACOMM - FRANCE Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.961 sec - in fr.ulr.sammoa.application.output.map.ExportMapServiceTest Running fr.ulr.sammoa.application.output.map.DbfTimestampConverterTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in fr.ulr.sammoa.application.output.map.DbfTimestampConverterTest Results : Tests run: 10, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ sammoa-application --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-application >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ sammoa-application --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ sammoa-application --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ sammoa-application --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-application <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ sammoa-application --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ sammoa-application --- [INFO] 7 warnings [WARNING] Javadoc Warnings [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:41: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:41: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:42: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:42: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:42: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:41: warning - Tag @link: reference not found: AudioFileFormat.Type [WARNING] <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…>:42: warning - Tag @link: reference not found: AudioFileFormat.Type [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/sammoa-nightly/fr.ulr$sammoa-applicatio…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ sammoa-application --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ sammoa-application --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ sammoa-application --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect-artifacts.txt [INFO] Copying sammoa-application-1.0.3-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-application/sammoa-application-1.0.3-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-application/THIRD-PARTY.properties [INFO] Copying sammoa-application-1.0.3-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-application/sammoa-application-1.0.3-SNAPSHOT-sources.jar [INFO] Copying sammoa-application-1.0.3-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/sammoa-nightly/trunk/target/collect/fr.ulr--sammoa-application/sammoa-application-1.0.3-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ sammoa-application --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ sammoa-application --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ sammoa-application --- [INFO] Used declared dependencies found: [INFO] fr.ulr:sammoa-persistence:jar:1.0.3-SNAPSHOT:compile [INFO] org.dinopolis.gpstool:gpsinput:jar:0.5.3:compile [INFO] com.neuronrobotics:nrjavaserial:jar:3.7.5.1:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] joda-time:joda-time:jar:2.3:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-service-csv:jar:3.0-SNAPSHOT:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.slf4j:slf4j-api:jar:1.7.7:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-rc-2:compile [INFO] org.nuiton:nuiton-csv:jar:3.0-rc-1:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile [INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile [INFO] com.bbn:openmap:jar:5.0.4:compile [INFO] junit:junit:jar:4.11:test [WARNING] Used undeclared dependencies found: [WARNING] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [WARNING] Unused declared dependencies found: [WARNING] commons-collections:commons-collections:jar:3.2.1:compile [JENKINS] Archiving disabled

1 1

r674 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io: input/application output/application
by sbavencoff＠users.forge.codelutin.com 19 May '14

19 May '14

Author: sbavencoff Date: 2014-05-19 09:34:49 +0200 (Mon, 19 May 2014) New Revision: 674 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/674 Log: replace to constant Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-19 07:30:54 UTC (rev 673) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-19 07:34:49 UTC (rev 674) @@ -30,6 +30,7 @@ import org.nuiton.csv.Import; import org.nuiton.csv.ImportModel; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; @@ -97,7 +98,7 @@ propertyName, TopiaCsvCommons.DAY_TIME_SECOND_MILI_WITH_TIMESTAMP); // TODO bavencoff replace with constante in TopiaEntityContextable - } else if (! propertyName.equals("topiaDaoSupplier")){ + } else if (! propertyName.equals(TopiaEntityContextable.PROPERTY_TOPIA_DAO_SUPPLIER)){ model.addDefaultColumn(propertyName, type); } } else { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-19 07:30:54 UTC (rev 673) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-19 07:34:49 UTC (rev 674) @@ -46,6 +46,7 @@ import org.apache.commons.io.IOUtils; import org.nuiton.csv.ExportModel; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; @@ -106,8 +107,7 @@ model.newColumnForImportExport( propertyName, TopiaCsvCommons.DAY_TIME_SECOND_MILI_WITH_TIMESTAMP); - // TODO bavencoff replace with constante in TopiaEntityContextable - } else if (! propertyName.equals("topiaDaoSupplier")){ + } else if (! propertyName.equals(TopiaEntityContextable.PROPERTY_TOPIA_DAO_SUPPLIER)){ model.addDefaultColumn(propertyName, type); } }

1 0

r673 - in trunk: sammoa-application sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 19 May '14

19 May '14

Author: sbavencoff Date: 2014-05-19 09:30:54 +0200 (Mon, 19 May 2014) New Revision: 673 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/673 Log: refactor transaction flush Modified: trunk/sammoa-application/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/pom.xml 2014-05-19 07:30:54 UTC (rev 673) @@ -72,11 +72,6 @@ <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> -  <dependency> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-19 07:30:54 UTC (rev 673) @@ -156,7 +156,7 @@ } } - persistence.flushTransaction(sammoaTopiaPersistenceContext); + sammoaTopiaPersistenceContext.flush(); startTime = timeLog.log(startTime, "importDb", "after flights delete"); @@ -239,7 +239,7 @@ } // need to flush session (otherwise object are not accessible by a find ?) - persistence.flushTransaction(tx); + tx.flush(); for (Map.Entry<AssociationMeta<SammoaEntityEnum>, File> entry : associationMap.entrySet()) { AssociationMeta<SammoaEntityEnum> meta = entry.getKey(); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-19 07:30:54 UTC (rev 673) @@ -93,7 +93,7 @@ } protected void flushTransaction() throws TopiaException { - tx.getHibernateSupport().getHibernateSession().flush();; + tx.flush(); } } 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-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-19 07:30:54 UTC (rev 673) @@ -21,4 +21,8 @@ return firesSupport; } + public void flush() { + getHibernateSupport().getHibernateSession().flush(); + } + } //SammoaTopiaPersistenceContext

1 0

r672 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard sammoa-ui-swing/src/main/resources/i18n
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 17:55:47 +0200 (Fri, 16 May 2014) New Revision: 672 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/672 Log: refs #4755 : show location and changed detection off line GPS Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.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/device/gps/BaseGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-05-16 15:55:47 UTC (rev 672) @@ -65,6 +65,8 @@ protected Set<GpsLocationListener> gpsLocationListeners; /** To test if connection to device is effective. */ + protected long lastEventTime; + protected DeviceState state; protected GpsConfig config; @@ -75,18 +77,17 @@ * Value to check the number of timer update failures before the DeviceState * becomes {@link DeviceState#ERROR} */ - protected int nbFailuresMax; + protected long maxLastEventDelays; public BaseGpsHandler(GpsConfig config) { this.config = config; this.state = DeviceState.UNAVAILABLE; this.deviceStateListeners = Sets.newHashSet(); this.gpsLocationListeners = Sets.newHashSet(); - this.nbFailuresMax = - (int) Math.ceil(config.getTimeout() / config.getCheckPeriod()); + this.maxLastEventDelays = config.getTimeout() * 1000; if (logger.isDebugEnabled()) { - logger.debug("GPS NbFailuresMax = " + nbFailuresMax); + logger.debug("GPS maxLastEventDelays = " + maxLastEventDelays); } } @@ -247,8 +248,6 @@ protected GeoPoint lastLocation; - protected int nbFailures; - @Override public void run() { @@ -256,23 +255,19 @@ boolean sameLocation = GeoPoints.equal(location, lastLocation); + long lastEventDelays = System.currentTimeMillis() - lastEventTime; + if (logger.isTraceEnabled()) { - logger.trace("sameLocation={} [{} :: {}]", new Object[]{sameLocation, location, lastLocation}); + logger.trace("sameLocation = {} [{} :: {}], lastEventDelays= {} ms", + new Object[]{sameLocation, location, lastLocation, lastEventDelays}); } - // reset nbFailures if location hasn't changed - if (sameLocation) { - nbFailures++; - } else { - nbFailures = 0; - } + boolean offLine = lastEventDelays > maxLastEventDelays; -// location.setCaptureDelay(nbFailures * config.getCheckPeriod()); - // Data is unavailable - if (GeoPoints.isCoordinatesEmpty(location) || sameLocation && nbFailures >= nbFailuresMax) { + if (GeoPoints.isCoordinatesEmpty(location) || offLine) { - DeviceTechnicalException error = onError(location); + DeviceTechnicalException error = onError(location, offLine); setState(DeviceState.ERROR, error); @@ -291,5 +286,5 @@ } }; - protected abstract DeviceTechnicalException onError(GeoPoint location); + protected abstract DeviceTechnicalException onError(GeoPoint location, boolean offline); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java 2014-05-16 15:55:47 UTC (rev 672) @@ -107,7 +107,7 @@ } @Override - protected DeviceTechnicalException onError(GeoPoint location) { + protected DeviceTechnicalException onError(GeoPoint location, boolean offline) { return null; } 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 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2014-05-16 15:55:47 UTC (rev 672) @@ -213,7 +213,7 @@ // } @Override - protected DeviceTechnicalException onError(GeoPoint location) { + protected DeviceTechnicalException onError(GeoPoint location, boolean offLine) { DeviceTechnicalException result = null; @@ -233,24 +233,22 @@ if (!opened) { start(); - } else { + } else if (offLine) { - if (GeoPoints.isCoordinatesEmpty(location)) { + result = new DeviceTechnicalException( + this, "GPS signal lost, please check the connection port"); - result = new DeviceTechnicalException( - this, "GPS is not ready, turn it on or wait for it to find satellites"); + } else if (GeoPoints.isCoordinatesEmpty(location)) { - } else { + result = new DeviceTechnicalException( + this, "GPS is not ready, turn it on or wait for it to find satellites"); - if (lastNumberSatellites == 0) { - result = new DeviceTechnicalException( - this, "GPS signal lost, there is no available satellite found"); + } else if (lastNumberSatellites == 0) { - } else { - result = new DeviceTechnicalException( - this, "GPS signal lost, please check the connection port"); - } - } + result = new DeviceTechnicalException( + this, "GPS signal lost, there is no available satellite found"); + + } return result; } @@ -335,6 +333,8 @@ } else if (GPSDataProcessor.NUMBER_SATELLITES.equals(property)) { lastNumberSatellites = (Integer) evt.getNewValue(); } + + lastEventTime = System.currentTimeMillis(); } }; } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-16 15:55:47 UTC (rev 672) @@ -96,7 +96,8 @@ model.newColumnForImportExport( propertyName, TopiaCsvCommons.DAY_TIME_SECOND_MILI_WITH_TIMESTAMP); - } else { + // TODO bavencoff replace with constante in TopiaEntityContextable + } else if (! propertyName.equals("topiaDaoSupplier")){ model.addDefaultColumn(propertyName, type); } } else { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-16 15:55:47 UTC (rev 672) @@ -106,7 +106,8 @@ model.newColumnForImportExport( propertyName, TopiaCsvCommons.DAY_TIME_SECOND_MILI_WITH_TIMESTAMP); - } else { + // TODO bavencoff replace with constante in TopiaEntityContextable + } else if (! propertyName.equals("topiaDaoSupplier")){ model.addDefaultColumn(propertyName, type); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.css 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.css 2014-05-16 15:55:47 UTC (rev 672) @@ -84,7 +84,7 @@ text: "sammoa.statusBar.audio"; } -#indicatorPanel { +#indicatorPanel, #indicatorPanel2 { background: {model.getEffortPanelColor()}; } @@ -95,3 +95,11 @@ #lblSpeed { text: {model.getSpeed()}; } + +#lblLat { + text: {model.getLatitude()}; +} + +#lblLong { + text: {model.getLongitude()}; +} Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.jaxx 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBar.jaxx 2014-05-16 15:55:47 UTC (rev 672) @@ -96,6 +96,13 @@ <cell fill='horizontal' weightx='0.2' anchor='center'> <JPanel id='indicatorPanel' layout='{new BoxLayout(indicatorPanel, BoxLayout.Y_AXIS)}'> + <JLabel id='lblLat'/> + <JLabel id='lblLong'/> + </JPanel> + </cell> + <cell fill='horizontal' weightx='0.2' anchor='center'> + <JPanel id='indicatorPanel2' + layout='{new BoxLayout(indicatorPanel2, BoxLayout.Y_AXIS)}'> <JLabel id='lblAlt'/> <JLabel id='lblSpeed'/> </JPanel> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 15:55:47 UTC (rev 672) @@ -38,18 +38,46 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_LATITUDE = "latitude"; + + public static final String PROPERTY_LONGITUDE = "longitude"; + public static final String PROPERTY_ALT = "alt"; public static final String PROPERTY_SPEED = "speed"; public static final String PROPERTY_EFFORT_PANEL_COLOR = "effortPanelColor"; + protected float latitude; + + protected float longitude; + protected float alt; protected float speed; protected Color effortPanelColor; + public String getLatitude() { + return t("sammoa.statusbar.latitude", latitude); + } + + public void setLatitude(float latitude) { + float oldValue = this.latitude; + this.latitude = latitude; + firePropertyChange(PROPERTY_LATITUDE, oldValue, latitude); + } + + public String getLongitude() { + return t("sammoa.statusbar.longitude", longitude); + } + + public void setLongitude(float longitude) { + float oldValue = this.longitude; + this.longitude = longitude; + firePropertyChange(PROPERTY_LONGITUDE, oldValue, longitude); + } + public String getAlt() { return t("sammoa.statusbar.alt", alt); } @@ -84,6 +112,8 @@ public void locationChanged(GpsLocationEvent event) { GeoPoint newLocation = event.getNewValue(); if (newLocation != null) { + setLatitude((float) newLocation.getLatitude()); + setLongitude((float) newLocation.getLongitude()); setSpeed((float) newLocation.getSpeed()); setAlt((float) newLocation.getAltitude()); } Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-05-16 09:50:33 UTC (rev 671) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-05-16 15:55:47 UTC (rev 672) @@ -257,7 +257,9 @@ sammoa.observations.routeTable.column.unexpectedRight.tip=Right sammoa.statusBar.audio=Audio sammoa.statusBar.gps=GPS -sammoa.statusbar.alt=Alt %1$s ft +sammoa.statusbar.alt=Alt %1$s m +sammoa.statusbar.latitude=Lat %1$s° +sammoa.statusbar.longitude=Lon %1$s° sammoa.statusbar.speed=Speed %1$s km/h sammoa.strate.decorator.all=All strates sammoa.strate.decorator.strate=Strate %1$s

1 0