branch develop-4.x updated (664c1f4 -> 6d33b8d)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git from 664c1f4 [jgitflow-maven-plugin]updating poms for 4.0.5-SNAPSHOT development new d186b89 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5b26342 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions new 6095427 Adding license headers new 00b9303 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' new 1938e3d [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' new 6d33b8d [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 6d33b8d876860fb65aee8f9cf05d6e5a60f4b1b3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:37 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 1938e3df590f82c7535d56e74dbfd8aac57f7669 Merge: d186b89 00b9303 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:37 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' commit d186b898401fec8086df1943e9ce48954dfcbe7a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:36 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 00b93038699ef8eb5f121d275b378fbe1b70a85c Merge: 7d07afd 6095427 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:33 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' commit 6095427a460daf43fea7ccd5f2cd347af8bfbd0a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:19 2015 +0100 Adding license headers commit 5b263425a41128d71eae488e709e3349a91ab93a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:48:48 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions Summary of changes: .../DataSourceMigrationForVersion_4_0_4.java | 22 ++++++++++++++++++++++ .../observe/entities/referentiel/ProgramImpl.java | 22 ++++++++++++++++++++++ .../observe/ui/actions/AbstractObserveAction.java | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 5b263425a41128d71eae488e709e3349a91ab93a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:48:48 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 70a4575..480c73c 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index e73c27c..efb7cc3 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 1f28b70..8d95028 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index fbef7a0..747b22c 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 43b94e1..e1f55c0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 6095427a460daf43fea7ccd5f2cd347af8bfbd0a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:19 2015 +0100 Adding license headers --- .../DataSourceMigrationForVersion_4_0_4.java | 22 ++++++++++++++++++++++ .../observe/entities/referentiel/ProgramImpl.java | 22 ++++++++++++++++++++++ .../observe/ui/actions/AbstractObserveAction.java | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java index 46daf0a..f4a422c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java index 485bfad..58d61d2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.referentiel; +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + public class ProgramImpl extends ProgramAbstract { private static final long serialVersionUID = 3546129729498396258L; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java b/observe-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java index a47a9ae..07e16c1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.actions; +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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.swing.AbstractAction; import javax.swing.Icon; import java.beans.PropertyChangeListener; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 00b93038699ef8eb5f121d275b378fbe1b70a85c Merge: 7d07afd 6095427 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:33 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 153 +++++++---- .../main/java/fr/ird/observe/DecoratorService.java | 3 +- .../fr/ird/observe/report/model/ReportExecute.java | 3 + .../LengthWeightParemeterHelperTest.java | 294 +++++++++++++++++++++ .../src/test/resources/db/4.0.4/referentiel.sql.gz | Bin 0 -> 138244 bytes observe-entities/pom.xml | 2 +- .../ird/observe/entities/constants/GearType.java | 14 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_4.java | 70 +++++ .../referentiel/LengthWeightParemeterHelper.java | 10 +- .../observe/entities/referentiel/ProgramImpl.java | 35 +++ .../4.0.4/remove-trip-datearriveeport-field-H2.sql | 23 ++ .../4.0.4/remove-trip-datearriveeport-field-PG.sql | 23 ++ .../src/main/xmi/observe-common.properties | 3 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85857 bytes observe-swing/pom.xml | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 39 ++- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 11 + .../observe/ui/actions/AbstractObserveAction.java | 54 ++++ .../ird/observe/ui/actions/CloseStorageAction.java | 3 +- .../observe/ui/actions/ReloadStorageAction.java | 6 +- .../ui/actions/SaveStorageToFileAction.java | 8 +- .../list/impl/longline/TripLonglinesUIModel.java | 1 + .../content/list/impl/seine/TripSeinesUIModel.java | 1 + .../java/fr/ird/observe/ui/storage/StorageUI.css | 4 + .../java/fr/ird/observe/ui/storage/StorageUI.jaxx | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 + .../fr/ird/observe/ui/storage/StorageUIModel.java | 24 ++ .../src/main/resources/observe-log4j.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 5 +- 34 files changed, 717 insertions(+), 94 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit d186b898401fec8086df1943e9ce48954dfcbe7a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:36 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 50be948..480c73c 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 9931944..efb7cc3 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index c73a07f..8d95028 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 6bfcf3c..747b22c 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index b5cea58..e1f55c0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 1938e3df590f82c7535d56e74dbfd8aac57f7669 Merge: d186b89 00b9303 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:37 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' .../DataSourceMigrationForVersion_4_0_4.java | 22 ++++++++++++++++++++++ .../observe/entities/referentiel/ProgramImpl.java | 22 ++++++++++++++++++++++ .../observe/ui/actions/AbstractObserveAction.java | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 6d33b8d876860fb65aee8f9cf05d6e5a60f4b1b3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:37 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 480c73c..50be948 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index efb7cc3..9931944 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 8d95028..c73a07f 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 747b22c..6bfcf3c 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index e1f55c0..b5cea58 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4</version> + <version>4.0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm