branch develop updated (ddad190 -> 3326561)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ddad190 fix test new de888bd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f4cda29 prepare release 3.10 new 1997223 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions new 70ee396 Merge branch 'release/3.10' new 372ce65 Merge branch 'master' into develop new 3326561 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3326561e3aa0846e952b38bd2eb6bc94920c0303 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 372ce65eaa074e45f24898214cbcc4e7ea6cf2f1 Merge: de888bd 70ee396 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 Merge branch 'master' into develop commit de888bdda6015d889e6dc291a1569c842c89ac76 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 70ee3967c6919053646817e3a9b5e071bc9f6e4d Merge: bc41c04 1997223 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:48 2014 +0000 Merge branch 'release/3.10' commit 1997223fe5502c35995aa88acd183c5b17cd6e39 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:07:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions commit f4cda2962eff51f3758728c781ee95222788a184 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:06:41 2014 +0000 prepare release 3.10 Summary of changes: .../RemoteDeviceCantGetNameException.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderMeasureRecord.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordFactory.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordSupport.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderStylusMotionRecord.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocol2.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 24 ++++++++++++++++++++++ .../FishingOperationImportService.java | 24 ++++++++++++++++++++++ ...olumnFileFishingOperationNotFoundException.java | 24 ++++++++++++++++++++++ .../ImportFromColumnFileInvalidRowException.java | 24 ++++++++++++++++++++++ ...ImportFromColumnFileMissingHeaderException.java | 24 ++++++++++++++++++++++ .../operationimport/ImportFromColumnFileModel.java | 24 ++++++++++++++++++++++ ...perationCaracteristicsFromColumnFileAction.java | 24 ++++++++++++++++++++++ .../action/LoadProtocolImportColumnsAction.java | 24 ++++++++++++++++++++++ .../action/RemoveCaracteristicMappingAction.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsTableModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsTableModel.java | 24 ++++++++++++++++++++++ .../ui/swing/util/TuttiNumberTickUnitSource.java | 24 ++++++++++++++++++++++ 21 files changed, 504 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit f4cda2962eff51f3758728c781ee95222788a184 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:06:41 2014 +0000 prepare release 3.10 --- .../RemoteDeviceCantGetNameException.java | 24 +++++++++++++++++++ .../feed/record/FeedReaderMeasureRecord.java | 24 +++++++++++++++++++ .../feed/record/FeedReaderRecordFactory.java | 24 +++++++++++++++++++ .../feed/record/FeedReaderRecordSupport.java | 24 +++++++++++++++++++ .../feed/record/FeedReaderStylusMotionRecord.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 24 +++++++++++++++++++ .../entities/protocol/v2/TuttiProtocol2.java | 24 +++++++++++++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 24 +++++++++++++++++++ .../entities/protocol/TuttiProtocolsTest.java | 27 ++++++++++++++-------- .../FishingOperationImportService.java | 24 +++++++++++++++++++ ...olumnFileFishingOperationNotFoundException.java | 24 +++++++++++++++++++ .../ImportFromColumnFileInvalidRowException.java | 24 +++++++++++++++++++ ...ImportFromColumnFileMissingHeaderException.java | 24 +++++++++++++++++++ .../operationimport/ImportFromColumnFileModel.java | 24 +++++++++++++++++++ ...perationCaracteristicsFromColumnFileAction.java | 24 +++++++++++++++++++ .../action/LoadProtocolImportColumnsAction.java | 24 +++++++++++++++++++ .../action/RemoveCaracteristicMappingAction.java | 24 +++++++++++++++++++ .../EditProtocolCaracteristicsRowModel.java | 24 +++++++++++++++++++ .../EditProtocolCaracteristicsTableModel.java | 24 +++++++++++++++++++ .../EditProtocolOperationFieldsRowModel.java | 24 +++++++++++++++++++ .../EditProtocolOperationFieldsTableModel.java | 24 +++++++++++++++++++ .../ui/swing/util/TuttiNumberTickUnitSource.java | 24 +++++++++++++++++++ 22 files changed, 522 insertions(+), 9 deletions(-) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceCantGetNameException.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceCantGetNameException.java index 08e3e9d..7267817 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceCantGetNameException.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceCantGetNameException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer; +/* + * #%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% + */ + /** * Created on 12/9/14. * diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java index 8f1f225..362537e 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer.feed.record; +/* + * #%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 org.apache.commons.lang3.builder.ToStringBuilder; import java.util.regex.Matcher; diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java index cf07f47..829833a 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer.feed.record; +/* + * #%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 java.util.LinkedHashSet; import java.util.Set; diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java index 93134d9..175e04f 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer.feed.record; +/* + * #%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.base.Preconditions; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java index 7674bf0..2df31f1 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer.feed.record; +/* + * #%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 org.apache.commons.lang3.builder.ToStringBuilder; import java.util.regex.Matcher; diff --git a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java index 3f71f9f..76ada4d 100644 --- a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java +++ b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer; +/* + * #%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 org.junit.Assume; import java.util.Set; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java index df7322c..61ab436 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocol2.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol.v2; +/* + * #%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 fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java index 76ac378..81fed6a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol.v2; +/* + * #%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 fr.ifremer.tutti.persistence.entities.TuttiEntityBean; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java index 622ee61..e101c29 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java @@ -70,10 +70,23 @@ public class TuttiProtocolsTest { " speciesReferenceTaxonId: 3835\n" + " speciesSurveyCode: CHIN\n" + " weightEnabled: true\n" + + "caracteristicMapping: \n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 114\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 228\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 821\n" + + " tab: VESSEL_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 21\n" + + " tab: GEAR_USE_FEATURE\n" + + "- !CaracteristicMappingRow\n" + + " pmfmId: 22\n" + + " tab: GEAR_USE_FEATURE\n" + "comment: Commentaire\n" + - "gearUseFeaturePmfmId: \n" + - "- 21\n" + - "- 22\n" + "lengthClassesPmfmId: \n" + "- 14\n" + "- 18\n" + @@ -101,11 +114,7 @@ public class TuttiProtocolsTest { " speciesReferenceTaxonId: 3835\n" + " speciesSurveyCode: CHIN\n" + " weightEnabled: true\n" + - "version: 2\n" + - "vesselUseFeaturePmfmId: \n" + - "- 114\n" + - "- 228\n" + - "- 821"; + "version: " + TuttiProtocols.CURRENT_PROTOCOL_VERSION; public static final int VRAC_HORS_VRAC = 1428; @@ -251,7 +260,7 @@ public class TuttiProtocolsTest { private TuttiProtocol createProtocolFixture() { TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); - protocol.setVersion(2); + protocol.setVersion(TuttiProtocols.CURRENT_PROTOCOL_VERSION); protocol.setId("1"); protocol.setName("protocolName"); protocol.setComment("Commentaire"); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java index a68cbb2..1fb6c1f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.operationimport; +/* + * #%L + * Tutti :: Service + * $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.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Maps; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java index 66cb57e..17b67b2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.operationimport; +/* + * #%L + * Tutti :: Service + * $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% + */ + /** * When no matching fishing operation was found in from column file import file. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java index 03771fe..2da444d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.operationimport; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.data.FishingOperation; import org.nuiton.csv.AbstractImportErrorInfo; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java index 21702e2..a021e1b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.operationimport; +/* + * #%L + * Tutti :: Service + * $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% + */ + /** * when a column header is missing in the import file. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java index 742a381..0fedc3a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.operationimport; +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java index d5dd486..1e4aca3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%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% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.operationimport.FishingOperationImportService; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java index e807876..f1c9942 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%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% + */ + import com.csvreader.CsvReader; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java index bc7eb03..c98081e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%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% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java index d2ec82a..7b6b643 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol; +/* + * #%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% + */ + import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java index 93de4ae..a4095d2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol; +/* + * #%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% + */ + import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java index f0a9b53..14b3365 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol; +/* + * #%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% + */ + import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRowBean; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java index 0be5d51..b485965 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol; +/* + * #%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% + */ + import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java index b33dd09..3001c9b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util; +/* + * #%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% + */ + /* =========================================================== * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1997223fe5502c35995aa88acd183c5b17cd6e39 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:07:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 44b941f..d847e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2256dee..1eddd4d 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9b5ec38..ec68c2f 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e47383b..d2bb86b 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index cd9aeb9..0837268 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 70ee3967c6919053646817e3a9b5e071bc9f6e4d Merge: bc41c04 1997223 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:48 2014 +0000 Merge branch 'release/3.10' pom.xml | 2 +- .../AllegroCampagne-Specifications.odt | Bin 776831 -> 766872 bytes .../AllegroCampagne-Specifications.pdf | Bin 1400148 -> 1420873 bytes tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 26 +- ....java => RemoteDeviceCantGetNameException.java} | 36 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 50 ++- .../tutti/ichtyometer/feed/FeedReaderRecord.java | 166 -------- .../feed/{ => event}/FeedReaderEvent.java | 11 +- .../feed/{ => event}/FeedReaderListener.java | 2 +- .../feed/record/FeedReaderMeasureRecord.java | 81 ++++ .../feed/record/FeedReaderRecordFactory.java | 96 +++++ .../FeedReaderRecordSupport.java} | 44 +- .../feed/record/FeedReaderStylusMotionRecord.java | 81 ++++ .../tutti/ichtyometer/interactive/Command.java | 10 +- .../ichtyometer/interactive/CommandEngine.java | 16 +- .../tutti/ichtyometer/tool/CRCBuilderTool.java | 58 --- .../tutti/ichtyometer/tool/FeedReaderTool.java | 6 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 4 +- .../{IchtyometerClientTest.java => BigFins.java} | 41 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 17 +- .../ichtyometer/feed/FeedReaderRecordTest.java | 64 --- .../tutti/ichtyometer/feed/FeedReaderTest.java | 20 +- .../ichtyometer/interactive/CommandEngineTest.java | 80 ++-- .../src/test/resources/log4j.properties | 2 +- tutti-persistence/pom.xml | 2 +- .../entities}/protocol/CaracteristicType.java | 16 +- .../entities/protocol/TuttiProtocols.java | 180 ++++++-- .../entities/protocol/v2/TuttiProtocol2.java | 204 +++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 466 ++++++++++++++++++++ .../service/ProtocolPersistenceServiceImpl.java | 3 +- .../i18n/tutti-persistence_en_GB.properties | 4 + .../src/main/xmi/tutti-persistence.properties | 3 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56767 -> 57983 bytes ...-persistence.zargo => tutti-persistence.zargo~} | Bin 56767 -> 57983 bytes .../entities/protocol/TuttiProtocolsTest.java | 45 +- .../ProtocolPersistenceServiceReadTest.java | 11 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 11 + .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 70 +++ .../service/export/generic/CatchExportModel.java | 15 +- .../FishingOperationImportService.java | 191 +++++++++ ...lumnFileFishingOperationNotFoundException.java} | 24 +- .../ImportFromColumnFileInvalidRowException.java | 53 +++ ...ImportFromColumnFileMissingHeaderException.java | 38 +- .../operationimport/ImportFromColumnFileModel.java | 234 ++++++++++ .../tutti/service/protocol/CaracteristicRow.java | 1 + .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 58 ++- .../resources/i18n/tutti-service_en_GB.properties | 8 + .../resources/i18n/tutti-service_fr_FR.properties | 5 + .../protocol/ProtocolImportExportServiceTest.java | 35 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 8 +- tutti-ui-swing/src/main/help/en/config.html | 13 +- tutti-ui-swing/src/main/help/fr/config.html | 10 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../action/AddCaracteristicMappingAction.java | 94 ++++ ...perationCaracteristicsFromColumnFileAction.java | 152 +++++++ .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../action/LoadProtocolImportColumnsAction.java | 86 ++++ .../action/RemoveCaracteristicMappingAction.java | 129 ++++++ .../tutti/ui/swing/action/SaveProtocolAction.java | 29 ++ .../content/operation/EditFishingOperationUI.css | 10 + .../content/operation/EditFishingOperationUI.jaxx | 1 + .../operation/EditFishingOperationUIHandler.java | 18 + .../operation/EditFishingOperationUIModel.java | 13 + .../frequency/BenthosFrequencyUIHandler.java | 67 ++- .../benthos/frequency/BenthosFrequencyUIModel.java | 44 ++ .../frequency/SpeciesFrequencyUIHandler.java | 99 ++++- .../species/frequency/SpeciesFrequencyUIModel.java | 44 ++ .../fishing/AbstractCaracteristicTabUIHandler.java | 26 +- .../fishing/GearUseFeatureTabUIHandler.java | 10 +- .../fishing/VesselUseFeatureTabUIHandler.java | 10 +- .../EditProtocolCaracteristicsRowModel.java | 118 ++++++ .../EditProtocolCaracteristicsTableModel.java | 69 +++ .../EditProtocolOperationFieldsRowModel.java | 81 ++++ .../EditProtocolOperationFieldsTableModel.java | 58 +++ .../ui/swing/content/protocol/EditProtocolUI.css | 63 ++- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 46 +- .../content/protocol/EditProtocolUIHandler.java | 472 ++++++++++++++++----- .../content/protocol/EditProtocolUIModel.java | 353 +++++++++++---- .../ui/swing/util/TuttiNumberTickUnitSource.java | 229 ++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 36 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 39 +- 86 files changed, 4200 insertions(+), 834 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit de888bdda6015d889e6dc291a1569c842c89ac76 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d0e5b16..d847e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.10</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index cb1d1c7..1eddd4d 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 497201d..ec68c2f 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a3db430..d2bb86b 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index dd728d1..0837268 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 372ce65eaa074e45f24898214cbcc4e7ea6cf2f1 Merge: de888bd 70ee396 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 Merge branch 'master' into develop .../RemoteDeviceCantGetNameException.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderMeasureRecord.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordFactory.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordSupport.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderStylusMotionRecord.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocol2.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 24 ++++++++++++++++++++++ .../FishingOperationImportService.java | 24 ++++++++++++++++++++++ ...olumnFileFishingOperationNotFoundException.java | 24 ++++++++++++++++++++++ .../ImportFromColumnFileInvalidRowException.java | 24 ++++++++++++++++++++++ ...ImportFromColumnFileMissingHeaderException.java | 24 ++++++++++++++++++++++ .../operationimport/ImportFromColumnFileModel.java | 24 ++++++++++++++++++++++ ...perationCaracteristicsFromColumnFileAction.java | 24 ++++++++++++++++++++++ .../action/LoadProtocolImportColumnsAction.java | 24 ++++++++++++++++++++++ .../action/RemoveCaracteristicMappingAction.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsTableModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsTableModel.java | 24 ++++++++++++++++++++++ .../ui/swing/util/TuttiNumberTickUnitSource.java | 24 ++++++++++++++++++++++ 21 files changed, 504 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3326561e3aa0846e952b38bd2eb6bc94920c0303 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d847e0a..d0e5b16 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 1eddd4d..cb1d1c7 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index ec68c2f..497201d 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d2bb86b..a3db430 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 0837268..dd728d1 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm