- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][release/8.0-alpha-4] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with…
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch release/8.0-alpha-4 at ultreiaio / ird-observe Commits: 94df9191 by Tony CHEMIT at 2018-12-10T15:56:11Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 929b221b by Tony CHEMIT at 2018-12-10T16:06:19Z release merge - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-core</artifactId> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.common; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.landing; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-4</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/817da0d68686c74833dec777a0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/817da0d68686c74833dec777a0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 12 commits: [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci]
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b4af779f by Tony CHEMIT at 2018-12-04T16:09:50Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci] - - - - - a19606e9 by tchemit at 2018-12-04T16:41:30Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f7bf32f5 by tchemit at 2018-12-04T16:41:30Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 7f2a5960 by tchemit at 2018-12-04T16:41:31Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 931cc648 by tchemit at 2018-12-04T17:46:15Z fix release merge - - - - - 43f4e154 by tchemit at 2018-12-08T13:37:43Z Fix deploy job - - - - - 0378b2ec by tchemit at 2018-12-08T16:03:12Z fix second merge release - - - - - cdad28e8 by tchemit at 2018-12-10T15:52:20Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166 - - - - - 817da0d6 by tchemit at 2018-12-10T15:53:13Z will redo release 8.0-alpah-4 - - - - - 94df9191 by Tony CHEMIT at 2018-12-10T15:56:11Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 929b221b by Tony CHEMIT at 2018-12-10T16:06:19Z release merge - - - - - 176e29ef by Tony CHEMIT at 2018-12-10T16:06:54Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-4' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineCommonReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineLandingUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/17da4d9cf6905e57210bd3fd8a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/17da4d9cf6905e57210bd3fd8a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with…
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 94df9191 by Tony CHEMIT at 2018-12-10T15:56:11Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 929b221b by Tony CHEMIT at 2018-12-10T16:06:19Z release merge - - - - - 176e29ef by Tony CHEMIT at 2018-12-10T16:06:54Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-4' into 'master' - - - - - ecce5753 by Tony CHEMIT at 2018-12-10T16:06:57Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 32729bda by Tony CHEMIT at 2018-12-10T16:06:58Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - a1b62511 by Tony CHEMIT at 2018-12-10T16:06:59Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.common; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.landing; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b7251858d879e88f5ed5c565cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b7251858d879e88f5ed5c565cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-9.x
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed new branch develop-9.x at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/develop-9.x You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci]
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b7251858 by Tony CHEMIT at 2018-12-10T15:55:44Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-5-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-4-SNAPSHOT</version> + <version>8.0-alpha-5-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b7251858d879e88f5ed5c565cf1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b7251858d879e88f5ed5c565cf1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0-alpha-4
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed new branch release/8.0-alpha-4 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/8.0-alpha-4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cdad28e8 by tchemit at 2018-12-10T15:52:20Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166 - - - - - 817da0d6 by tchemit at 2018-12-10T15:53:13Z will redo release 8.0-alpah-4 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineCommonReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineLandingUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUI.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cd49cf56190984ad2607d7877d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cd49cf56190984ad2607d7877d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted tag v8.0-alpha-4
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT deleted tag v8.0-alpha-4 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix observation method navigation node
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67bc2de7 by tchemit at 2018-12-10T15:30:02Z fix observation method navigation node - - - - - cd49cf56 by tchemit at 2018-12-10T15:30:29Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - See #1166 (improve referential list nodes and make them works again) - - - - - 25 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineLandingUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUI.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineLandingNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineLandingNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNodeSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListNavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java ===================================== @@ -30,14 +30,10 @@ import fr.ird.observe.client.ui.content.api.ContentUIModel; import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.spi.DtoModelClasses; import javax.swing.Icon; -import java.util.ArrayList; import java.util.List; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 9/28/14. * @@ -49,10 +45,12 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel { private static final long serialVersionUID = 1L; private final String nodeName; private final ImmutableList<Class<? extends ReferentialDto>> types; + private final Package uiPackageName; protected ReferenceHomeUIModel(List<Class<? extends ReferentialDto>> types, String nodeName) { this.types = ImmutableList.copyOf(ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())); this.nodeName = nodeName; + this.uiPackageName = getClass().getPackage(); } @Override @@ -78,38 +76,8 @@ public abstract class ReferenceHomeUIModel extends ContentUIModel { return nodeName; } - static class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common")); - } + public Package getUiPackageName() { + return uiPackageName; } - static class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeSeineCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); - } - } - static class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel { - ReferenceHomeSeineObsUIModel() { - super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); - } - } - - static class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineCommonUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common")); - } - } - - static class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineLandingUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing")); - } - } - - static class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel { - ReferenceHomeLonglineObsUIModel() { - super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs")); - } - } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.common; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeCommonUI extends ReferenceHomeUI { public ReferenceHomeCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.common; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.common")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineCommonUI extends ReferenceHomeUI { public ReferenceHomeLonglineCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeLonglineCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.common")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineLandingUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline.landing; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineLandingUI extends ReferenceHomeUI { public ReferenceHomeLonglineLandingUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineLandingUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineLandingUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline.landing; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeLonglineLandingUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineLandingUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.landing")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeLonglineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.longline.obs; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,7 +35,7 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeLonglineObsUI extends ReferenceHomeUI { public ReferenceHomeLonglineObsUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeLonglineObsUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeLonglineObsUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.longline.obs; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeLonglineObsUIModel extends ReferenceHomeUIModel { + public ReferenceHomeLonglineObsUIModel() { + super(new ArrayList<>(DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.longline.obs")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineCommonUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.seine; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeSeineCommonUI extends ReferenceHomeUI { public ReferenceHomeSeineCommonUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineCommonUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineCommonUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.seine; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeSeineCommonUIModel extends ReferenceHomeUIModel { + public ReferenceHomeSeineCommonUIModel() { + super(new ArrayList<>(DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.common")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineObsUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUI.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.ui.content.api.ref; +package fr.ird.observe.client.ui.content.ref.seine.obs; /*- * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -34,6 +35,6 @@ import org.nuiton.jaxx.runtime.context.JAXXInitialContext; public class ReferenceHomeSeineObsUI extends ReferenceHomeUI { public ReferenceHomeSeineObsUI(JAXXContext param0) { - super(((JAXXInitialContext) param0).add(new ReferenceHomeUIModel.ReferenceHomeSeineObsUIModel())); + super(((JAXXInitialContext) param0).add(new ReferenceHomeSeineObsUIModel())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java ===================================== @@ -0,0 +1,19 @@ +package fr.ird.observe.client.ui.content.ref.seine.obs; + +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; +import fr.ird.observe.spi.DtoModelClasses; + +import java.util.ArrayList; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 10/12/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferenceHomeSeineObsUIModel extends ReferenceHomeUIModel { + public ReferenceHomeSeineObsUIModel() { + super(new ArrayList<>(DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES), t("observe.ui.tree.referential.seine.obs")); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java ===================================== @@ -29,12 +29,12 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.client.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineLandingNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsLonglineObsNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineCommonNavigationTreeNode; -import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialsSeineObsNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineLandingNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListLonglineObsNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineCommonNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.referential.ReferentialListSeineObsNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; import fr.ird.observe.dto.data.longline.TripLonglineHelper; import fr.ird.observe.dto.data.longline.TripLonglineReference; @@ -139,12 +139,12 @@ public class NavigationTreeModel extends DefaultTreeModel { } if (config.isShowReferential()) { - root.add(new ReferentialsCommonNavigationTreeNode()); - root.add(new ReferentialsLonglineCommonNavigationTreeNode()); - root.add(new ReferentialsLonglineLandingNavigationTreeNode()); - root.add(new ReferentialsLonglineObsNavigationTreeNode()); - root.add(new ReferentialsSeineCommonNavigationTreeNode()); - root.add(new ReferentialsSeineObsNavigationTreeNode()); + root.add(new ReferentialListCommonNavigationTreeNode()); + root.add(new ReferentialListLonglineCommonNavigationTreeNode()); + root.add(new ReferentialListLonglineLandingNavigationTreeNode()); + root.add(new ReferentialListLonglineObsNavigationTreeNode()); + root.add(new ReferentialListSeineCommonNavigationTreeNode()); + root.add(new ReferentialListSeineObsNavigationTreeNode()); } setRoot(root); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListCommonNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUI; +import fr.ird.observe.client.ui.content.ref.common.ReferenceHomeCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.common"), DtoModelClasses.COMMON_REFERENTIAL_TYPES); + public ReferentialListCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.common"), new ReferenceHomeCommonUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineCommonNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUI; +import fr.ird.observe.client.ui.content.ref.longline.ReferenceHomeLonglineCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.common"), DtoModelClasses.LONGLINE_COMMON_REFERENTIAL_TYPES); + public ReferentialListLonglineCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.common"), new ReferenceHomeLonglineCommonUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineLandingNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineLandingNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineLandingUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUI; +import fr.ird.observe.client.ui.content.ref.longline.landing.ReferenceHomeLonglineLandingUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineLandingNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineLandingNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineLandingNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.landing"), DtoModelClasses.LONGLINE_LANDING_REFERENTIAL_TYPES); + public ReferentialListLonglineLandingNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.landing"), new ReferenceHomeLonglineLandingUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListLonglineObsNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeLonglineObsUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUI; +import fr.ird.observe.client.ui.content.ref.longline.obs.ReferenceHomeLonglineObsUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsLonglineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListLonglineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsLonglineObsNavigationTreeNode() { - super(t("observe.ui.tree.referential.longline.obs"), DtoModelClasses.LONGLINE_OBS_REFERENTIAL_TYPES); + public ReferentialListLonglineObsNavigationTreeNode() { + super(t("observe.ui.tree.referential.longline.obs"), new ReferenceHomeLonglineObsUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNodeSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListNavigationTreeNodeSupport.java ===================================== @@ -22,11 +22,12 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import com.google.common.collect.ImmutableSet; -import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.client.ui.tree.navigation.nodes.StringNavigationTreeNodeSupport; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; +import io.ultreia.java4all.lang.Objects2; +import org.apache.commons.lang3.StringUtils; /** * Created on 14/11/16. @@ -34,12 +35,14 @@ import fr.ird.observe.dto.referential.ReferentialDto; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public abstract class ReferentialsNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport { +public abstract class ReferentialListNavigationTreeNodeSupport extends StringNavigationTreeNodeSupport { - ReferentialsNavigationTreeNodeSupport(String name, ImmutableSet<Class<? extends ReferentialDto>> types) { + ReferentialListNavigationTreeNodeSupport(String name, ReferenceHomeUIModel model) { super(name, true); - for (Class<? extends ReferentialDto> aClass : ObserveI18nDecoratorHelper.sortPluralTypes(types, ObserveSwingApplicationContext.get().getConfig().getLocale())) { - ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(aClass); + for (Class<? extends ReferentialDto> dtoClass : model.getTypes()) { + String uiClassName = String.format("%s.%sUI", model.getUiPackageName().getName(), StringUtils.removeEnd(dtoClass.getSimpleName(), "Dto")); + Class<? extends ReferenceHomeUI> uiClass = Objects2.forName(uiClassName); + ReferentialNavigationTreeNode child = new ReferentialNavigationTreeNode<>(dtoClass, uiClass); add(child); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineCommonNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineCommonNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineCommonUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUI; +import fr.ird.observe.client.ui.content.ref.seine.ReferenceHomeSeineCommonUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsSeineCommonNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListSeineCommonNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsSeineCommonNavigationTreeNode() { - super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_COMMON_REFERENTIAL_TYPES); + public ReferentialListSeineCommonNavigationTreeNode() { + super(t("observe.ui.tree.referential.seine.common"), new ReferenceHomeSeineCommonUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialListSeineObsNavigationTreeNode.java ===================================== @@ -22,8 +22,8 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeSeineObsUI; -import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUI; +import fr.ird.observe.client.ui.content.ref.seine.obs.ReferenceHomeSeineObsUIModel; import static io.ultreia.java4all.i18n.I18n.t; @@ -33,10 +33,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class ReferentialsSeineObsNavigationTreeNode extends ReferentialsNavigationTreeNodeSupport { +public class ReferentialListSeineObsNavigationTreeNode extends ReferentialListNavigationTreeNodeSupport { - public ReferentialsSeineObsNavigationTreeNode() { - super(t("observe.ui.tree.referential.seine.obs"), DtoModelClasses.SEINE_OBS_REFERENTIAL_TYPES); + public ReferentialListSeineObsNavigationTreeNode() { + super(t("observe.ui.tree.referential.seine.obs"), new ReferenceHomeSeineObsUIModel()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java ===================================== @@ -22,12 +22,11 @@ package fr.ird.observe.client.ui.tree.navigation.nodes.referential; * #L% */ -import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.ui.content.api.ContentUI; +import fr.ird.observe.client.ui.content.api.ref.ReferenceHomeUI; import fr.ird.observe.client.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.commons.lang3.StringUtils; import static io.ultreia.java4all.i18n.I18n.t; @@ -39,29 +38,33 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends ClassNavigationTreeNode<D> { - ReferentialNavigationTreeNode(Class<D> data) { + private final Class<? extends ReferenceHomeUI> uiClass; + + ReferentialNavigationTreeNode(Class<D> data, Class<? extends ReferenceHomeUI> uiClass) { super(data, true, t(ObserveI18nDecoratorHelper.getTypePluralI18nKey(data))); + this.uiClass = uiClass; } @Override public Class<? extends ContentUI> getContentClass() { - String packageName = getData().getPackage().getName(); - String packagePrefix; - if (packageName.endsWith("longline")) { - packagePrefix = "longline."; - } else if (packageName.endsWith("seine")) { - packagePrefix = "seine."; - - } else { - packagePrefix = "common."; - } - //FIXME Use a ClassMaping - String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto")); - try { - return (Class) Class.forName(className); - } catch (ClassNotFoundException e) { - throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e); - } + return uiClass; +// String packageName = getData().getPackage().getName(); +// String packagePrefix; +// if (packageName.endsWith("longline")) { +// packagePrefix = "longline."; +// } else if (packageName.endsWith("seine")) { +// packagePrefix = "seine."; +// +// } else { +// packagePrefix = "common."; +// } +// //FIXME Use a ClassMaping +// String className = String.format("fr.ird.observe.client.ui.content.ref.%s%sUI", packagePrefix, StringUtils.removeEnd(getData().getSimpleName(), "Dto")); +// try { +// return (Class) Class.forName(className); +// } catch (ClassNotFoundException e) { +// throw new ObserveSwingTechnicalException("Can't get ui class for: " + className, e); +// } } @Override ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=School estimate observe.common.ObjectSchoolEstimateDto.totalWeight=Total weight observe.common.ObjectSchoolEstimateDto.type=Object school estimate observe.common.ObjectSchoolEstimateDto.types=Object school estimates -observe.common.ObservationMethodDto.type=Trip type -observe.common.ObservationMethodDto.types=Trips type +observe.common.ObservationMethodDto.type=Observation method +observe.common.ObservationMethodDto.types=Observation methods observe.common.ObservedSystemDto.schoolType=School type observe.common.ObservedSystemDto.type=Observed system observe.common.ObservedSystemDto.types=Observed systems ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=Estimación del banco observe.common.ObjectSchoolEstimateDto.totalWeight=Peso observe.common.ObjectSchoolEstimateDto.type=Estimación banco de objetos observe.common.ObjectSchoolEstimateDto.types=Estimaciones banco de objetos -observe.common.ObservationMethodDto.type=Tipo de marea -observe.common.ObservationMethodDto.types=Tipos de marea +observe.common.ObservationMethodDto.type=Observation method #TODO +observe.common.ObservationMethodDto.types=Observation methods #TODO observe.common.ObservedSystemDto.schoolType=Tipo de banco observe.common.ObservedSystemDto.type=Sistema observado observe.common.ObservedSystemDto.types=Sistemas observados ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1606,8 +1606,8 @@ observe.common.ObjectSchoolEstimateDto.title=Estimation banc observe.common.ObjectSchoolEstimateDto.totalWeight=Poids observe.common.ObjectSchoolEstimateDto.type=Estimation banc objet observe.common.ObjectSchoolEstimateDto.types=Estimations banc objet -observe.common.ObservationMethodDto.type=Type de marée -observe.common.ObservationMethodDto.types=Types de marée +observe.common.ObservationMethodDto.type=Méthode d'observation +observe.common.ObservationMethodDto.types=Méthode d'observation observe.common.ObservedSystemDto.schoolType=Type de banc observe.common.ObservedSystemDto.type=Système observé observe.common.ObservedSystemDto.types=Systèmes observés View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb4b74a8d9e0b3c4c4cbbf9bfe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb4b74a8d9e0b3c4c4cbbf9bfe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Fix deploy job
by Tony CHEMIT 10 Dec '18

10 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43f4e154 by tchemit at 2018-12-08T13:37:43Z Fix deploy job - - - - - 0378b2ec by tchemit at 2018-12-08T16:03:12Z fix second merge release - - - - - cb4b74a8 by tchemit at 2018-12-10T13:52:49Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - See #1166 (move back some referentials to ps_common) - - - - - 30 changed files: - .gitlab-ci.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineCommonReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsReferentialAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionObsUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeSeineCommonUI.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/SpeciesFateUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/SpeciesFateUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyOperationUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/TransmittingBuoyTypeUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineCommonNavigationTreeNode.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - − client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/931cc6488f6ce40e991afa01a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/931cc6488f6ce40e991afa01a7… You're receiving this email because of your account on gitlab.com.

1 0