January 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1547 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 19:42:25 +0100 (Thu, 30 Jan 2014) New Revision: 1547 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1547 Log: [maven-release-plugin] prepare release tutti-3.1 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 18:38:55 UTC (rev 1546) +++ trunk/pom.xml 2014-01-30 18:42:25 UTC (rev 1547) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 18:38:55 UTC (rev 1546) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 18:42:25 UTC (rev 1547) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 18:38:55 UTC (rev 1546) +++ trunk/tutti-persistence/pom.xml 2014-01-30 18:42:25 UTC (rev 1547) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 18:38:55 UTC (rev 1546) +++ trunk/tutti-service/pom.xml 2014-01-30 18:42:25 UTC (rev 1547) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 18:38:55 UTC (rev 1546) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 18:42:25 UTC (rev 1547) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1546 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/util/auth resources/i18n
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 19:38:55 +0100 (Thu, 30 Jan 2014) New Revision: 1546 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1546 Log: must always the actionUI to be there Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-30 16:54:01 UTC (rev 1545) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-30 18:38:55 UTC (rev 1546) @@ -819,15 +819,6 @@ return actionUI; } - public ApplicationActionUI getExistingActionUIWhenMainUINotNull() { - ApplicationActionUI result = null; - if (mainUI != null) { - result = getExistingActionUI(); - } - return result; - } - - public void setActionUI(ApplicationActionUI actionUI) { this.actionUI = actionUI; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-30 16:54:01 UTC (rev 1545) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-30 18:38:55 UTC (rev 1546) @@ -31,7 +31,7 @@ <script><![CDATA[ public LoginUI(TuttiUIContext context) { - super(context.getExistingActionUIWhenMainUINotNull()); + super(context.getExistingActionUI()); TuttiUIUtil.setApplicationContext(this, context); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-30 16:54:01 UTC (rev 1545) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-30 18:38:55 UTC (rev 1546) @@ -1180,7 +1180,7 @@ tutti.help.mkDir.error=Erreur à la création du dossier d'aide tutti.i18n.deleteCache.error=Erreur à la suppression du cache de l'internationalisation tutti.i18n.mkDir.error=Erreur à la création du dossier d'internationalisation -tutti.ichtyometer.choose.remote.device.found=<html><body>Veuillez choisir le périphérique bluetooth qui correspond à l'ichtyomètre parmis ceux détectés. Si vous ne trouvez pas votre périphérique, vous pouvez modifier dans la configuration l'option Application :: Recherche complête bluetooth puis retenter une connexion.</body></html> +tutti.ichtyometer.choose.remote.device.found=<html><body>Veuillez choisir le périphérique bluetooth qui correspond à l'ichtyomètre parmis ceux détectés. Si vous ne trouvez pas votre périphérique, vous pouvez modifier dans la configuration l'option Application \:\: Recherche complête bluetooth puis retenter une connexion.</body></html> tutti.ichtyometer.connection.establish=Connexion à l'ichtyomètre %s établie tutti.ichtyometer.connection.establish.message=<html><body>La connexion à l'ichtyomètre %s est établie. Important\: Pensez à configurer l'appareil en unité millimètre.</body></html> tutti.ichtyometer.connection.establish.title=Connexion établie

1 0

[ANN] - Tutti 3.1 released
by forge.codelutin.com Release Notification 30 Jan '14

30 Jan '14

The Tutti team is pleased to announce the tutti-3.1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [IMPORT GENERIQUE] faire quotation pour import dans TUTTI du format générique Issue: 2505. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Requête d'accès au référentiel Personne Issue: 4196. Thanks to Christian BONNET. Resolved by tchemit. o Import de données depuis un ichtyomètre (par lot) Issue: 3876. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] demande d'évolutions Issue: 4135. Thanks to Vincent BADTS. Resolved by tchemit. o Ajout de message d'erreur si une mise à jour ne se déroule pas bien Issue: 4257. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Sécuriser les accès au site de données Issue: 4130. Thanks to Tony Chemit. Resolved by tchemit. o Import des mensurations en continue depuis un ichtyomètre Issue: 3875. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAPTURE] Mauvais focus suite à une élévation de poids Issue: 4151. Thanks to Tony Chemit. Resolved by tchemit. o [AIDE] Manque aide pour Action + ou - sur l'écran Issue: 4150. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOLE] erreur après import protocole (d'avant 3.0), changement nom, et enregistrement. Urgent car bloque création protocole Issue: 4145. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Mise à jour de référentiel - Erreur sur les données suite à la mise à jour Issue: 4149. Thanks to Christian BONNET. Resolved by tchemit. o [REFERENTIEL] plus de code rubin associé au référentiel des espèces Issue: 4146. Thanks to Vincent BADTS. Resolved by tchemit. o [REFERENTIEL] Problème si des espèces sont supprimés Issue: 4154. Thanks to Tony Chemit. Resolved by tchemit. Changes: o [SPECS] Fournir la documentation sur le format générique Issue: 3939. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-3.1-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1386 * tutti-3.1-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1387 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1545 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 17:54:01 +0100 (Thu, 30 Jan 2014) New Revision: 1545 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1545 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 16:53:43 UTC (rev 1544) +++ trunk/pom.xml 2014-01-30 16:54:01 UTC (rev 1545) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 16:53:43 UTC (rev 1544) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 16:54:01 UTC (rev 1545) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 16:53:43 UTC (rev 1544) +++ trunk/tutti-persistence/pom.xml 2014-01-30 16:54:01 UTC (rev 1545) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 16:53:43 UTC (rev 1544) +++ trunk/tutti-service/pom.xml 2014-01-30 16:54:01 UTC (rev 1545) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 16:53:43 UTC (rev 1544) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 16:54:01 UTC (rev 1545) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1544 - tags
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 17:53:43 +0100 (Thu, 30 Jan 2014) New Revision: 1544 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1544 Log: [maven-release-plugin] copy for tag tutti-3.1 Added: tags/tutti-3.1/

1 0

r1543 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 17:53:22 +0100 (Thu, 30 Jan 2014) New Revision: 1543 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1543 Log: [maven-release-plugin] prepare release tutti-3.1 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 15:43:47 UTC (rev 1542) +++ trunk/pom.xml 2014-01-30 16:53:22 UTC (rev 1543) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 15:43:47 UTC (rev 1542) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 16:53:22 UTC (rev 1543) @@ -21,14 +21,13 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 15:43:47 UTC (rev 1542) +++ trunk/tutti-persistence/pom.xml 2014-01-30 16:53:22 UTC (rev 1543) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 15:43:47 UTC (rev 1542) +++ trunk/tutti-service/pom.xml 2014-01-30 16:53:22 UTC (rev 1543) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 15:43:47 UTC (rev 1542) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 16:53:22 UTC (rev 1543) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1542 - in trunk: tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/resources/i18n tutti-ui-swing/src/main/help/fr tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action tutti-ui-swing/src/main/java/fr/
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 16:43:47 +0100 (Thu, 30 Jan 2014) New Revision: 1542 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1542 Log: fixes #3875: Import des mensurations en continue depuis un ichtyom?\195?\168tre Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/help/fr/menu.html trunk/tutti-ui-swing/src/main/help/fr/navbar.js trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -99,7 +99,7 @@ protected String connectionUrl; /** - * Flag set to {@code true} if {@link #open(RemoteDeviceChooser)} method was invoked with success. + * Flag set to {@code true} if {@link #open(RemoteDeviceChooser, boolean)} method was invoked with success. */ protected boolean open; @@ -108,7 +108,7 @@ */ protected String name; - public void open(RemoteDeviceChooser remoteDeviceChooser) throws IOException { + public void open(RemoteDeviceChooser remoteDeviceChooser, boolean forceCompleteScan) throws IOException { Preconditions.checkState(!open, "Client is already opened"); @@ -118,7 +118,7 @@ throw new LocalDeviceNotFoundException(); } - if (REMOTE_DEVICE_CACHE == null) { + if (forceCompleteScan || REMOTE_DEVICE_CACHE == null) { // build map of remote devices @@ -147,7 +147,7 @@ "Could not find remote device with name '" + name + "'"); } - if (REMOTE_CONNECTION_URL_CACHE == null) { + if (forceCompleteScan || REMOTE_CONNECTION_URL_CACHE == null) { REMOTE_CONNECTION_URL_CACHE = Maps.newTreeMap(); } Modified: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -51,7 +51,7 @@ }; IchtyometerClient client = new IchtyometerClient(); try { - client.open(remoteDeviceChooser); + client.open(remoteDeviceChooser, true); client.close(); } catch (IOException e) { Assume.assumeTrue("Could not connect to remote device", true); Modified: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -63,7 +63,7 @@ client = new IchtyometerClient(); try { - client.open(remoteDeviceChooser); + client.open(remoteDeviceChooser, true); } catch (IOException e) { Assume.assumeTrue("Could not connect to remote device", false); } Modified: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -56,6 +56,7 @@ public void setUp() throws Exception { RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override public String chooseRemoteDevice(Set<String> remoteDeviceNames) { return remoteDeviceNames.contains("10MF1-E651") ? "10MF1-E651" : null; @@ -64,7 +65,7 @@ client = new IchtyometerClient(); try { - client.open(remoteDeviceChooser); + client.open(remoteDeviceChooser, true); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Could not connect to bigfin", e); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -651,6 +651,10 @@ return applicationConfig.getOption(TuttiConfigurationOption.ADMIN_PASSWORD.getKey()); } + public boolean isFullBluetoothScan() { + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN.getKey()); + } + //------------------------------------------------------------------------// //--- Internal methods ---------------------------------------------------// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -506,6 +506,13 @@ "10", Integer.class, false + ), + FULL_BLUETOOTH_SCAN( + "tutti.ichtyometer.fullBluetoothScan", + n_("tutti.ichtyometer.fullBluetoothScan.description"), + "false", + Boolean.class, + false ); /** Configuration key. */ Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-30 15:43:47 UTC (rev 1542) @@ -65,6 +65,7 @@ tutti.config.option.weights.rate.difference.totalAndSorted.description= tutti.config.parse.error= tutti.config.save.error= +tutti.ichtyometer.fullBluetoothScan.description= tutti.io.deleteTempDirectory.error= tutti.io.mkDir.error= tutti.persistence.attachment.copyFile.error= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-30 15:43:47 UTC (rev 1542) @@ -65,6 +65,7 @@ tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.save.error=Erreur lors de la sauvegarde de la configuration dans le fichier %s +tutti.ichtyometer.fullBluetoothScan.description=Pour toujours effectuer une recherche complête des périphériques bluetooth lors de la recherche d'un ichtyomètre tutti.io.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire tutti.io.mkDir.error=Erreur à la création du dossier %s tutti.persistence.attachment.copyFile.error=Erreur lors de la copie de la pièce jointe %1s dans le fichier %2s Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-30 15:43:47 UTC (rev 1542) @@ -771,6 +771,14 @@ saisie d'un nombre par classe de taille, le poids des individus de chaque classe de tailles peut être saisi. + + Si l'icône bluetooth en bas de l'écran est activé (couleur bleue), toutes + les mesures prises sur l'ichtyomètre complèteront automatiquement le + tableau des mensurations. + + A noter qu'il faut être obligatoirement en mode mesuration et pas en + mode simple dénombrement. + <h3>Description des champs<a name="captureEspecesMensurationFields"></a></h3> <dl> Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2014-01-30 15:43:47 UTC (rev 1542) @@ -54,6 +54,9 @@ <li> <a href="menu.html#menu_fichier_mise_a_jour_rapport">Vérifier les mises à jour des rapports</a></li> + <li> + <a href="menu.html#menu_fichier_connection_ichtyometre">Se connecter / déconnecter à un ichtyomètre</a> + </li> <li><a href="menu.html#menu_fichier_gestionnaire_base">Gestionnaire de bases</a></li> <li><a href="menu.html#menu_fichier_quitter">Quitter</a> Modified: trunk/tutti-ui-swing/src/main/help/fr/menu.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/menu.html 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/help/fr/menu.html 2014-01-30 15:43:47 UTC (rev 1542) @@ -72,14 +72,12 @@ <a name="menu_fichier_mise_a_jour_rapport"></a> Permet de vérifier les mises à jour des rapports utilisés dans l'aplication. -<h3>Se connecter à un ichtyomètre</h3> +<h3>Se connecter / déconnecter à un ichtyomètre</h3> <a name="menu_fichier_connection_ichtyometre"></a> -Permet de se connecter à un ichtyomètre de type BigFin pour ensuite pouvoir récupérer en temps réel les mesures effectués dans l'écran des mensurations. - -<h3>Se déconnecter d'un ichtyomètre</h3> -<a name="menu_fichier_decconnection_ichtyometre"></a> -Permet de ne plus écouter un ichtyomètre. - +Permet de se connecter à un ichtyomètre de type BigFin. + +A noter que l'ichtyomètre doit utiliser un firmware adapté et être configuré en unité millimètre. +Une fois connecté à un ichtyomètre, l'action permet alors de s'y déconnecter. <h3>Gestionnaire de base</h3> <a name="menu_fichier_gestionnaire_base"></a> Modified: trunk/tutti-ui-swing/src/main/help/fr/navbar.js =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/navbar.js 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/help/fr/navbar.js 2014-01-30 15:43:47 UTC (rev 1542) @@ -39,8 +39,7 @@ document.write(' <li><a href="menu.html#menu_fichier_configuration">Configuration</a></li>'); document.write(' <li><a href="menu.html#menu_fichier_mise_a_jour_logicelle">Vérifier les mises à jour logicielles</a></li>'); document.write(' <li><a href="menu.html#menu_fichier_mise_a_jour_rapport">Vérifier les mises à jour des rapports</a></li>'); -document.write(' <li><a href="menu.html#menu_fichier_connection_ichtyometre">Se connecter à un ichtyomètre</a></li>'); -document.write(' <li><a href="menu.html#menu_fichier_deconnection_ichtyometre">Se déconnecter d'un ichtyomètre</a></li>'); +document.write(' <li><a href="menu.html#menu_fichier_connection_ichtyometre">Se connecter / déconnecter à un ichtyomètre</a></li>'); document.write(' <li><a href="menu.html#menu_fichier_gestionnaire_base">Gestionnaire de bases</a></li>'); document.write(' <li><a href="menu.html#menu_fichier_quitter">Quitter</a></li>'); document.write(' </ul>'); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -61,7 +61,7 @@ @Override public String chooseRemoteDevice(Set<String> remoteDeviceNames) { String selectedDevice = (String) JOptionPane.showInputDialog( - getContext().getExistingActionUI(), + getContext().getMainUI(), _("tutti.ichtyometer.choose.remote.device.found"), _("tutti.ichtyometer.title.choose.remote.device"), JOptionPane.QUESTION_MESSAGE, @@ -73,7 +73,7 @@ } }; try { - client.open(remoteDeviceChooser); + client.open(remoteDeviceChooser, getConfig().isFullBluetoothScan()); } catch (LocalDeviceNotFoundException e) { throw new ApplicationBusinessException(_("tutti.ichtyometer.error.no.local.device")); } catch (RemoteDeviceNotFoundException e) { @@ -83,8 +83,21 @@ } FeedReader ichtyometerReader = new FeedReader(); ichtyometerReader.start(client); - sendMessage(_("tutti.ichtyometer.connection.establish", client.getName())); getContext().setIchtyometerReader(ichtyometerReader); } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + FeedReader ichtyometerReader = getContext().getIchtyometerReader(); + String clientName = ichtyometerReader.getClientName(); + sendMessage(_("tutti.ichtyometer.connection.establish", clientName)); + + displayInfoMessage( + _("tutti.ichtyometer.connection.establish.title"), + _("tutti.ichtyometer.connection.establish.message", clientName) + ); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -125,8 +125,13 @@ .setOptionShortLabel(_("tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel")) .addOption(TuttiConfigurationOption.MAX_INDIVIDUAL_OBSERVATION_ROW_TO_CREATE) - .setOptionShortLabel(_("tutti.config.option.ui.individualObservationRowsToCreate.shortLabel")); + .setOptionShortLabel(_("tutti.config.option.ui.individualObservationRowsToCreate.shortLabel")) + .addOption(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN) + .setOptionShortLabel(_("tutti.config.option.ui.fullBluetoothScan.shortLabel")) + + ; + TuttiUIContext context = getContext(); if (context.isDbLoaded()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-01-30 15:43:47 UTC (rev 1542) @@ -116,7 +116,11 @@ new Runnable() { @Override public void run() { - consumeFeedRecord(record); + if (!getModel().isSimpleCountingMode()) { + + // can try to consume value + consumeFeedRecord(record); + } } } ); @@ -317,7 +321,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { Caracteristic newValue = (Caracteristic) evt.getNewValue(); - if (getModel().getRows()!=null) { + if (getModel().getRows() != null) { for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); // get precision from the pmfm @@ -781,7 +785,8 @@ protected void consumeFeedRecord(FeedReaderRecord record) { if (record.isValid()) { - float length = record.getLength(); + // We consider this as milimeters, but we use only cm here + float length = record.getLength() / 10; applyRafaleStep(length, true); } else { throw new ApplicationBusinessException( Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-30 15:43:47 UTC (rev 1542) @@ -136,6 +136,7 @@ tutti.config.option.ui.config.file.shortLabel= tutti.config.option.ui.coordinateEditorType.shortLabel= tutti.config.option.ui.dateFormat.shortLabel= +tutti.config.option.ui.fullBluetoothScan.shortLabel= tutti.config.option.ui.individualObservationRowsToCreate.shortLabel= tutti.config.option.update.application.url.shortLabel= tutti.config.option.update.data.url.shortLabel= @@ -1194,6 +1195,8 @@ tutti.i18n.mkDir.error= tutti.ichtyometer.choose.remote.device.found= tutti.ichtyometer.connection.establish= +tutti.ichtyometer.connection.establish.message= +tutti.ichtyometer.connection.establish.title= tutti.ichtyometer.connection.stop= tutti.ichtyometer.error.no.local.device= tutti.ichtyometer.error.no.remote.device= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-30 10:56:59 UTC (rev 1541) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-30 15:43:47 UTC (rev 1542) @@ -127,6 +127,7 @@ tutti.config.option.ui.config.file.shortLabel=Chemin du fichier de confirmation tutti.config.option.ui.coordinateEditorType.shortLabel=Formateur de coordonnées tutti.config.option.ui.dateFormat.shortLabel=Format des dates +tutti.config.option.ui.fullBluetoothScan.shortLabel=Recherche complête des périphériques bluetooth tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles tutti.config.option.update.application.url.shortLabel=URL de mise à jour des applicatifs tutti.config.option.update.data.url.shortLabel=URL de mise à jour des données @@ -1066,7 +1067,7 @@ tutti.editSpeciesFrequencies.action.saveAndContinue=Enregistrer et Continuer tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic=C tutti.editSpeciesFrequencies.action.saveAndContinue.tip=Enregistrer les mensurations et saisir les mensurations pour le lot suivant -tutti.editSpeciesFrequencies.addMeasure=Ajout d'un individu de taille %s (classe de taille %s) +tutti.editSpeciesFrequencies.addMeasure=Ajout d'un individu de taille %scm (classe de taille %scm) tutti.editSpeciesFrequencies.askBeforeSave.help=Que voulez-vous faire?<ul><li>Non pour rester sur cet écran</li><li>Oui pour enregisrer les mensurations avec poids</li></ul> tutti.editSpeciesFrequencies.askBeforeSave.message=La saisie comporte des classes de taille avec et sans poids associés. Seules les classes de taille avec poids seront dans ce cas sauvegardées. tutti.editSpeciesFrequencies.askBeforeSave.title=Confirmer l'enregistrement des mensurations @@ -1095,7 +1096,6 @@ tutti.editSpeciesFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides tutti.editSpeciesFrequencies.field.totalWeight=Poids total tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides -tutti.editSpeciesFrequencies.ichtyometerConnected=Un ichtyomètre est connecté, les mensurations peuvent être directement renseignées depuis celui-ci. tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > tutti.editSpeciesFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille @@ -1180,8 +1180,10 @@ tutti.help.mkDir.error=Erreur à la création du dossier d'aide tutti.i18n.deleteCache.error=Erreur à la suppression du cache de l'internationalisation tutti.i18n.mkDir.error=Erreur à la création du dossier d'internationalisation -tutti.ichtyometer.choose.remote.device.found=Veuillez choisir le périphérique bluetooth qui correspond à l'ichtyomètre parmis ceux détectés +tutti.ichtyometer.choose.remote.device.found=<html><body>Veuillez choisir le périphérique bluetooth qui correspond à l'ichtyomètre parmis ceux détectés. Si vous ne trouvez pas votre périphérique, vous pouvez modifier dans la configuration l'option Application :: Recherche complête bluetooth puis retenter une connexion.</body></html> tutti.ichtyometer.connection.establish=Connexion à l'ichtyomètre %s établie +tutti.ichtyometer.connection.establish.message=<html><body>La connexion à l'ichtyomètre %s est établie. Important\: Pensez à configurer l'appareil en unité millimètre.</body></html> +tutti.ichtyometer.connection.establish.title=Connexion établie tutti.ichtyometer.connection.stop=Connexion à l'ichtyomètre %s arrêtée tutti.ichtyometer.error.no.local.device=Le bluetooth n'est pas activé sur la machine tutti.ichtyometer.error.no.remote.device=Aucun périphérique bluetooth détecté ou abandon de l'utilisateur @@ -1231,10 +1233,10 @@ tutti.main.action.configuration=Configuration tutti.main.action.configuration.mnemonic=C tutti.main.action.configuration.tip=Configurer l'application -tutti.main.action.connectIchtyometer=Ichtyomètre +tutti.main.action.connectIchtyometer=Connexion Ichtyomètre tutti.main.action.connectIchtyometer.mnemonic=y tutti.main.action.connectIchtyometer.tip=Se connecter à un ichtyomètre -tutti.main.action.disconnectIchtyometer=Ichtyomètre +tutti.main.action.disconnectIchtyometer=Déconnexion Ichtyomètre tutti.main.action.disconnectIchtyometer.mnemonic=y tutti.main.action.disconnectIchtyometer.tip=Se déconnecter de l'ichtyomètre tutti.main.action.editCatches=Saisir les captures

1 0

r1541 - in trunk/tutti-ichtyometer/src: main/java/fr/ifremer/tutti/ichtyometer/feed test/java/fr/ifremer/tutti/ichtyometer/feed
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 11:56:59 +0100 (Thu, 30 Jan 2014) New Revision: 1541 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1541 Log: refs #3875 (review API) Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-30 09:33:35 UTC (rev 1540) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-01-30 10:56:59 UTC (rev 1541) @@ -49,40 +49,25 @@ /** Logger. */ private static final Log log = LogFactory.getLog(FeedReader.class); + /** + * Ichtyometer client given in the {@code start} method. + */ protected IchtyometerClient client; + /** + * Reader runnable code (to be used in a thread). + */ protected ReadingRunnable readingRunnable; -// protected StreamConnection connection; - + /** + * To keep list of {@link FeedReaderListener} listeners. + */ protected final EventListenerList listenerList; public FeedReader() { listenerList = new EventListenerList(); } - public void addFeedModeReaderListener(FeedReaderListener listener) { - listenerList.add(FeedReaderListener.class, listener); - } - - public void removeFeedModeReaderListener(FeedReaderListener listener) { - listenerList.remove(FeedReaderListener.class, listener); - } - - public boolean containsFeedModeReaderListener(FeedReaderListener listener) { - boolean result = false; - FeedReaderListener[] existingListeners = listenerList.getListeners(FeedReaderListener.class); - if (existingListeners != null) { - for (FeedReaderListener existingListener : existingListeners) { - if (listener == existingListener) { - result = true; - break; - } - } - } - return result; - } - public void start(IchtyometerClient client) throws IOException { Preconditions.checkNotNull(client, "client can not be null"); @@ -94,19 +79,13 @@ // get input stream DataInputStream dataInputStream = connection.openDataInputStream(); - if (log.isDebugEnabled()) { - log.debug("Open data stream: " + dataInputStream); - } - // start a reading stream + // create the reader runnable readingRunnable = new ReadingRunnable(dataInputStream); -// Thread readingThread = new Thread(readingRunnable); - + // start the reader thread new Thread(readingRunnable).start(); -// waitLock(); - if (log.isDebugEnabled()) { log.debug("Ready to read remote device..."); } @@ -119,7 +98,7 @@ Preconditions.checkState(client.isOpen(), "client must be opened"); try { - readingRunnable.setStop(true); + readingRunnable.stop(); } finally { @@ -131,137 +110,67 @@ return client.getName(); } -// protected void waitLock() throws IOException { -// synchronized (readingRunnable.lock) { -// try { -// readingRunnable.lock.wait(); -// } catch (InterruptedException e) { -// throw new IOException("Could not wait..."); -// } -// } -// } + public void addFeedModeReaderListener(FeedReaderListener listener) { + listenerList.add(FeedReaderListener.class, listener); + } - protected void fireRecordRead(FeedReaderEvent e) { - for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { - listener.recordRead(e); - } + public void removeFeedModeReaderListener(FeedReaderListener listener) { + listenerList.remove(FeedReaderListener.class, listener); } protected class ReadingRunnable implements Runnable { + /** + * Input stream to read new record. + */ protected final DataInputStream dataInputStream; -// protected final Object lock = new Object(); - + /** + * Flag to stop the runnable. + */ protected boolean stop; - public void setStop(boolean stop) { - this.stop = stop; + protected ReadingRunnable(DataInputStream dataInputStream) { + this.dataInputStream = dataInputStream; } - public ReadingRunnable(DataInputStream dataInputStream) { - this.dataInputStream = dataInputStream; + protected void stop() { + this.stop = true; } @Override public void run() { -// try { - if (log.isDebugEnabled()) { - log.debug("Starting... " + this); + if (log.isInfoEnabled()) { + log.info("Reader thread start... " + this); } -// DataInputStream dataInputStream = connection.openDataInputStream(); - -// if (log.isDebugEnabled()) { -// log.debug("Open data stream: " + dataInputStream); -// } -// -// notifyOthers(); - while (!stop) { -// String result = ""; -// -// // wait until got two \r -// -// int nbR = 0; -// -// String record = null; -// String crc = null; -// while (nbR != 2) { -// -// if (stop) { -// break; -// } -// while (dataInputStream.available() > 0) { -// if (stop) { -// break; -// } -// int c = dataInputStream.read(); -// -// if (c == '\r') { -// -// nbR++; -// if (nbR == 1) { -// record = result; -// if (log.isDebugEnabled()) { -// log.debug("Get record: " + record); -// } -// result = ""; -// } else if (nbR == 2) { -// crc = result; -// if (log.isDebugEnabled()) { -// log.debug("Get crc: " + crc); -// } -// } -// } else { -// -// result += (char) c; -// } -// } -// } -// -// if (stop) { -// break; -// } -// if (log.isDebugEnabled()) { -// log.debug(String.format("Record: %s / %s", record, crc)); -// } - - try { + // get a new record FeedReaderRecord readerRecord = readRecord(dataInputStream); if (!stop) { + + // send new record to listeners FeedReaderEvent e = new FeedReaderEvent(FeedReader.this, readerRecord); - fireRecordRead(e); + for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + listener.recordRead(e); + } } } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Could not read record", e); } } - - } if (log.isInfoEnabled()) { log.info("Reader thread stop..." + this); } - -// } catch (IOException e) { -// if (log.isErrorEnabled()) { -// log.error("Reading error", e); -// } -// } finally { -// -// notifyOthers(); -// } - } - protected FeedReaderRecord readRecord(DataInputStream dataInputStream) throws IOException { String result = ""; @@ -315,11 +224,5 @@ } return readerRecord; } - -// protected void notifyOthers() { -// synchronized (lock) { -// lock.notifyAll(); -// } -// } } } Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-01-30 09:33:35 UTC (rev 1540) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-01-30 10:56:59 UTC (rev 1541) @@ -36,12 +36,8 @@ private static final long serialVersionUID = 1L; - protected FeedReaderRecord record; + protected final FeedReaderRecord record; - public FeedReaderEvent(FeedReader source) { - this(source, null); - } - public FeedReaderEvent(FeedReader source, FeedReaderRecord record) { super(source); this.record = record; Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-01-30 09:33:35 UTC (rev 1540) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-01-30 10:56:59 UTC (rev 1541) @@ -27,7 +27,7 @@ import java.util.EventListener; /** - * To listen records from the ichtyometer. + * To listen new read records from the ichtyometer. * * Created on 1/24/14. * @@ -36,6 +36,11 @@ */ public interface FeedReaderListener extends EventListener { + /** + * When a new record was read. + * + * @param event event containing the new read record + */ void recordRead(FeedReaderEvent event); } Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-01-30 09:33:35 UTC (rev 1540) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-01-30 10:56:59 UTC (rev 1541) @@ -41,18 +41,74 @@ /** Logger. */ private static final Log log = LogFactory.getLog(FeedReaderRecord.class); + /** + * Incoming raw record. + */ protected final String record; + /** + * Incoming crc. + */ protected final String crc; + /** + * Our computed crc. + */ protected final String computedCrc; + /** + * Extracted length (the first data of the record). + */ protected final Float length; - protected boolean valid; + /** + * Computed valid flag (if crc == computedCrc and length != null). + */ + protected final boolean valid; - public static String computeCRC(String record) { + public FeedReaderRecord(String record, String crc) { + this.record = record; + this.crc = crc; + this.computedCrc = computeCRC(record); + this.length = computeLength(record); + //FIXME Uncomment when computedCrc will be ok + this.valid = length != null; /*&& crc.equals(computedCrc);*/ + } + + public boolean isValid() { + return valid; + } + + public String getRecord() { + return record; + } + + public String getCrc() { + return crc; + } + + public String getComputedCrc() { + return computedCrc; + } + + public Float getLength() { + return length; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("record", record) + .append("crc", crc) + .append("computedCrc", computedCrc) + .append("valid", valid) + .append("length", length) + .toString(); + } + + protected String computeCRC(String record) { + // use long because int are signed and add doesn't work correctly long checksum = 0; @@ -88,11 +144,7 @@ return hex; } - public FeedReaderRecord(String record, String crc) { - this.record = record; - this.crc = crc; - this.computedCrc = computeCRC(record); - + protected Float computeLength(String record) { Float length; try { String[] cells = record.split("\\s*,\\s*"); @@ -103,47 +155,13 @@ // remove any starting 0 lengthCell = lengthCell.replaceAll("^0*", ""); - length = Float.valueOf(lengthCell) / 10; + length = Float.valueOf(lengthCell); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not get length from " + record, e); } length = null; } - this.length = length; - - //FIXME Uncomment when computedCrc will be ok - this.valid = length != null; /*&& crc.equals(computedCrc);*/ - } - - public boolean isValid() { - return valid; - } - - public String getRecord() { - return record; - } - - public String getCrc() { - return crc; - } - - public String getComputedCrc() { - return computedCrc; - } - - public Float getLength() { return length; } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("record", record) - .append("crc", crc) - .append("computedCrc", computedCrc) - .append("valid", valid) - .append("length", length) - .toString(); - } } Modified: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java =================================================================== --- trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-01-30 09:33:35 UTC (rev 1540) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-01-30 10:56:59 UTC (rev 1541) @@ -45,38 +45,27 @@ @Test public void testComputeCRC() throws Exception { - computeCRC(" 00135, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAC6340B"); - computeCRC(" 00158, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAFE340B"); - computeCRC("00513, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB16340B"); - computeCRC("00636, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB6E340B"); - computeCRC("00047, 000000,5,AEG,56,,10/30/77 10:36, 00,Not set,,", "AAC7340B"); + testRecord(" 00135, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAC6340B", 135f); + testRecord(" 00158, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AAFE340B", 158f); + testRecord("00513, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB16340B", 513f); + testRecord("00636, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,,", "AB6E340B", 636f); + testRecord("00047, 000000,5,AEG,56,,10/30/77 10:36, 00,Not set,,", "AAC7340B", 47f); - computeCRC(" 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); - computeCRC("00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); - computeCRC("22, 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177"); - - /** - * 00135, 000000,5,AEG,56,,10/30/77 10:35, 00,Not set,, - - - - - - - - - - - */ - + testRecord(" 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177", 172f); + testRecord("00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177", 172f); + testRecord("22, 00172, 000000,2,1,14,,02/03/14 17:17, 00,Not set,,", "E2AF3177", 22f); } - protected void computeCRC(String record, String expectedCRC) { + protected void testRecord(String record, String expectedCRC, Float expectedLength) { - String actualCRC = FeedReaderRecord.computeCRC(record); + FeedReaderRecord feedReaderRecord = new FeedReaderRecord(record, expectedCRC); + String actualCRC = feedReaderRecord.getComputedCrc(); if (log.isInfoEnabled()) { - log.info("IncomingCRC: " + expectedCRC + " :: " + new BigInteger(expectedCRC, 16) + " got:" + actualCRC + " :: " + new BigInteger(actualCRC, 16)+ " -- "+new BigInteger(actualCRC, 16).multiply(BigInteger.valueOf(2))); + log.info("incoming CRC: " + expectedCRC + " (" + new BigInteger(expectedCRC, 16) + ") -- computed CRC: " + actualCRC + " (" + new BigInteger(actualCRC, 16) + ")"); } -// Assert.assertEquals("Bad crc for '" + record + "', should have " + expectedCRC + ", but get " + actualCRC, expectedCRC, actualCRC); + Assert.assertEquals("Bad computed length for " + record, expectedLength, feedReaderRecord.getLength()); + //FIXME Uncommnet this when computed CRC will be ok +// Assert.assertEquals("Bad computed CRC for "+record, expectedCRC, feedReaderRecord.getComputedCrc()); + Assert.assertTrue("Bad valid flag for " + record, feedReaderRecord.isValid()); } }

1 0

Build failed in Jenkins: tutti #8
by admin+ci-codelutin.com＠codelutin.com 30 Jan '14

30 Jan '14

See <http://ci-ng.codelutin.com/jenkins/job/tutti/8/changes> Changes: [Tony CHEMIT] fix icon for psion import [Tony CHEMIT] fix icon for psion import [Tony CHEMIT] fixes #4130: [TECH] Sécuriser les accès au site de données ------------------------------------------ [...truncated 278 lines...] ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.tutti.service.BeanValidatorDetectorTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.573 sec - in fr.ifremer.tutti.service.BeanValidatorDetectorTest Running fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-01-29 18:41:52,257 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-01-29 18:41:52,292 35 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.catches.WeightComputingServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.043 sec - in fr.ifremer.tutti.service.catches.WeightComputingServiceTest Running fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-01-29 18:41:52,297 40 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-01-29 18:41:52,305 48 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.009 sec - in fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest Running fr.ifremer.tutti.service.UpdateSchemaTest 2014-01-29 18:41:52,305 48 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.UpdateSchemaTest 2014-01-29 18:41:52,311 54 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS_old.properties 2014-01-29 18:41:52,312 55 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS_old, test [class fr.ifremer.tutti.service.UpdateSchemaTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.UpdateSchemaTest Running fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-01-29 18:41:52,314 57 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-01-29 18:41:52,320 63 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 18:41:52,320 63 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.014 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest Running fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-01-29 18:41:52,321 64 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-01-29 18:41:52,325 68 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 18:41:52,326 69 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest Running fr.ifremer.tutti.service.ValidationServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.628 sec - in fr.ifremer.tutti.service.ValidationServiceTest Running fr.ifremer.tutti.service.DecoratorServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.202 sec - in fr.ifremer.tutti.service.DecoratorServiceTest Running fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-01-29 18:41:53,162 905 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-01-29 18:41:53,165 908 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-01-29 18:41:53,165 908 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.psionimport.PsionImportServiceTest Running fr.ifremer.tutti.service.report.ReportServiceTest 2014-01-29 18:41:53,166 909 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.report.ReportServiceTest 2014-01-29 18:41:53,170 913 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.report.ReportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.003 sec - in fr.ifremer.tutti.service.report.ReportServiceTest Running fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-01-29 18:41:53,173 916 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-01-29 18:41:53,176 919 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-01-29 18:41:53,176 919 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest Running fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-01-29 18:41:53,178 921 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-01-29 18:41:53,182 925 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-01-29 18:41:53,183 926 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-01-29 18:41:53,185 928 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-01-29 18:41:53,189 932 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-01-29 18:41:53,189 932 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-01-29 18:41:53,193 936 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.003 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportService2Test Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-01-29 18:41:53,194 937 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-01-29 18:41:53,197 940 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.003 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest Running fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-01-29 18:41:53,198 941 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-01-29 18:41:53,201 944 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest Results : Tests run: 25, Failures: 0, Errors: 0, Skipped: 14 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-service/target/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 40 modified jaxx file(s). [WARNING] JAXX detects 2 warnings : <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'title' in component 'dialog' : [_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'text' in component 'message' : [_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())] [INFO] Generated 40 file(s) in 7.312s [INFO] [INFO] --- jaxx-maven-plugin:2.7:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] Merge help ids to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] Use input file: <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] Copying tutti-ui-swing.properties to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 6/1569 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1571/1576 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 12 i18n artifacts for locale fr_FR stored in <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] collected 12 i18n artifacts for locale en_GB stored in <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 4/2116 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1940/2124 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/li…> [INFO] Missing file <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/li…> is up-to-date. [INFO] Writing third-party file to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] Writing bundled third-party file to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] Will attach third party file from <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/li…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 101 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 319 source files to <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…>:[383,44] getSelectedValues() in javax.swing.JList has been deprecated [WARNING] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/ma…>: Recompile with -Xlint:unchecked for details. [INFO] 3 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…>:[100,22] cannot find symbol symbol: method getExistingActionUIWhenMainUINotNull() location: variable context of type fr.ifremer.tutti.ui.swing.TuttiUIContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [2.474s] [INFO] Tutti :: Persistence .............................. SUCCESS [8.225s] [INFO] Tutti :: Service .................................. SUCCESS [6.135s] [INFO] Tutti :: UI ....................................... FAILURE [12.785s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 30.875s [INFO] Finished at: Wed Jan 29 18:42:06 CET 2014 [INFO] Final Memory: 126M/731M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure [ERROR] <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…>:[100,22] cannot find symbol [ERROR] symbol: method getExistingActionUIWhenMainUINotNull() [ERROR] location: variable context of type fr.ifremer.tutti.ui.swing.TuttiUIContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…>:[100,22] cannot find symbol symbol: method getExistingActionUIWhenMainUINotNull() location: variable context of type fr.ifremer.tutti.ui.swing.TuttiUIContext at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci-ng.codelutin.com/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target…>:[100,22] cannot find symbol symbol: method getExistingActionUIWhenMainUINotNull() location: variable context of type fr.ifremer.tutti.ui.swing.TuttiUIContext at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-ui-swing Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com channel stopped

1 3

Jenkins build is back to normal : tutti » Tutti :: UI #11
by admin+ci-codelutin.com＠codelutin.com 30 Jan '14

30 Jan '14

See <http://ci-ng.codelutin.com/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swin…>

1 0