branch develop updated (f541684 -> 24fa7eb)

older
branch master updated (077a94d ->...

codelutin.com scm

26 Jan 2016 26 Jan '16

11:18 a.m.

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 f541684 Supprimer une phrase à l'ouverture de la connexion avec le BingFin (Fixes #7938) new 9e1882b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d8d862 [jgitflow-maven-plugin]updating poms for 4.4-rc2 branch with snapshot versions new 657e3ad upgrade pom version new 84a8d56 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions new ef0be51 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' new 9c2cc73 [jgitflow-maven-plugin]merging 'master' into 'develop' new 24fa7eb [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 24fa7eb66baaa1d0465013c32b360ea2eb9061d1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:07 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9c2cc738689e2b2000121b4952fe4d3d782aa015 Merge: 9e1882b ef0be51 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:06 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 9e1882bb4fffd9c377c2915af67d04943f58d144 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ef0be5196b37b4fa5d3d0c138d91a5ac8e5e3f78 Merge: 077a94d 84a8d56 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:16:54 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' commit 84a8d564b391c1017f7f70b6b272a319ff731cf4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:05:12 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions commit 657e3adb0ef8f7245a21ee2066a1bd80940e4884 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:02:59 2016 +0100 upgrade pom version Summary of changes: pom.xml | 2 +- .../protocol/rtp/actions/CopyMaleRtpAction.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

Show replies by date

codelutin.com scm

26 Jan 26 Jan

11:18 a.m.

New subject: 01/06: upgrade pom version

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 657e3adb0ef8f7245a21ee2066a1bd80940e4884 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:02:59 2016 +0100 upgrade pom version --- pom.xml | 2 +- .../protocol/rtp/actions/CopyMaleRtpAction.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2aebb1b..70eee09 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>5.1</version> + <version>6</version> </parent> <groupId>fr.ifremer</groupId> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java index 2b4f6f4..01cc974 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2016 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.ui.swing.content.protocol.rtp.RtpEditorUI; import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpEditorUIModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

codelutin.com scm

11:18 a.m.

New subject: 02/06: [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions

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 84a8d564b391c1017f7f70b6b272a319ff731cf4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:05:12 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 70eee09..04d3830 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 79cca68..cd22ea8 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index cf12a1e..3178161 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 4dc51f8..e39fc15 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 410f67c..7e8682d 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 5eb0e5c..2bf8e88 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a27568d..9231e13 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>4.4-rc2-SNAPSHOT</version> + <version>4.4-rc2</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>.

codelutin.com scm

11:18 a.m.

New subject: 03/06: [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master'

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 ef0be5196b37b4fa5d3d0c138d91a5ac8e5e3f78 Merge: 077a94d 84a8d56 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:16:54 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 3 ++ .../protocol/EditProtocolSpeciesTableModel.java | 42 +++++++++++++++++ .../content/protocol/EditProtocolUIHandler.java | 3 -- .../ui/swing/content/protocol/rtp/RtpButton.java | 14 ++++-- .../swing/content/protocol/rtp/RtpCellEditor.java | 4 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 45 +++++++++--------- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 10 ++++ .../content/protocol/rtp/RtpEditorUIHandler.java | 9 ++-- .../content/protocol/rtp/RtpEditorUIModel.java | 32 +++++++++++-- .../protocol/rtp/actions/CopyMaleRtpAction.java | 53 ++++++++++++++++++++++ .../ifremer/tutti/ui/swing/util/SoundEngine.java | 38 +++++++++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 +- 20 files changed, 215 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

codelutin.com scm

11:18 a.m.

New subject: 04/06: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts

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 9e1882bb4fffd9c377c2915af67d04943f58d144 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:05 2016 +0100 [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-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index bf3c161..ef2fa4d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a28c3ed..cd22ea8 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 65c9349..3178161 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 9b4bc23..e39fc15 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 12cb7ea..7e8682d 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 0588e83..2bf8e88 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8b65dec..9231e13 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>4.4-SNAPSHOT</version> + <version>4.4-rc2</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>.

codelutin.com scm

11:18 a.m.

New subject: 05/06: [jgitflow-maven-plugin]merging 'master' into 'develop'

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 9c2cc738689e2b2000121b4952fe4d3d782aa015 Merge: 9e1882b ef0be51 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:06 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' pom.xml | 2 +- .../protocol/rtp/actions/CopyMaleRtpAction.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

codelutin.com scm

11:18 a.m.

New subject: 06/06: [jgitflow-maven-plugin]Updating develop poms back to pre merge state

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 24fa7eb66baaa1d0465013c32b360ea2eb9061d1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 12:17:07 2016 +0100 [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-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 04d3830..8036275 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index cd22ea8..a28c3ed 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 3178161..65c9349 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index e39fc15..9b4bc23 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7e8682d..12cb7ea 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 2bf8e88..0588e83 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc2</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9231e13..8b65dec 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>4.4-rc2</version> + <version>4.4-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>.

3793

Age (days ago)

3793

Last active (days ago)

List overview

Download

6 comments

1 participants

participants (1)

codelutin.com scm