Author: tchemit Date: 2014-02-04 17:41:40 +0100 (Tue, 04 Feb 2014) New Revision: 1573 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1573 Log: fixes #4326: Ne pas red?\195?\169marrer l'application lors de modificatin de certaines options fixes #4327: Fournir ?\195?\160 Chris Caroll un programme pour l'aider ?\195?\160 debugger l'ichtyom?\195?\168tre Added: trunk/tutti-ichtyometer/src/main/assembly/send-command.bat trunk/tutti-ichtyometer/src/main/assembly/send-command.sh trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java Modified: trunk/tutti-ichtyometer/LICENSE.txt trunk/tutti-ichtyometer/README.txt trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/main/assembly/README trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh trunk/tutti-ichtyometer/src/main/assembly/log4j.properties trunk/tutti-ichtyometer/src/main/assembly/tools.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 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/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.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-ichtyometer/src/test/resources/log4j.properties trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java trunk/tutti-service/src/test/resources/psion/CC053.IWA trunk/tutti-service/src/test/resources/psion/CFchephren 110612.IWA trunk/tutti-service/src/test/resources/psion/FM001.IWA trunk/tutti-service/src/test/resources/psion/protocol.tuttiProtocol trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/export/accidentalCatch.csv trunk/tutti-ui-swing/src/main/help/export/catch.csv trunk/tutti-ui-swing/src/main/help/export/exportCruise-example.zip trunk/tutti-ui-swing/src/main/help/export/gearCaracteristics.csv trunk/tutti-ui-swing/src/main/help/export/individualObservation.csv trunk/tutti-ui-swing/src/main/help/export/marineLitter.csv trunk/tutti-ui-swing/src/main/help/export/operation.csv trunk/tutti-ui-swing/src/main/help/export/parameter.csv trunk/tutti-ui-swing/src/main/help/export/species.csv trunk/tutti-ui-swing/src/main/help/export/survey.csv trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html trunk/tutti-ui-swing/src/main/help/fr/genericExport.html 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/DisconnectIchtyometerAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.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/SpeciesBatchRowHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 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/LoginUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-up.png trunk/tutti-ui-swing/src/main/resources/icons/action-psion-import.png trunk/tutti-ui-swing/src/main/resources/icons/action-sort.png Property changes on: trunk/tutti-ichtyometer/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/assembly/README =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/README 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/assembly/README 2014-02-04 16:41:40 UTC (rev 1573) @@ -25,5 +25,15 @@ feed-reader.bat (on windows OS) feed-reader.sh (on linux OS) +command-mode +------------ +Tool to send some commands to the board + +To start, launch command + +send-command.bat (on windows OS) +send-command.sh (on linux OS) + + Tony Chemit @copyright Code Lutin 2014 \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/README ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/assembly/log4j.properties =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/log4j.properties 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/assembly/log4j.properties 2014-02-04 16:41:40 UTC (rev 1573) @@ -2,7 +2,7 @@ # #%L # Tutti :: Ichtyometer API # $Id$ -# $HeadURL:$ +# $HeadURL$ # %% # Copyright (C) 2012 - 2014 Ifremer # %% Property changes on: trunk/tutti-ichtyometer/src/main/assembly/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/tutti-ichtyometer/src/main/assembly/send-command.bat =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/send-command.bat (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/send-command.bat 2014-02-04 16:41:40 UTC (rev 1573) @@ -0,0 +1 @@ +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://%CD%/log4j.properties fr.ifremer.tutti.ichtyometer.tool.SendCommandTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/send-command.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/send-command.sh =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/send-command.sh (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/send-command.sh 2014-02-04 16:41:40 UTC (rev 1573) @@ -0,0 +1,2 @@ +#!/bin/sh +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://$(pwd)/log4j.properties fr.ifremer.tutti.ichtyometer.tool.SendCommandTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/send-command.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ichtyometer/src/main/assembly/tools.xml =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/tools.xml 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/assembly/tools.xml 2014-02-04 16:41:40 UTC (rev 1573) @@ -2,7 +2,7 @@ #%L Tutti :: Ichtyometer API $Id$ - $HeadURL:$ + $HeadURL$ %% Copyright (C) 2012 - 2014 Ifremer %% Property changes on: trunk/tutti-ichtyometer/src/main/assembly/tools.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% @@ -25,7 +25,6 @@ */ import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; import com.google.common.io.Closeables; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import org.apache.commons.logging.Log; @@ -35,7 +34,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -93,21 +91,9 @@ public void stop() throws IOException { - try { - - if (client != null) { - - if (connection != null) { - client.closeConnection(connection); - } - } - - } finally { - - if (client != null) { - Closeables.close(client, true); - } - } + Closeables.close(dataInputStream, true); + Closeables.close(dataOutputStream, true); + Closeables.close(client, true); } public Command sendCommand(char question) throws IOException { @@ -118,7 +104,7 @@ Future<Command> submit = service.submit(call); try { - Command result = submit.get(30, TimeUnit.SECONDS); + Command result = submit.get(1, TimeUnit.MINUTES); return result; } catch (InterruptedException | TimeoutException e) { throw new IchtyometerCommandException("Time out on command " + question, e); @@ -129,10 +115,6 @@ protected static class CommandCallable implements Callable<Command> { - protected Set<Character> questionsWithNoEndLines = Sets.newHashSet( - 'a', 'b', 'g' - ); - protected char question; protected DataInputStream dataInputStream; @@ -156,64 +138,33 @@ StringBuilder responseBuilder = new StringBuilder(); - boolean responseComplete = 'g' == question; + int nbSlash = 0; + boolean responseComplete = question == 'g'; while (!responseComplete) { + responseComplete = nbSlash == 2; + while (dataInputStream.available() > 0) { int c = dataInputStream.read(); - if (c == '\r') { + switch (c) { + case '\r': - // end of a line - - // wait for 0.1s to see if there is more to come - try { - Thread.sleep(100); - } catch (InterruptedException e) { - if (log.isDebugEnabled()) { - log.debug("Cant wait..."); - } - } - - // no more data to read - responseComplete = dataInputStream.available() == 0; - - if (responseComplete) { - if (log.isDebugEnabled()) { - log.debug("No more data to read after 0.1s, response is complete"); - } - } else { - if (log.isDebugEnabled()) { - log.debug("Will start to read a new line"); - } + // end of line responseBuilder.append('\n'); - } + break; + case '\\': - } else { - - // add caracter to response - responseBuilder.append((char) c); + // sentinel car + nbSlash++; + break; + default: + // add caracter to response + responseBuilder.append((char) c); } } - - // wait for 0.1s to see if there is more to come - try { - Thread.sleep(100); - } catch (InterruptedException e) { - if (log.isDebugEnabled()) { - log.debug("Cant wait..."); - } - } - - if (!responseComplete && dataInputStream.available() == 0) { - - if (responseBuilder.length() > 0 && questionsWithNoEndLines.contains(question)) { - // this question does not have end of line - responseComplete = true; - } - } } String response = responseBuilder.toString(); Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -0,0 +1,131 @@ +package fr.ifremer.tutti.ichtyometer.tool; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.Lists; +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; +import fr.ifremer.tutti.ichtyometer.interactive.Command; +import fr.ifremer.tutti.ichtyometer.interactive.CommandEngine; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.Console; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; +import java.util.Set; + +/** + * Created on 2/4/14. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since 3.1.2 + */ +public class SendCommandTool { + + /** Logger. */ + private static final Log log = LogFactory.getLog(SendCommandTool.class); + + enum ConsoleCommand { + a, b, c, d, e, g, q + } + + public static void main(String[] args) throws IOException { + + final Console console = System.console(); + final PrintWriter writer = console.writer(); + writer.println("CommandTool: to send command to the board and wait a result v1.0"); + + RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override + public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); + writer.println("Choose you device"); + int i = 0; + for (String remoteDeviceName : remoteDeviceNameList) { + writer.println(i++ + " for device " + remoteDeviceName); + } + writer.println("q (to quit)"); + writer.print("Your choice: "); + writer.flush(); + + String command = console.readLine(); + + if ("q".equals(command)) { + System.exit(0); + } + String deviceName = remoteDeviceNameList.get(Integer.valueOf(command)); + return deviceName; + } + }; + + IchtyometerClient client = new IchtyometerClient(); + + client.open(remoteDeviceChooser, true); + + CommandEngine reader = new CommandEngine(); + + writer.println("client " + client + " is ready.open and wait for a command"); + + reader.start(client); + + boolean quit = false; + while (!quit) { + + writer.print("new command: [a, b, c, d, e, f, g or q to quit]:"); + writer.flush(); + String command = console.readLine(); + ConsoleCommand checkCommand; + try { + checkCommand = ConsoleCommand.valueOf(command); + } catch (IllegalArgumentException e) { + writer.println("Command " + command + " not possible"); + continue; + } + switch (checkCommand) { + + case q: + reader.stop(); + + quit = true; + break; + default: + try { + Command sendCommand = reader.sendCommand(checkCommand.name().charAt(0)); + writer.println(String.format( + "------------------------------------------------------------------------------\n%s" + + "\n------------------------------------------------------------------------------", sendCommand.getResponse())); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Something wrong happen", e); + } + } + + + } + } + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Ichtyometer API * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% @@ -97,8 +97,8 @@ assertCommand(commandEngine.sendCommand('c'), 'c', "Record_id,length(mm),weight(g),species,cruise,station,pan,Dt,sz class,gender,text,"); assertCommand(commandEngine.sendCommand('d'), 'd', "b"); assertCommand(commandEngine.sendCommand('e'), 'e', "b"); - assertCommand(commandEngine.sendCommand('f'), 'f', "b"); assertCommand(commandEngine.sendCommand('g'), 'g', "b"); +// assertCommand(commandEngine.sendCommand('f'), 'f', "b"); commandEngine.stop(); } Property changes on: trunk/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ichtyometer/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-ichtyometer/src/test/resources/log4j.properties 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ichtyometer/src/test/resources/log4j.properties 2014-02-04 16:41:40 UTC (rev 1573) @@ -2,7 +2,7 @@ # #%L # Tutti :: Ichtyometer API # $Id$ -# $HeadURL:$ +# $HeadURL$ # %% # Copyright (C) 2012 - 2014 Ifremer # %% Property changes on: trunk/tutti-ichtyometer/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.type; +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Coordinate formats. * <p/> Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.type; +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Service * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Service * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Service * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Service * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: Service * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/test/resources/psion/CC053.IWA =================================================================== --- trunk/tutti-service/src/test/resources/psion/CC053.IWA 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/test/resources/psion/CC053.IWA 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,585 +1,585 @@ -cc -A -07-01-2013 -07:19:11 - -ESPE : MERLMER -POID : 50 -TAIL : 50 -CATE : I -LONG : 12.5 -LONG : 15 -ESPE : SPICMAE -POID : 20 -TAIL : 20 -CATE : N -LONG : 12 -ESPE : TRIPLAS -POID : 40 -TAIL : 40 -CATE : N -LONG : 15 -ESPE : PAGEERY -POID : 760 -TAIL : 760 -CATE : N -LONG : 16.5 -LONG : 20 -LONG : 20 -LONG : 18.5 -LONG : 17.5 -LONG : 18.5 -LONG : 17.5 -LONG : 19 -LONG : 18.5 -ESPE : ELEDMOS -POID : 230 -TAIL : 230 -CATE : N -LONG : 5 -LONG : 6 -LONG : 5 -ESPE : SOLEVUL -POID : 1350 -TAIL : 1350 -CATE : N -LONG : 34.5 -LONG : 27.5 -LONG : 31 -LONG : 23 -LONG : 21.5 -LONG : 34.5 -ESPE : ELEDCIR -POID : 4650 -TAIL : 1820 -CATE : N -LONG : 6.5 -LONG : 5.5 -LONG : 5.5 -LONG : 5 -LONG : 5 -LONG : 5 -LONG : 5 -LONG : 5 -LONG : 5.5 -LONG : 5 -LONG : 5 -LONG : 5.5 -LONG : 5.5 -LONG : 5.5 -LONG : 5 -LONG : 5 -LONG : 5 -LONG : 4 -LONG : 4 -LONG : 4 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -LONG : 4.5 -ESPE : SPICMAE -POID : 864 -TAIL : 300 -CATE : N -LONG : 11.5 -LONG : 13.5 -LONG : 14 -LONG : 14.5 -LONG : 17 -LONG : 15.5 -LONG : 12.5 -LONG : 14 -LONG : 14 -LONG : 13.5 -ESPE : EUTRGUR -POID : 3788 -TAIL : 1315 -CATE : N -LONG : 20 -LONG : 16 -LONG : 15 -LONG : 17.5 -LONG : 15.5 -LONG : 18.5 -LONG : 15 -LONG : 16 -LONG : 14.5 -LONG : 13.5 -LONG : 17.5 -LONG : 16 -LONG : 16.5 -LONG : 19 -LONG : 15.5 -LONG : 16 -LONG : 16 -LONG : 16 -LONG : 17 -LONG : 17 -LONG : 19 -LONG : 13.5 -LONG : 19 -LONG : 18 -LONG : 23.5 -LONG : 16.5 -LONG : 16.5 -LONG : 16.5 -LONG : 15 -LONG : 15.5 -LONG : 14.5 -LONG : 16.5 -LONG : 19 -LONG : 18 -LONG : 13.5 -ESPE : TRISCAP -POID : 7777 -TAIL : 1545 -CATE : N -LONG : 16 -LONG : 20 -LONG : 17 -LONG : 20 -LONG : 18.5 -LONG : 18.5 -LONG : 19.5 -LONG : 18 -LONG : 16.5 -LONG : 18.5 -LONG : 17.5 -LONG : 20.5 -LONG : 16.5 -LONG : 16.5 -LONG : 17 -LONG : 18.5 -LONG : 16 -LONG : 17.5 -LONG : 17 -LONG : 18.5 -LONG : 15.5 -LONG : 16 -LONG : 16.5 -LONG : 16.5 -LONG : 16.5 -ESPE : TRACMED -POID : 10700 -TAIL : 3715 -CATE : N -LONG : 21 -LONG : 18.5 -LONG : 22 -LONG : 21.5 -LONG : 24.5 -LONG : 18.5 -LONG : 18 -LONG : 13 -LONG : 21 -LONG : 21 -LONG : 20 -LONG : 13.5 -LONG : 21.5 -LONG : 16 -LONG : 23 -LONG : 22 -LONG : 22 -LONG : 17 -LONG : 19.5 -LONG : 20 -LONG : 23.5 -LONG : 19.5 -LONG : 12.5 -LONG : 19.5 -LONG : 14 -LONG : 19 -LONG : 20 -LONG : 18 -LONG : 23 -LONG : 18.5 -LONG : 10.5 -LONG : 10 -LONG : 15.5 -LONG : 19 -LONG : 16 -LONG : 16 -LONG : 19.5 -LONG : 20.5 -LONG : 26 -LONG : 12 -LONG : 20.5 -LONG : 22.5 -LONG : 19.5 -LONG : 21 -LONG : 24 -LONG : 25.5 -LONG : 17.5 -LONG : 19 -LONG : 17 -LONG : 20 -LONG : 17.5 -LONG : 16 -LONG : 20 -LONG : 15.5 -LONG : 14 -LONG : 12 -LONG : 17 -LONG : 13 -LONG : 9 -LONG : 10.5 -LONG : 9 -LONG : 9.5 -LONG : 14 -LONG : 12 -ESPE : PAGEACA -POID : 6600 -TAIL : 3220 -CATE : N -LONG : 17.5 -LONG : 17.5 -LONG : 17.5 -LONG : 16.5 -LONG : 17.5 -LONG : 16 -LONG : 17.5 -LONG : 16.5 -LONG : 18 -LONG : 18 -LONG : 21.5 -LONG : 17 -LONG : 18 -LONG : 17.5 -LONG : 17.5 -LONG : 18 -LONG : 17 -LONG : 18 -LONG : 18 -LONG : 17.5 -LONG : 17 -LONG : 17 -LONG : 17 -LONG : 19 -LONG : 17.5 -LONG : 22 -LONG : 17 -LONG : 17 -LONG : 18.5 -LONG : 17.5 -LONG : 18 -LONG : 16.5 -LONG : 17.5 -LONG : 17 -LONG : 17.5 -LONG : 17.5 -LONG : 17.5 -LONG : 16 -LONG : 16 -LONG : 17.5 -LONG : 16 -LONG : 17.5 -LONG : 17.5 -ESPE : BOOPBOO -POID : 45943 -TAIL : 2230 -CATE : N -LONG : 21 -LONG : 17 -LONG : 17 -LONG : 16 -LONG : 16.5 -LONG : 17 -LONG : 20 -LONG : 17.5 -LONG : 17 -LONG : 16 -LONG : 16.5 -LONG : 16.5 -LONG : 18.5 -LONG : 15.5 -LONG : 16.5 -LONG : 16.5 -LONG : 17 -LONG : 16.5 -LONG : 16.5 -LONG : 16.5 -LONG : 17.5 -LONG : 18 -LONG : 20 -LONG : 16.5 -LONG : 17 -LONG : 16.5 -LONG : 16.5 -LONG : 17 -LONG : 16 -LONG : 21.5 -LONG : 19 -LONG : 17 -LONG : 16 -LONG : 18 -LONG : 15 -LONG : 16.5 -LONG : 17 -LONG : 13.5 -LONG : 15 -ESPE : MERLMER -POID : 395 -TAIL : 395 -CATE : F -LONG : 34.5 -ESPE : LOPHPIS -POID : 1175 -TAIL : 1175 -CATE : F -LONG : 32 -LONG : 28.5 -LONG : 27.5 -ESPE : MERLMER -POID : 317 -TAIL : 110 -CATE : I -LONG : 15.5 -LONG : 15 -LONG : 15 -LONG : 14 -LONG : 11.5 -ESPE : OCTOVUL -POID : 11600 -TAIL : 11600 -CATE : N -LONG : 11 -LONG : 14 -LONG : 13 -LONG : 13 -LONG : 6.5 -LONG : 10 -LONG : 7.5 -LONG : 6.5 -ESPE : DIPLVUL -POID : 2250 -TAIL : 2250 -CATE : N -LONG : 20.5 -LONG : 20.5 -LONG : 18.5 -LONG : 15.5 -LONG : 19.5 -LONG : 20.5 -LONG : 21 -LONG : 22 -LONG : 18 -LONG : 18 -LONG : 18.5 -LONG : 19.5 -LONG : 24 -LONG : 20 -LONG : 20 -LONG : 19.5 -LONG : 18 -LONG : 19.5 -ESPE : TRISCAP -POID : 3341 -TAIL : 210 -CATE : N -LONG : 9.5 -LONG : 10.5 -LONG : 8.5 -LONG : 8 -LONG : 9 -LONG : 8 -LONG : 8 -LONG : 8 -LONG : 8 -LONG : 8 -LONG : 11 -LONG : 10.5 -LONG : 10 -LONG : 10 -LONG : 8.5 -LONG : 8.5 -LONG : 8.5 -LONG : 9 -LONG : 9 -LONG : 8 -LONG : 9.5 -LONG : 9 -LONG : 7.5 -LONG : 8 -LONG : 8 -LONG : 8.5 -LONG : 8.5 -LONG : 8.5 -LONG : 8.5 -LONG : 8.5 -ESPE : TRACTRA -POID : 1267 -TAIL : 440 -CATE : N -LONG : 20 -LONG : 8 -LONG : 8 -LONG : 8.5 -LONG : 7.5 -LONG : 6.5 -LONG : 9 -LONG : 9 -LONG : 8.5 -LONG : 16 -LONG : 9 -LONG : 14 -LONG : 17.5 -LONG : 18 -LONG : 15.5 -LONG : 9 -LONG : 10.5 -LONG : 8 -LONG : 11 -LONG : 8 -LONG : 8 -LONG : 8.5 -LONG : 8.5 -LONG : 9 -LONG : 9 -LONG : 8 -LONG : 7 -LONG : 8 -LONG : 8.5 -LONG : 8 -LONG : 8.5 -LONG : 7.5 -LONG : 7.5 -LONG : 8 -LONG : 7.5 -ESPE : MULLBAR -POID : 3629 -TAIL : 1260 -CATE : M -LONG : 12 -LONG : 11.5 -LONG : 11 -LONG : 11.5 -LONG : 11.5 -LONG : 10.5 -LONG : 10.5 -LONG : 11.5 -LONG : 11.5 -LONG : 11 -LONG : 9 -LONG : 11.5 -LONG : 10.5 -LONG : 12.5 -LONG : 11.5 -LONG : 11 -LONG : 11 -LONG : 11.5 -LONG : 10.5 -LONG : 10.5 -LONG : 12 -LONG : 11.5 -LONG : 13 -LONG : 11 -LONG : 12 -LONG : 11 -LONG : 11.5 -LONG : 12 -LONG : 10.5 -LONG : 11.5 -LONG : 11 -LONG : 10.5 -LONG : 9.5 -LONG : 10.5 -LONG : 11 -LONG : 10.5 -LONG : 11 -LONG : 11 -LONG : 12 -LONG : 16 -LONG : 13.5 -LONG : 13 -LONG : 12 -LONG : 13 -LONG : 16.5 -LONG : 12 -LONG : 11.5 -LONG : 12 -LONG : 11 -LONG : 11 -LONG : 11.5 -LONG : 13 -LONG : 12 -LONG : 11 -LONG : 14 -LONG : 12.5 -LONG : 11.5 -LONG : 12 -LONG : 12.5 -LONG : 12 -LONG : 12.5 -LONG : 16 -LONG : 16 -LONG : 11.5 -LONG : 11.5 -LONG : 10.5 -LONG : 11.5 -LONG : 11.5 -ESPE : MULLBAR -POID : 4853 -TAIL : 1685 -CATE : F -LONG : 9.5 -LONG : 10.5 -LONG : 11.5 -LONG : 11.5 -LONG : 13 -LONG : 12 -LONG : 10.5 -LONG : 12 -LONG : 12 -LONG : 13.5 -LONG : 16.5 -LONG : 12.5 -LONG : 15.5 -LONG : 12.5 -LONG : 12 -LONG : 14 -LONG : 14.5 -LONG : 14.5 -LONG : 14.5 -LONG : 14.5 -LONG : 12.5 -LONG : 13 -LONG : 13.5 -LONG : 12 -LONG : 12 -LONG : 11.5 -LONG : 12 -LONG : 13 -LONG : 15.5 -LONG : 14.5 -LONG : 13.5 -LONG : 13 -LONG : 13 -LONG : 13 -LONG : 14 -LONG : 15.5 -LONG : 14.5 -LONG : 14 -LONG : 12.5 -LONG : 17 -LONG : 15 -LONG : 15 -LONG : 15 -LONG : 16 -LONG : 15 -LONG : 14.5 -LONG : 14.5 -LONG : 14.5 -LONG : 15.5 -LONG : 14 -LONG : 13.5 -LONG : 16 -LONG : 13.5 -LONG : 15 +cc +A +07-01-2013 +07:19:11 + +ESPE : MERLMER +POID : 50 +TAIL : 50 +CATE : I +LONG : 12.5 +LONG : 15 +ESPE : SPICMAE +POID : 20 +TAIL : 20 +CATE : N +LONG : 12 +ESPE : TRIPLAS +POID : 40 +TAIL : 40 +CATE : N +LONG : 15 +ESPE : PAGEERY +POID : 760 +TAIL : 760 +CATE : N +LONG : 16.5 +LONG : 20 +LONG : 20 +LONG : 18.5 +LONG : 17.5 +LONG : 18.5 +LONG : 17.5 +LONG : 19 +LONG : 18.5 +ESPE : ELEDMOS +POID : 230 +TAIL : 230 +CATE : N +LONG : 5 +LONG : 6 +LONG : 5 +ESPE : SOLEVUL +POID : 1350 +TAIL : 1350 +CATE : N +LONG : 34.5 +LONG : 27.5 +LONG : 31 +LONG : 23 +LONG : 21.5 +LONG : 34.5 +ESPE : ELEDCIR +POID : 4650 +TAIL : 1820 +CATE : N +LONG : 6.5 +LONG : 5.5 +LONG : 5.5 +LONG : 5 +LONG : 5 +LONG : 5 +LONG : 5 +LONG : 5 +LONG : 5.5 +LONG : 5 +LONG : 5 +LONG : 5.5 +LONG : 5.5 +LONG : 5.5 +LONG : 5 +LONG : 5 +LONG : 5 +LONG : 4 +LONG : 4 +LONG : 4 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +LONG : 4.5 +ESPE : SPICMAE +POID : 864 +TAIL : 300 +CATE : N +LONG : 11.5 +LONG : 13.5 +LONG : 14 +LONG : 14.5 +LONG : 17 +LONG : 15.5 +LONG : 12.5 +LONG : 14 +LONG : 14 +LONG : 13.5 +ESPE : EUTRGUR +POID : 3788 +TAIL : 1315 +CATE : N +LONG : 20 +LONG : 16 +LONG : 15 +LONG : 17.5 +LONG : 15.5 +LONG : 18.5 +LONG : 15 +LONG : 16 +LONG : 14.5 +LONG : 13.5 +LONG : 17.5 +LONG : 16 +LONG : 16.5 +LONG : 19 +LONG : 15.5 +LONG : 16 +LONG : 16 +LONG : 16 +LONG : 17 +LONG : 17 +LONG : 19 +LONG : 13.5 +LONG : 19 +LONG : 18 +LONG : 23.5 +LONG : 16.5 +LONG : 16.5 +LONG : 16.5 +LONG : 15 +LONG : 15.5 +LONG : 14.5 +LONG : 16.5 +LONG : 19 +LONG : 18 +LONG : 13.5 +ESPE : TRISCAP +POID : 7777 +TAIL : 1545 +CATE : N +LONG : 16 +LONG : 20 +LONG : 17 +LONG : 20 +LONG : 18.5 +LONG : 18.5 +LONG : 19.5 +LONG : 18 +LONG : 16.5 +LONG : 18.5 +LONG : 17.5 +LONG : 20.5 +LONG : 16.5 +LONG : 16.5 +LONG : 17 +LONG : 18.5 +LONG : 16 +LONG : 17.5 +LONG : 17 +LONG : 18.5 +LONG : 15.5 +LONG : 16 +LONG : 16.5 +LONG : 16.5 +LONG : 16.5 +ESPE : TRACMED +POID : 10700 +TAIL : 3715 +CATE : N +LONG : 21 +LONG : 18.5 +LONG : 22 +LONG : 21.5 +LONG : 24.5 +LONG : 18.5 +LONG : 18 +LONG : 13 +LONG : 21 +LONG : 21 +LONG : 20 +LONG : 13.5 +LONG : 21.5 +LONG : 16 +LONG : 23 +LONG : 22 +LONG : 22 +LONG : 17 +LONG : 19.5 +LONG : 20 +LONG : 23.5 +LONG : 19.5 +LONG : 12.5 +LONG : 19.5 +LONG : 14 +LONG : 19 +LONG : 20 +LONG : 18 +LONG : 23 +LONG : 18.5 +LONG : 10.5 +LONG : 10 +LONG : 15.5 +LONG : 19 +LONG : 16 +LONG : 16 +LONG : 19.5 +LONG : 20.5 +LONG : 26 +LONG : 12 +LONG : 20.5 +LONG : 22.5 +LONG : 19.5 +LONG : 21 +LONG : 24 +LONG : 25.5 +LONG : 17.5 +LONG : 19 +LONG : 17 +LONG : 20 +LONG : 17.5 +LONG : 16 +LONG : 20 +LONG : 15.5 +LONG : 14 +LONG : 12 +LONG : 17 +LONG : 13 +LONG : 9 +LONG : 10.5 +LONG : 9 +LONG : 9.5 +LONG : 14 +LONG : 12 +ESPE : PAGEACA +POID : 6600 +TAIL : 3220 +CATE : N +LONG : 17.5 +LONG : 17.5 +LONG : 17.5 +LONG : 16.5 +LONG : 17.5 +LONG : 16 +LONG : 17.5 +LONG : 16.5 +LONG : 18 +LONG : 18 +LONG : 21.5 +LONG : 17 +LONG : 18 +LONG : 17.5 +LONG : 17.5 +LONG : 18 +LONG : 17 +LONG : 18 +LONG : 18 +LONG : 17.5 +LONG : 17 +LONG : 17 +LONG : 17 +LONG : 19 +LONG : 17.5 +LONG : 22 +LONG : 17 +LONG : 17 +LONG : 18.5 +LONG : 17.5 +LONG : 18 +LONG : 16.5 +LONG : 17.5 +LONG : 17 +LONG : 17.5 +LONG : 17.5 +LONG : 17.5 +LONG : 16 +LONG : 16 +LONG : 17.5 +LONG : 16 +LONG : 17.5 +LONG : 17.5 +ESPE : BOOPBOO +POID : 45943 +TAIL : 2230 +CATE : N +LONG : 21 +LONG : 17 +LONG : 17 +LONG : 16 +LONG : 16.5 +LONG : 17 +LONG : 20 +LONG : 17.5 +LONG : 17 +LONG : 16 +LONG : 16.5 +LONG : 16.5 +LONG : 18.5 +LONG : 15.5 +LONG : 16.5 +LONG : 16.5 +LONG : 17 +LONG : 16.5 +LONG : 16.5 +LONG : 16.5 +LONG : 17.5 +LONG : 18 +LONG : 20 +LONG : 16.5 +LONG : 17 +LONG : 16.5 +LONG : 16.5 +LONG : 17 +LONG : 16 +LONG : 21.5 +LONG : 19 +LONG : 17 +LONG : 16 +LONG : 18 +LONG : 15 +LONG : 16.5 +LONG : 17 +LONG : 13.5 +LONG : 15 +ESPE : MERLMER +POID : 395 +TAIL : 395 +CATE : F +LONG : 34.5 +ESPE : LOPHPIS +POID : 1175 +TAIL : 1175 +CATE : F +LONG : 32 +LONG : 28.5 +LONG : 27.5 +ESPE : MERLMER +POID : 317 +TAIL : 110 +CATE : I +LONG : 15.5 +LONG : 15 +LONG : 15 +LONG : 14 +LONG : 11.5 +ESPE : OCTOVUL +POID : 11600 +TAIL : 11600 +CATE : N +LONG : 11 +LONG : 14 +LONG : 13 +LONG : 13 +LONG : 6.5 +LONG : 10 +LONG : 7.5 +LONG : 6.5 +ESPE : DIPLVUL +POID : 2250 +TAIL : 2250 +CATE : N +LONG : 20.5 +LONG : 20.5 +LONG : 18.5 +LONG : 15.5 +LONG : 19.5 +LONG : 20.5 +LONG : 21 +LONG : 22 +LONG : 18 +LONG : 18 +LONG : 18.5 +LONG : 19.5 +LONG : 24 +LONG : 20 +LONG : 20 +LONG : 19.5 +LONG : 18 +LONG : 19.5 +ESPE : TRISCAP +POID : 3341 +TAIL : 210 +CATE : N +LONG : 9.5 +LONG : 10.5 +LONG : 8.5 +LONG : 8 +LONG : 9 +LONG : 8 +LONG : 8 +LONG : 8 +LONG : 8 +LONG : 8 +LONG : 11 +LONG : 10.5 +LONG : 10 +LONG : 10 +LONG : 8.5 +LONG : 8.5 +LONG : 8.5 +LONG : 9 +LONG : 9 +LONG : 8 +LONG : 9.5 +LONG : 9 +LONG : 7.5 +LONG : 8 +LONG : 8 +LONG : 8.5 +LONG : 8.5 +LONG : 8.5 +LONG : 8.5 +LONG : 8.5 +ESPE : TRACTRA +POID : 1267 +TAIL : 440 +CATE : N +LONG : 20 +LONG : 8 +LONG : 8 +LONG : 8.5 +LONG : 7.5 +LONG : 6.5 +LONG : 9 +LONG : 9 +LONG : 8.5 +LONG : 16 +LONG : 9 +LONG : 14 +LONG : 17.5 +LONG : 18 +LONG : 15.5 +LONG : 9 +LONG : 10.5 +LONG : 8 +LONG : 11 +LONG : 8 +LONG : 8 +LONG : 8.5 +LONG : 8.5 +LONG : 9 +LONG : 9 +LONG : 8 +LONG : 7 +LONG : 8 +LONG : 8.5 +LONG : 8 +LONG : 8.5 +LONG : 7.5 +LONG : 7.5 +LONG : 8 +LONG : 7.5 +ESPE : MULLBAR +POID : 3629 +TAIL : 1260 +CATE : M +LONG : 12 +LONG : 11.5 +LONG : 11 +LONG : 11.5 +LONG : 11.5 +LONG : 10.5 +LONG : 10.5 +LONG : 11.5 +LONG : 11.5 +LONG : 11 +LONG : 9 +LONG : 11.5 +LONG : 10.5 +LONG : 12.5 +LONG : 11.5 +LONG : 11 +LONG : 11 +LONG : 11.5 +LONG : 10.5 +LONG : 10.5 +LONG : 12 +LONG : 11.5 +LONG : 13 +LONG : 11 +LONG : 12 +LONG : 11 +LONG : 11.5 +LONG : 12 +LONG : 10.5 +LONG : 11.5 +LONG : 11 +LONG : 10.5 +LONG : 9.5 +LONG : 10.5 +LONG : 11 +LONG : 10.5 +LONG : 11 +LONG : 11 +LONG : 12 +LONG : 16 +LONG : 13.5 +LONG : 13 +LONG : 12 +LONG : 13 +LONG : 16.5 +LONG : 12 +LONG : 11.5 +LONG : 12 +LONG : 11 +LONG : 11 +LONG : 11.5 +LONG : 13 +LONG : 12 +LONG : 11 +LONG : 14 +LONG : 12.5 +LONG : 11.5 +LONG : 12 +LONG : 12.5 +LONG : 12 +LONG : 12.5 +LONG : 16 +LONG : 16 +LONG : 11.5 +LONG : 11.5 +LONG : 10.5 +LONG : 11.5 +LONG : 11.5 +ESPE : MULLBAR +POID : 4853 +TAIL : 1685 +CATE : F +LONG : 9.5 +LONG : 10.5 +LONG : 11.5 +LONG : 11.5 +LONG : 13 +LONG : 12 +LONG : 10.5 +LONG : 12 +LONG : 12 +LONG : 13.5 +LONG : 16.5 +LONG : 12.5 +LONG : 15.5 +LONG : 12.5 +LONG : 12 +LONG : 14 +LONG : 14.5 +LONG : 14.5 +LONG : 14.5 +LONG : 14.5 +LONG : 12.5 +LONG : 13 +LONG : 13.5 +LONG : 12 +LONG : 12 +LONG : 11.5 +LONG : 12 +LONG : 13 +LONG : 15.5 +LONG : 14.5 +LONG : 13.5 +LONG : 13 +LONG : 13 +LONG : 13 +LONG : 14 +LONG : 15.5 +LONG : 14.5 +LONG : 14 +LONG : 12.5 +LONG : 17 +LONG : 15 +LONG : 15 +LONG : 15 +LONG : 16 +LONG : 15 +LONG : 14.5 +LONG : 14.5 +LONG : 14.5 +LONG : 15.5 +LONG : 14 +LONG : 13.5 +LONG : 16 +LONG : 13.5 +LONG : 15 Property changes on: trunk/tutti-service/src/test/resources/psion/CC053.IWA ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/test/resources/psion/CFchephren 110612.IWA =================================================================== --- trunk/tutti-service/src/test/resources/psion/CFchephren 110612.IWA 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/test/resources/psion/CFchephren 110612.IWA 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,330 +1,330 @@ - -INIT : CF -PORT : LOC -DATE : 06-11-2012 -HEUR : 04:37:33 -OUTI : Pied � coulisse -NAVI : CHEPHREN -ENGI : B -ESPE : 4401 -TAXO : 1 -LONG : 10.77 -LONG : 10.25 -LONG : 11.59 -LONG : 10.55 -LONG : 12.88 -LONG : 11.06 -LONG : 9.64 -LONG : 10.16 -LONG : 12.70 -LONG : 14.29 -LONG : 14.24 -LONG : 10.48 -LONG : 11.52 -LONG : 10.60 -LONG : 10.47 -LONG : 10.77 -LONG : 8.61 -LONG : 12.94 -LONG : 12.10 -LONG : 13.31 -LONG : 10.86 -LONG : 10.71 -LONG : 13.07 -LONG : 12.02 -LONG : 11.08 -LONG : 12.31 -LONG : 11.78 -LONG : 11.94 -LONG : 10.35 -LONG : 12.07 -LONG : 9.86 -LONG : 12.28 -LONG : 10.35 -LONG : 11.28 -LONG : 12.50 -LONG : 12.09 -LONG : 11.07 -LONG : 9.63 -LONG : 10.31 -LONG : 8.85 -LONG : 10.14 -LONG : 12.15 -LONG : 10.69 -LONG : 11.50 -LONG : 10.45 -LONG : 10.10 -LONG : 10.70 -TAXO : 2 -LONG : 12.33 -LONG : 11.89 -LONG : 10.21 -LONG : 10.55 -LONG : 9.95 -LONG : 10.83 -LONG : 9.92 -LONG : 12.32 -LONG : 11.90 -LONG : 10.43 -LONG : 10.46 -LONG : 10.33 -LONG : 10.82 -LONG : 9.87 -LONG : 9.89 -LONG : 10.91 -LONG : 10.28 -LONG : 10.29 -LONG : 11.18 -LONG : 9.86 -LONG : 11.00 -LONG : 11.52 -LONG : 11.22 -LONG : 12.02 -LONG : 11.11 -LONG : 9.59 -LONG : 11.26 -LONG : 10.02 -LONG : 10.61 -LONG : 9.31 -LONG : 10.85 -LONG : 11.24 -LONG : 10.25 -LONG : 11.20 -LONG : 11.11 -LONG : 11.77 -LONG : 9.89 -LONG : 10.53 -LONG : 10.46 -LONG : 11.77 -LONG : 12.44 -LONG : 9.96 -LONG : 10.32 -LONG : 10.23 -LONG : 10.96 -LONG : 10.65 -LONG : 10.06 -LONG : 8.15 -LONG : 10.53 -LONG : 12.65 -LONG : 10.49 -LONG : 12.22 -LONG : 11.49 -LONG : 11.01 -LONG : 10.46 -LONG : 10.02 -LONG : 11.39 -LONG : 9.98 -LONG : 10.72 -LONG : 10.64 -LONG : 11.28 -LONG : 11.59 -LONG : 11.89 -LONG : 11.47 -LONG : 11.18 -LONG : 10.62 -LONG : 12.19 -LONG : 10.16 -LONG : 10.40 -LONG : 11.98 -LONG : 11.87 -LONG : 11.92 -LONG : 10.86 -LONG : 10.07 -LONG : 11.23 -LONG : 9.93 -LONG : 10.24 -LONG : 10.95 -LONG : 9.69 -LONG : 9.82 -LONG : 11.61 -LONG : 9.57 -LONG : 11.40 -LONG : 10.22 -LONG : 9.27 -LONG : 10.80 -LONG : 11.40 -LONG : 9.68 -LONG : 10.68 -LONG : 7.09 -LONG : 10.61 -LONG : 10.33 -LONG : 10.73 -TAXO : 1 -LONG : 11.79 -LONG : 11.35 -LONG : 10.58 -LONG : 11.32 -LONG : 15.86 -TAXO : 2 -LONG : 10.49 -LONG : 10.60 -LONG : 10.73 -LONG : 10.31 -LONG : 9.52 -TAXO : 1 -LONG : 1.16  -CAIS : 05:13:38 -AGEN : CF -PORT : LOC -DATE : 06-11-2012 -HEUR : 05:14:3 -OUTI : Ichtyometre -OUTI : Pied a coulisse -NAVI : CHEPHREN -ENGI : B -ESPE : 4401 -CATE : N -TAXO : 2 -LONG : 46 -TAXO : 1 -LONG : 56 -LONG : 53 -LONG : 54 -LONG : 57 -LONG : 50 -LONG : 53 -LONG : 54 -LONG : 56 -LONG : 55 -LONG : 55 -LONG : 51 -LONG : 48 -LONG : 51 -LONG : 58 -LONG : 49 -LONG : 51 -LONG : 50 -LONG : 49 -LONG : 54 -LONG : 47 -LONG : 49 -LONG : 51 -LONG : 49 -LONG : 51 -LONG : 49 -LONG : 56 -LONG : 52 -LONG : 56 -LONG : 56 -LONG : 51 -LONG : 50 -LONG : 53 -LONG : 52 -LONG : 51 -LONG : 51 -LONG : 48 -LONG : 51 -LONG : 48 -LONG : 55 -LONG : 49 -LONG : 51 -LONG : 57 -LONG : 53 -LONG : 53 -LONG : 57 -LONG : 54 -LONG : 48 -LONG : 51 -LONG : 52 -LONG : 58 -LONG : 52 -LONG : 54 -LONG : 54 -LONG : 51 -LONG : 54 -LONG : 53 -LONG : 53 -LONG : 58 -LONG : 53 -LONG : 48 -LONG : 50 -LONG : 50 -LONG : 54 -LONG : 56 -LONG : 58 -LONG : 53 -LONG : 50 -LONG : 50 -LONG : 54 -LONG : 56 -LONG : 49 -LONG : 54 -LONG : 55 -LONG : 54 -LONG : 50 -LONG : 50 -LONG : 53 -LONG : 59 -LONG : 51 -LONG : 49 -LONG : 52 -LONG : 45 -LONG : 49 -LONG : 56 -LONG : 55 -LONG : 55 -LONG : 54 -LONG : 53 -LONG : 53 -LONG : 52 -LONG : 61 -LONG : 55 -LONG : 51 -LONG : 53 -LONG : 53 -LONG : 55 -LONG : 55 -LONG : 55 -LONG : 52 -LONG : 53 -LONG : 54 -LONG : 50 -LONG : 54 -LONG : 47 -LONG : 54 -LONG : 57 -LONG : 51 -LONG : 51 -LONG : 51 -LONG : 56 -LONG : 50 -LONG : 53 -LONG : 47 -LONG : 56 -LONG : 57 -LONG : 54 -LONG : 56 -LONG : 55 -LONG : 48 -LONG : 58 -LONG : 55 -LONG : 59 -LONG : 51 -LONG : 49 -LONG : 51 -LONG : 52 -LONG : 54 -LONG : 41 -LONG : 53 -LONG : 54 -LONG : 51 -LONG : 56 -LONG : 54 -LONG : 47 -LONG : 49 -LONG : 48 -LONG : 54 -LONG : 49 -LONG : 49 -LONG : 54 -LONG : 53 -LONG : 51 -LONG : 55 -LONG : 51 -LONG : 52 -LONG : 53 -LONG : 50 -LONG : 53 -LONG : 52 -LONG : 49 -CAIS : 05:35:7 + +INIT : CF +PORT : LOC +DATE : 06-11-2012 +HEUR : 04:37:33 +OUTI : Pied � coulisse +NAVI : CHEPHREN +ENGI : B +ESPE : 4401 +TAXO : 1 +LONG : 10.77 +LONG : 10.25 +LONG : 11.59 +LONG : 10.55 +LONG : 12.88 +LONG : 11.06 +LONG : 9.64 +LONG : 10.16 +LONG : 12.70 +LONG : 14.29 +LONG : 14.24 +LONG : 10.48 +LONG : 11.52 +LONG : 10.60 +LONG : 10.47 +LONG : 10.77 +LONG : 8.61 +LONG : 12.94 +LONG : 12.10 +LONG : 13.31 +LONG : 10.86 +LONG : 10.71 +LONG : 13.07 +LONG : 12.02 +LONG : 11.08 +LONG : 12.31 +LONG : 11.78 +LONG : 11.94 +LONG : 10.35 +LONG : 12.07 +LONG : 9.86 +LONG : 12.28 +LONG : 10.35 +LONG : 11.28 +LONG : 12.50 +LONG : 12.09 +LONG : 11.07 +LONG : 9.63 +LONG : 10.31 +LONG : 8.85 +LONG : 10.14 +LONG : 12.15 +LONG : 10.69 +LONG : 11.50 +LONG : 10.45 +LONG : 10.10 +LONG : 10.70 +TAXO : 2 +LONG : 12.33 +LONG : 11.89 +LONG : 10.21 +LONG : 10.55 +LONG : 9.95 +LONG : 10.83 +LONG : 9.92 +LONG : 12.32 +LONG : 11.90 +LONG : 10.43 +LONG : 10.46 +LONG : 10.33 +LONG : 10.82 +LONG : 9.87 +LONG : 9.89 +LONG : 10.91 +LONG : 10.28 +LONG : 10.29 +LONG : 11.18 +LONG : 9.86 +LONG : 11.00 +LONG : 11.52 +LONG : 11.22 +LONG : 12.02 +LONG : 11.11 +LONG : 9.59 +LONG : 11.26 +LONG : 10.02 +LONG : 10.61 +LONG : 9.31 +LONG : 10.85 +LONG : 11.24 +LONG : 10.25 +LONG : 11.20 +LONG : 11.11 +LONG : 11.77 +LONG : 9.89 +LONG : 10.53 +LONG : 10.46 +LONG : 11.77 +LONG : 12.44 +LONG : 9.96 +LONG : 10.32 +LONG : 10.23 +LONG : 10.96 +LONG : 10.65 +LONG : 10.06 +LONG : 8.15 +LONG : 10.53 +LONG : 12.65 +LONG : 10.49 +LONG : 12.22 +LONG : 11.49 +LONG : 11.01 +LONG : 10.46 +LONG : 10.02 +LONG : 11.39 +LONG : 9.98 +LONG : 10.72 +LONG : 10.64 +LONG : 11.28 +LONG : 11.59 +LONG : 11.89 +LONG : 11.47 +LONG : 11.18 +LONG : 10.62 +LONG : 12.19 +LONG : 10.16 +LONG : 10.40 +LONG : 11.98 +LONG : 11.87 +LONG : 11.92 +LONG : 10.86 +LONG : 10.07 +LONG : 11.23 +LONG : 9.93 +LONG : 10.24 +LONG : 10.95 +LONG : 9.69 +LONG : 9.82 +LONG : 11.61 +LONG : 9.57 +LONG : 11.40 +LONG : 10.22 +LONG : 9.27 +LONG : 10.80 +LONG : 11.40 +LONG : 9.68 +LONG : 10.68 +LONG : 7.09 +LONG : 10.61 +LONG : 10.33 +LONG : 10.73 +TAXO : 1 +LONG : 11.79 +LONG : 11.35 +LONG : 10.58 +LONG : 11.32 +LONG : 15.86 +TAXO : 2 +LONG : 10.49 +LONG : 10.60 +LONG : 10.73 +LONG : 10.31 +LONG : 9.52 +TAXO : 1 +LONG : 1.16  +CAIS : 05:13:38 +AGEN : CF +PORT : LOC +DATE : 06-11-2012 +HEUR : 05:14:3 +OUTI : Ichtyometre +OUTI : Pied a coulisse +NAVI : CHEPHREN +ENGI : B +ESPE : 4401 +CATE : N +TAXO : 2 +LONG : 46 +TAXO : 1 +LONG : 56 +LONG : 53 +LONG : 54 +LONG : 57 +LONG : 50 +LONG : 53 +LONG : 54 +LONG : 56 +LONG : 55 +LONG : 55 +LONG : 51 +LONG : 48 +LONG : 51 +LONG : 58 +LONG : 49 +LONG : 51 +LONG : 50 +LONG : 49 +LONG : 54 +LONG : 47 +LONG : 49 +LONG : 51 +LONG : 49 +LONG : 51 +LONG : 49 +LONG : 56 +LONG : 52 +LONG : 56 +LONG : 56 +LONG : 51 +LONG : 50 +LONG : 53 +LONG : 52 +LONG : 51 +LONG : 51 +LONG : 48 +LONG : 51 +LONG : 48 +LONG : 55 +LONG : 49 +LONG : 51 +LONG : 57 +LONG : 53 +LONG : 53 +LONG : 57 +LONG : 54 +LONG : 48 +LONG : 51 +LONG : 52 +LONG : 58 +LONG : 52 +LONG : 54 +LONG : 54 +LONG : 51 +LONG : 54 +LONG : 53 +LONG : 53 +LONG : 58 +LONG : 53 +LONG : 48 +LONG : 50 +LONG : 50 +LONG : 54 +LONG : 56 +LONG : 58 +LONG : 53 +LONG : 50 +LONG : 50 +LONG : 54 +LONG : 56 +LONG : 49 +LONG : 54 +LONG : 55 +LONG : 54 +LONG : 50 +LONG : 50 +LONG : 53 +LONG : 59 +LONG : 51 +LONG : 49 +LONG : 52 +LONG : 45 +LONG : 49 +LONG : 56 +LONG : 55 +LONG : 55 +LONG : 54 +LONG : 53 +LONG : 53 +LONG : 52 +LONG : 61 +LONG : 55 +LONG : 51 +LONG : 53 +LONG : 53 +LONG : 55 +LONG : 55 +LONG : 55 +LONG : 52 +LONG : 53 +LONG : 54 +LONG : 50 +LONG : 54 +LONG : 47 +LONG : 54 +LONG : 57 +LONG : 51 +LONG : 51 +LONG : 51 +LONG : 56 +LONG : 50 +LONG : 53 +LONG : 47 +LONG : 56 +LONG : 57 +LONG : 54 +LONG : 56 +LONG : 55 +LONG : 48 +LONG : 58 +LONG : 55 +LONG : 59 +LONG : 51 +LONG : 49 +LONG : 51 +LONG : 52 +LONG : 54 +LONG : 41 +LONG : 53 +LONG : 54 +LONG : 51 +LONG : 56 +LONG : 54 +LONG : 47 +LONG : 49 +LONG : 48 +LONG : 54 +LONG : 49 +LONG : 49 +LONG : 54 +LONG : 53 +LONG : 51 +LONG : 55 +LONG : 51 +LONG : 52 +LONG : 53 +LONG : 50 +LONG : 53 +LONG : 52 +LONG : 49 +CAIS : 05:35:7 Property changes on: trunk/tutti-service/src/test/resources/psion/CFchephren 110612.IWA ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/test/resources/psion/FM001.IWA =================================================================== --- trunk/tutti-service/src/test/resources/psion/FM001.IWA 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-service/src/test/resources/psion/FM001.IWA 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,220 +1,220 @@ -fm -A -07-01-2013 -18:28:13 - -ESPE : HELIDAC -POID : 1040 -TAIL : 1040 -CATE : N -LONG : 21.5 -LONG : 26 -LONG : 22 -LONG : 24 -LONG : 25.5 -ESPE : TODASAG -POID : 265 -TAIL : 265 -CATE : N -LONG : 21 -ESPE : RAJAOXY -POID : 115 -TAIL : 115 -CATE : M -LONG : 34 -ESPE : RAJAOXY -POID : 115 -TAIL : 115 -CATE : F1 -LONG : 35 -ESPE : RAJAOXY -POID : 115 -TAIL : 115 -CATE : F2 -LONG : 36 -ESPE : PHYIBLE -POID : 235 -TAIL : 235 -CATE : N -LONG : 6.5 -LONG : 6.5 -LONG : 7.5 -LONG : 7.5 -LONG : 6 -LONG : 6.5 -LONG : 7.5 -LONG : 7.5 -LONG : 8 -LONG : 8 -LONG : 6.5 -LONG : 8.5 -LONG : 7.5 -LONG : 7 -LONG : 5.5 -LONG : 7.5 -LONG : 7 -LONG : 6.5 -LONG : 7.5 -LONG : 7.5 -LONG : 6 -LONG : 6 -LONG : 6 -LONG : 6.5 -LONG : 5.5 -LONG : 6.5 -LONG : 7 -LONG : 7.5 -LONG : 6.5 -LONG : 18 -LONG : 16 -LONG : 22.5 -LONG : 15.5 -LONG : 16 -LONG : 7.5 -LONG : 7.5 -ESPE : GALUMEL -POID : 1460 -TAIL : 1460 -CATE : M -LONG : 35 -LONG : 32.5 -LONG : 34 -LONG : 33.5 -LONG : 40 -LONG : 40 -LONG : 40 -LONG : 42 -LONG : 45 -ESPE : LEPMBOS -POID : 275 -TAIL : 275 -CATE : N -LONG : 21 -LONG : 15.5 -LONG : 16.5 -LONG : 20 -LONG : 20 -LONG : 14 -ESPE : GALUMEL -POID : 4890 -TAIL : 4890 -CATE : F -LONG : 42 -LONG : 43.5 -LONG : 34 -LONG : 40 -LONG : 44 -LONG : 36.5 -LONG : 30.5 -LONG : 37.5 -LONG : 40 -LONG : 38 -LONG : 37 -LONG : 38 -LONG : 37 -LONG : 40 -LONG : 43 -LONG : 38 -LONG : 35 -LONG : 46 -LONG : 49 -LONG : 48.5 -LONG : 48.5 -LONG : 46.5 -LONG : 48.5 -ESPE : NEPRNOR -POID : 110 -TAIL : 110 -CATE : F -LONG : 28 -LONG : 31 -LONG : 29 -LONG : 36 -LONG : 25 -LONG : 32 -LONG : 32 -LONG : 34 -ESPE : NEPRNOR -POID : 365 -TAIL : 365 -CATE : M -LONG : 54 -LONG : 44 -LONG : 47 -LONG : 39 -LONG : 27 -LONG : 37 -LONG : 30 -LONG : 32 -LONG : 34 -LONG : 32 -ESPE : ARISFOL -POID : 775 -TAIL : 775 -CATE : F -LONG : 46 -LONG : 47 -LONG : 43 -LONG : 43 -LONG : 45 -LONG : 43 -LONG : 45 -LONG : 47 -LONG : 46 -LONG : 33 -LONG : 43 -LONG : 33 -LONG : 29 -LONG : 43 -LONG : 46 -LONG : 45 -LONG : 46 -LONG : 45 -LONG : 46 -LONG : 43 -LONG : 42 -LONG : 42 -LONG : 43 -LONG : 45 -LONG : 46 -LONG : 45 -LONG : 47 -LONG : 45 -LONG : 40 -ESPE : ARISFOL -POID : 75 -TAIL : 75 -CATE : M -LONG : 34 -LONG : 32 -LONG : 38 -LONG : 32 -LONG : 33 -ESPE : PAPELON -POID : 40 -TAIL : 40 -CATE : M -LONG : 30 -LONG : 32 -LONG : 33 -ESPE : PAPELON -POID : 40 -TAIL : 40 -CATE : F -LONG : 36 -LONG : 36 -ESPE : ETMOSPI -POID : 90 -TAIL : 90 -CATE : F -LONG : 20 -LONG : 19.5 -LONG : 12.5 -ESPE : ETMOSPI -POID : 295 -TAIL : 295 -CATE : M -LONG : 18.5 -LONG : 13 -LONG : 30.5 -LONG : 30.5 +fm +A +07-01-2013 +18:28:13 + +ESPE : HELIDAC +POID : 1040 +TAIL : 1040 +CATE : N +LONG : 21.5 +LONG : 26 +LONG : 22 +LONG : 24 +LONG : 25.5 +ESPE : TODASAG +POID : 265 +TAIL : 265 +CATE : N +LONG : 21 +ESPE : RAJAOXY +POID : 115 +TAIL : 115 +CATE : M +LONG : 34 +ESPE : RAJAOXY +POID : 115 +TAIL : 115 +CATE : F1 +LONG : 35 +ESPE : RAJAOXY +POID : 115 +TAIL : 115 +CATE : F2 +LONG : 36 +ESPE : PHYIBLE +POID : 235 +TAIL : 235 +CATE : N +LONG : 6.5 +LONG : 6.5 +LONG : 7.5 +LONG : 7.5 +LONG : 6 +LONG : 6.5 +LONG : 7.5 +LONG : 7.5 +LONG : 8 +LONG : 8 +LONG : 6.5 +LONG : 8.5 +LONG : 7.5 +LONG : 7 +LONG : 5.5 +LONG : 7.5 +LONG : 7 +LONG : 6.5 +LONG : 7.5 +LONG : 7.5 +LONG : 6 +LONG : 6 +LONG : 6 +LONG : 6.5 +LONG : 5.5 +LONG : 6.5 +LONG : 7 +LONG : 7.5 +LONG : 6.5 +LONG : 18 +LONG : 16 +LONG : 22.5 +LONG : 15.5 +LONG : 16 +LONG : 7.5 +LONG : 7.5 +ESPE : GALUMEL +POID : 1460 +TAIL : 1460 +CATE : M +LONG : 35 +LONG : 32.5 +LONG : 34 +LONG : 33.5 +LONG : 40 +LONG : 40 +LONG : 40 +LONG : 42 +LONG : 45 +ESPE : LEPMBOS +POID : 275 +TAIL : 275 +CATE : N +LONG : 21 +LONG : 15.5 +LONG : 16.5 +LONG : 20 +LONG : 20 +LONG : 14 +ESPE : GALUMEL +POID : 4890 +TAIL : 4890 +CATE : F +LONG : 42 +LONG : 43.5 +LONG : 34 +LONG : 40 +LONG : 44 +LONG : 36.5 +LONG : 30.5 +LONG : 37.5 +LONG : 40 +LONG : 38 +LONG : 37 +LONG : 38 +LONG : 37 +LONG : 40 +LONG : 43 +LONG : 38 +LONG : 35 +LONG : 46 +LONG : 49 +LONG : 48.5 +LONG : 48.5 +LONG : 46.5 +LONG : 48.5 +ESPE : NEPRNOR +POID : 110 +TAIL : 110 +CATE : F +LONG : 28 +LONG : 31 +LONG : 29 +LONG : 36 +LONG : 25 +LONG : 32 +LONG : 32 +LONG : 34 +ESPE : NEPRNOR +POID : 365 +TAIL : 365 +CATE : M +LONG : 54 +LONG : 44 +LONG : 47 +LONG : 39 +LONG : 27 +LONG : 37 +LONG : 30 +LONG : 32 +LONG : 34 +LONG : 32 +ESPE : ARISFOL +POID : 775 +TAIL : 775 +CATE : F +LONG : 46 +LONG : 47 +LONG : 43 +LONG : 43 +LONG : 45 +LONG : 43 +LONG : 45 +LONG : 47 +LONG : 46 +LONG : 33 +LONG : 43 +LONG : 33 +LONG : 29 +LONG : 43 +LONG : 46 +LONG : 45 +LONG : 46 +LONG : 45 +LONG : 46 +LONG : 43 +LONG : 42 +LONG : 42 +LONG : 43 +LONG : 45 +LONG : 46 +LONG : 45 +LONG : 47 +LONG : 45 +LONG : 40 +ESPE : ARISFOL +POID : 75 +TAIL : 75 +CATE : M +LONG : 34 +LONG : 32 +LONG : 38 +LONG : 32 +LONG : 33 +ESPE : PAPELON +POID : 40 +TAIL : 40 +CATE : M +LONG : 30 +LONG : 32 +LONG : 33 +ESPE : PAPELON +POID : 40 +TAIL : 40 +CATE : F +LONG : 36 +LONG : 36 +ESPE : ETMOSPI +POID : 90 +TAIL : 90 +CATE : F +LONG : 20 +LONG : 19.5 +LONG : 12.5 +ESPE : ETMOSPI +POID : 295 +TAIL : 295 +CATE : M +LONG : 18.5 +LONG : 13 +LONG : 30.5 +LONG : 30.5 Property changes on: trunk/tutti-service/src/test/resources/psion/FM001.IWA ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-service/src/test/resources/psion/protocol.tuttiProtocol ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Wed Jan 29 07:36:56 CET 2014 tutti.config.help=config.html Property changes on: trunk/tutti-ui-swing/src/main/help/export/accidentalCatch.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/catch.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/exportCruise-example.zip ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/help/export/gearCaracteristics.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/individualObservation.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/marineLitter.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/operation.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/parameter.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/species.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/help/export/survey.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,8 +4,8 @@ <!-- #%L Tutti :: UI - $Id: dbManager.html 1487 2014-01-15 12:45:59Z lkaufmann $ - $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/tutti-ui-swing/src/main/help/... $ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 Ifremer %% Property changes on: trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/fr/genericExport.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/genericExport.html 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/help/fr/genericExport.html 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ #%L Tutti :: UI $Id$ - $HeadURL: https://svn.forge.codelutin.com/svn/tutti/trunk/tutti-ui-swing/src/main/help... $ + $HeadURL$ %% Copyright (C) 2012 - 2013 Ifremer %% Property changes on: trunk/tutti-ui-swing/src/main/help/fr/genericExport.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -113,13 +113,13 @@ // Application category helper.addCategory(n("tutti.config.category.applications"), - n("tutti.config.category.applications.description"), - CALLBACK_APPLICATION) + n("tutti.config.category.applications.description")) .addOption(TuttiConfigurationOption.CSV_SEPARATOR) .setOptionShortLabel(t("tutti.config.option.csv.separator.shortLabel")) .addOption(TuttiConfigurationOption.UI_CONFIG_FILE) .setOptionShortLabel(t("tutti.config.option.ui.config.file.shortLabel")) + .setOptionCallBack(CALLBACK_APPLICATION) .addOption(TuttiConfigurationOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE) .setOptionShortLabel(t("tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel")) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 2014-02-04 16:41:40 UTC (rev 1573) @@ -2,7 +2,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,8 +1,8 @@ <!-- #%L Tutti :: UI - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2014 Ifremer %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-02-04 16:41:40 UTC (rev 1573) @@ -1,8 +1,8 @@ <!-- #%L Tutti :: UI - $Id: ComputableDataEditor.jaxx 1387 2013-11-25 16:03:00Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -5,7 +5,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-02-04 12:25:41 UTC (rev 1572) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-02-04 16:41:40 UTC (rev 1573) @@ -4,7 +4,7 @@ * #%L * Tutti :: UI * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT * %% Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-down.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-bluetooth-up.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-psion-import.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-sort.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL