branch develop updated (d26b8d1 -> 876198c)
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 d26b8d1 [jgitflow-maven-plugin]updating poms for 3.12-SNAPSHOT development new 50ef408 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new af6f02b prepaere release 3.11 new 8c3c79c [jgitflow-maven-plugin]updating poms for branch'release/3.11' with non-snapshot versions new f48e786 Merge branch 'release/3.11' new be84c4b Merge branch 'master' into develop new 876198c [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 876198c4e750fddb1b45d297673bc500cb815c43 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:13 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit be84c4bc8e453fdf676ed01b9fd8a156ee6035dd Merge: 50ef408 f48e786 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:12 2015 +0000 Merge branch 'master' into develop commit 50ef408da450b8be11790f010e8c004d95437a9c Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:12 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f48e78614088a02f1bb9d8cbd286be38015e172a Merge: 70ee396 8c3c79c Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:10 2015 +0000 Merge branch 'release/3.11' commit 8c3c79cd7d58b6c5b1c3274c1889facda907797d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:03:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11' with non-snapshot versions commit af6f02ba7f226d142c557ecb527236e795d6b3f7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:03:14 2015 +0000 prepaere release 3.11 Summary of changes: .../entities/data/FishingOperations.java | 24 ++++++++++++++++++++++ .../frequency/BenthosFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...thosFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteBenthosFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateBenthosFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteSpeciesFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.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 af6f02ba7f226d142c557ecb527236e795d6b3f7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:03:14 2015 +0000 prepaere release 3.11 --- .../entities/data/FishingOperations.java | 24 ++++++++++++++++++++++ .../frequency/BenthosFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...thosFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteBenthosFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateBenthosFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteSpeciesFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.java | 24 ++++++++++++++++++++++ 21 files changed, 504 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java index 8ce113a..2ac6f1e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 javax.annotation.Generated; @Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Fri Dec 12 17:02:04 CET 2014") diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java index 60e42e2..3359f5a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Sets; import org.apache.commons.lang3.mutable.MutableInt; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java index d2166b7..663ccc2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java index 7780b51..88a2901 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyLogRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyLogsTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java index 54763b1..4f182fe 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.benthos.frequency.BenthosFrequencyUI; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java index 8e07d65..ff30ecb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.benthos.frequency.BenthosFrequencyLogCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyLogRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyLogsTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java index 1194eac..d2caa75 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 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/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java index 4f75ae8..4427d02 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java index 72c63c8..dcfd9d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.benthos.frequency.BenthosFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIHandler; import jaxx.runtime.SwingUtil; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java index ce3a797..32c58b2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.benthos.frequency.BenthosFrequencyUI; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java index 9224d5c..deedbac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Sets; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java index 5001d57..b9e3281 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Sets; import org.apache.commons.lang3.mutable.MutableInt; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java index a6b167a..8cdb3f8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java index f4520e4..c0935d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogsTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java index c43b135..64b6595 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.species.frequency.SpeciesFrequencyUI; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java index c65e463..ebd0bf7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.species.frequency.SpeciesFrequencyLogCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogsTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java index 65b3c31..0fd249b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 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/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java index fbb7570..8b72765 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java index 5c9e33d..dcac177 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import jaxx.runtime.SwingUtil; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java index cf47406..0032b0f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.operation.catches.species.frequency.SpeciesFrequencyUI; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java index 1dca8f3..0395c38 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Sets; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; -- 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 8c3c79cd7d58b6c5b1c3274c1889facda907797d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:03:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11' 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 e4d7c12..b18bae3 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.11</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index cb1d1c7..2aaf8fa 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.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 497201d..d6c4a58 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.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a3db430..0879151 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.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index d84ffcc..f3025d3 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.11</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 f48e78614088a02f1bb9d8cbd286be38015e172a Merge: 70ee396 8c3c79c Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:10 2015 +0000 Merge branch 'release/3.11' pom.xml | 10 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../entities/data/FishingOperations.java | 37 ++ .../FishingOperationPersistenceServiceImpl.java | 4 +- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 57983 -> 57987 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57983 -> 0 bytes ...ishingOperationPersistenceServiceWriteTest.java | 2 +- .../ProtocolPersistenceServiceReadTest.java | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 24 + .../export/generic/OperationExportModel.java | 2 +- .../service/export/generic/OperationExportRow.java | 2 +- .../operationimport/ImportFromColumnFileModel.java | 81 ++- .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../multipost/MultiPostImportServiceTest.java | 3 + .../export/generic/TuttiExportServiceTest.java | 8 +- .../protocol/ProtocolImportExportServiceTest.java | 30 +- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 7 +- .../src/test/resources/pupitri/ano-3898.car | 8 +- .../test/resources/pupitri/ano-5079.tuttiProtocol | 1 + tutti-ui-swing/pom.xml | 14 +- .../tutti/ui/swing/action/ShowAboutAction.java | 3 +- .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 4 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/operation/EditFishingOperationUI.css | 60 +- .../content/operation/EditFishingOperationUI.jaxx | 22 +- .../operation/EditFishingOperationUIHandler.java | 4 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../content/operation/catches/EditCatchesUI.css | 14 +- .../operation/catches/SampleCategoryComponent.java | 16 +- .../accidental/create/CreateAccidentalBatchUI.css | 11 +- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 10 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../benthos/create/CreateBenthosBatchUI.css | 11 +- .../benthos/create/CreateBenthosBatchUI.jaxx | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 10 +- .../BenthosFrequencyLogCellComponent.java | 82 ++- .../frequency/BenthosFrequencyLogRowModel.java | 3 + .../frequency/BenthosFrequencyRowModel.java | 2 +- .../frequency/BenthosFrequencyTableModel.java | 264 ++++++-- .../benthos/frequency/BenthosFrequencyUI.css | 82 +-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 205 +++---- .../frequency/BenthosFrequencyUIHandler.java | 644 +++++--------------- .../benthos/frequency/BenthosFrequencyUIModel.java | 252 +++++--- .../frequency/BenthosFrequencyUIModelCache.java | 157 +++++ ...thosFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditBenthosFrequencyAction.java | 73 +++ .../DeleteBenthosFrequencyLogRowAction.java | 98 +++ .../GenerateBenthosFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetBenthosFrequencyAction.java | 67 ++ .../SaveAndCloseBenthosFrequencyAction.java | 79 +++ .../SaveAndContinueBenthosFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../IndividualObservationBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.css | 6 +- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +- .../catches/marinelitter/MarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 13 +- .../species/create/CreateSpeciesBatchUI.jaxx | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 10 +- .../SpeciesFrequencyLogCellComponent.java | 86 ++- .../frequency/SpeciesFrequencyLogRowModel.java | 5 +- .../frequency/SpeciesFrequencyLogsTableModel.java | 7 - .../frequency/SpeciesFrequencyTableModel.java | 249 ++++++-- .../species/frequency/SpeciesFrequencyUI.css | 83 +-- .../species/frequency/SpeciesFrequencyUI.jaxx | 94 ++- .../frequency/SpeciesFrequencyUIHandler.java | 676 +++++---------------- .../species/frequency/SpeciesFrequencyUIModel.java | 251 +++++--- .../frequency/SpeciesFrequencyUIModelCache.java | 158 +++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditSpeciesFrequencyAction.java | 73 +++ .../DeleteSpeciesFrequencyLogRowAction.java | 99 +++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetSpeciesFrequencyAction.java | 67 ++ .../SaveAndCloseSpeciesFrequencyAction.java | 79 +++ .../SaveAndContinueSpeciesFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../content/protocol/EditProtocolUIHandler.java | 13 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 25 +- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 8 + .../util/computable/ComputableDataEditor.jaxx | 13 +- .../computable/ComputableDataEditorHandler.java | 52 +- .../util/computable/ComputableDataTableCell.java | 19 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 3 +- .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 5 +- .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 +- .../src/main/resources/icons/allegro_16.png | Bin 0 -> 932 bytes .../src/main/resources/icons/allegro_32.png | Bin 1977 -> 2159 bytes .../src/main/resources/icons/allegro_64.png | Bin 0 -> 5953 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 448188 -> 0 bytes 108 files changed, 3818 insertions(+), 1912 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 50ef408da450b8be11790f010e8c004d95437a9c Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:12 2015 +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 4919805..b18bae3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.12-SNAPSHOT</version> + <version>3.11</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6eb5c7b..2aaf8fa 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.12-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index bc852c7..d6c4a58 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.12-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b8e3c02..0879151 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.12-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b9df966..f3025d3 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.12-SNAPSHOT</version> + <version>3.11</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 be84c4bc8e453fdf676ed01b9fd8a156ee6035dd Merge: 50ef408 f48e786 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:12 2015 +0000 Merge branch 'master' into develop .../entities/data/FishingOperations.java | 24 ++++++++++++++++++++++ .../frequency/BenthosFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...thosFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteBenthosFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateBenthosFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueBenthosFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyUIModelCache.java | 24 ++++++++++++++++++++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 24 ++++++++++++++++++++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 ++++++++++++++++++++++ .../actions/CancelEditSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../DeleteSpeciesFrequencyLogRowAction.java | 24 ++++++++++++++++++++++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 24 ++++++++++++++++++++++ .../actions/ResetSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndCloseSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../SaveAndContinueSpeciesFrequencyAction.java | 24 ++++++++++++++++++++++ .../frequency/actions/SaveSupportAction.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 876198c4e750fddb1b45d297673bc500cb815c43 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:13 2015 +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 b18bae3..4919805 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2aaf8fa..6eb5c7b 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</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d6c4a58..bc852c7 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</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0879151..b8e3c02 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</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f3025d3..b9df966 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</version> + <version>3.12-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