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

[Git][ultreiaio/ird-observe][develop] continue to move neutral ui code to toolkit, as MainUI \o/, but still we could…
by Tony CHEMIT 07 Nov '17

07 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b2583e31 by Tony CHEMIT at 2017-11-07T15:56:10+01:00 continue to move neutral ui code to toolkit, as MainUI \o/, but still we could move other stuffs (mainly Storage package) - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - services/src/main/java/fr/ird/observe/services/security/UnauthorizedException.java → client/src/main/java/fr/ird/observe/client/ObserveMainUI.java - − client/src/main/java/fr/ird/observe/client/ObserveMainUI.jaxx - − client/src/main/java/fr/ird/observe/client/ObserveMainUIHandler.java - − client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java - − client/src/main/java/fr/ird/observe/client/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/action/form/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/action/form/ReOpenUIAction.java - client/src/main/java/fr/ird/observe/client/action/menu/admin/LaunchAdminActionSupport.java - client/src/main/java/fr/ird/observe/client/action/menu/config/ChangeLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/action/menu/config/ReloadDefaultConfigurationAction.java - client/src/main/java/fr/ird/observe/client/action/menu/config/ReloadResourcesAction.java - client/src/main/java/fr/ird/observe/client/action/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/action/menu/file/CloseApplicationAction.java - client/src/main/java/fr/ird/observe/client/action/menu/file/ReloadApplicationAction.java - client/src/main/java/fr/ird/observe/client/action/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/action/menu/storage/ImportStorageFromFileAction.java - client/src/main/java/fr/ird/observe/client/action/menu/storage/SaveStorageToFileAction.java - client/src/main/java/fr/ird/observe/client/commands/CommandConfigure.java - client/src/main/java/fr/ird/observe/client/db/ObserveClientDataSource.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/open/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/form/referential/ObserveReferentialFormUIModel.java - client/src/main/java/fr/ird/observe/client/form/referential/ReferentialHomeCommonUI.java - services/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java → client/src/main/java/fr/ird/observe/client/form/referential/ReferentialHomeCommonUIModel.java - client/src/main/java/fr/ird/observe/client/form/referential/ReferentialHomeLonglineUI.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b2583e310e1a8f857f34f46b903… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b2583e310e1a8f857f34f46b903… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use last i18n
by Tony CHEMIT 07 Nov '17

07 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7260fbbc by Tony CHEMIT at 2017-11-07T12:42:34+01:00 Use last i18n - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <plugin.version.processor>1.3</plugin.version.processor> <jaxx.version>3.0-alpha-17</jaxx.version> - <i18n.version>4.0-alpha-7-SNAPSHOT</i18n.version> + <i18n.version>4.0-alpha-7</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7260fbbcb12dd3f91cbe6760580… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7260fbbcb12dd3f91cbe6760580… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: optimize dependencies
by Tony CHEMIT 07 Nov '17

07 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 348e3cbe by Tony CHEMIT at 2017-11-07T12:34:25+01:00 optimize dependencies - - - - - 5bbc16e1 by Tony CHEMIT at 2017-11-07T12:34:42+01:00 use last pom - - - - - 11c7bd22 by Tony CHEMIT at 2017-11-07T12:35:53+01:00 Fix jobs for tag - - - - - 3 changed files: - .gitlab-ci.yml - client/pom.xml - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ - develop .only_tag: &only_tag only: - - tag + - tags .only_triggers: &only_triggers only: - triggers @@ -36,7 +36,7 @@ .publish-site: &publish_site script: - - ultreiaio-site-mono-module-publish + - ultreiaio-site-publish image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:latest stages: @@ -96,18 +96,18 @@ release: - ultreiaio-milestone-create staging-demo: - <<: *stage_staging + <<: *stage_build <<: *env_staging <<: *only_tag script: - ultreiaio-war-deploy-to-demo 'server' staging-site: - <<: *stage_staging + <<: *stage_build <<: *env_staging <<: *only_tag script: - - ultreiaio-site-mono-module-publish + - ultreiaio-site-publish stage-release: <<: *stage_staging @@ -132,7 +132,7 @@ latest-site: <<: *only_develop when: manual script: - - ultreiaio-site-mono-module-publish + - ultreiaio-site-publish latest-demo: <<: *stage_test ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -565,12 +565,6 @@ <artifactId>h2</artifactId> </dependency> -  - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - </dependency> -  <dependency> <groupId>org.geotools</groupId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.36</version> + <version>2017.38</version> </parent> <groupId>fr.ird.observe</groupId> @@ -153,8 +153,8 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>1.7-SNAPSHOT</observeToolkitVersion> - <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> - <processorPluginVersion>1.3</processorPluginVersion> + <plugin.version.eugene>3.0-alpha-16</plugin.version.eugene> + <plugin.version.processor>1.3</plugin.version.processor> <jaxx.version>3.0-alpha-17</jaxx.version> <i18n.version>4.0-alpha-7-SNAPSHOT</i18n.version> @@ -174,12 +174,11 @@ <webmotionVersion>2.5.3</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> <geoToolsVersion>17.2</geoToolsVersion> - <guavaVersion>23.2-jre</guavaVersion> + <guavaVersion>23.3-jre</guavaVersion>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> - <license.excludes>**/ftl/*.ftl,**/i18n/*.properties,**/THIRD-PARTY.properties,**/*.sh,**/*.json</license.excludes>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -598,13 +597,6 @@ </exclusions> </dependency> -  - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.23</version> - </dependency> -  <dependency> <groupId>com.h2database</groupId> @@ -867,7 +859,7 @@ <plugin> <groupId>io.ultreia.java4all.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>${eugenePluginVersion}</version> + <version>${plugin.version.eugene}</version> </plugin> <plugin> @@ -951,7 +943,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> + <version>${plugin.version.projectInfoReports}</version> <inherited>false</inherited> <reportSets> <reportSet> @@ -976,7 +968,7 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> - <version>${changesPluginVersion}</version> + <version>${plugin.version.changes}</version> <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> @@ -995,21 +987,21 @@ <plugin> <artifactId>maven-changelog-plugin</artifactId> - <version>${changelogPluginVersion}</version> + <version>${plugin.version.changelog}</version> <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>${licensePluginVersion}</version> + <version>${plugin.version.license}</version> <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>${versionsPluginVersion}</version> + <version>${plugin.version.versions}</version> <inherited>false</inherited> <reportSets> <reportSet> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/763dfec36cec52816cbd59608f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/763dfec36cec52816cbd59608f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] continue ui storm + use last i18n
by Tony CHEMIT 07 Nov '17

07 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 763dfec3 by Tony CHEMIT at 2017-11-07T02:01:26+01:00 continue ui storm + use last i18n - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/i18n/client-configuration_en_GB.properties → client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/i18n/client-configuration_es_ES.properties → client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ObserveMainUIHandler.java - client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/action/menu/file/ToFullScreenAction.java - client/src/main/java/fr/ird/observe/client/action/menu/file/ToWindowScreenAction.java - − client/src/main/java/fr/ird/observe/client/action/menu/storage/CloseStorageAction.java - − client/src/main/java/fr/ird/observe/client/action/menu/storage/ReloadStorageAction.java - − client/src/main/java/fr/ird/observe/client/action/menu/storage/ShowStorageInfoAction.java - client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java → client/src/main/java/fr/ird/observe/client/spi/ObserveClientImplementationFactory.java - client/src/main/java/fr/ird/observe/client/tools/ObserveTextGenerator.java - client/src/main/resources/META-INF/services/fr.ird.observe.client.spi.ClientImplementationFactory - client/src/main/i18n/client_en_GB.properties → client/src/main/resources/i18n/client_en_GB.properties - client/src/main/i18n/client_es_ES.properties → client/src/main/resources/i18n/client_es_ES.properties - client/src/main/i18n/client_fr_FR.properties → client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/i18n/dto_en_GB.properties → dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/i18n/dto_es_ES.properties → dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/i18n/dto_fr_FR.properties → dto/src/main/resources/i18n/dto_fr_FR.properties - pom.xml - server-configuration/src/main/i18n/server-configuration_en_GB.properties → server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties - server-configuration/src/main/i18n/server-configuration_es_ES.properties → server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties - server-configuration/src/main/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties - services-local/src/main/i18n/services-local_en_GB.properties → services-local/src/main/resources/i18n/services-local_en_GB.properties - services-local/src/main/i18n/services-local_es_ES.properties → services-local/src/main/resources/i18n/services-local_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/763dfec36cec52816cbd59608f9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/763dfec36cec52816cbd59608f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] stay on previous pom
by Tony CHEMIT 06 Nov '17

06 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2300ee9 by Tony CHEMIT at 2017-11-06T16:26:18+01:00 stay on previous pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.37-SNAPSHOT</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2300ee996d10dcce7bc7602855… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2300ee996d10dcce7bc7602855… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] clean code + optimize dependencies
by Tony CHEMIT 06 Nov '17

06 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bbb7ea4d by Tony CHEMIT at 2017-11-06T16:21:32+01:00 clean code + optimize dependencies - - - - - 5 changed files: - client-configuration/pom.xml - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java - services/src/main/java/fr/ird/observe/services/service/referential/SpeciesService.java Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -59,10 +59,6 @@ </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>common-service</artifactId> - </dependency> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-client</artifactId> </dependency> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -402,10 +402,6 @@ <dependency> <groupId>io.ultreia.java4all</groupId> - <artifactId>class-mapping</artifactId> - </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> <artifactId>java-lang</artifactId> </dependency> @@ -506,10 +502,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency>  <dependency> ===================================== client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java +++ b/client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java @@ -200,10 +200,6 @@ public class ObserveMainUIInitializer { ui.getStatus().init(); -// // ajout d'un ecouteur sur la navigation pour toujours mettre la scrollbar -// // tout à droite a chaque selection -// ui.getNavigation().addTreeSelectionListener(this::changeNavigationNode); - // installation layer de blocage en mode busy UIHelper.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); @@ -212,59 +208,6 @@ public class ObserveMainUIInitializer { boolean newvalue = (boolean) evt.getNewValue(); updateBusyState(newvalue); }); - -// ui.getModel().addPropertyChangeListener("focusOnNavigation", evt -> { -// boolean newvalue = (boolean) evt.getNewValue(); -// updateFocusOnNavigation(newvalue); -// }); - -// MouseAdapter mouseAdapter = new MouseAdapter() { -// @Override -// public void mouseEntered(MouseEvent e) { -// if (log.isDebugEnabled()) { -// log.debug("Enter in navigation zone: " + e); -// } -// ui.getModel().setFocusOnNavigation(true); -// } -// }; -// ui.getNavigationView().addMouseListener(mouseAdapter); -// ui.getNavigation().addMouseListener(mouseAdapter); -// ui.getNavigationTreeHeader().addMouseListener(mouseAdapter); -// -// new JSplitPaneInitializer<>().init(null, ui.getModeDb()); -// new JTreeInitializer<>().init(null, ui.getNavigation()); -// -// ui.getNavigationView().setRightDecoration(ui.getNavigationTreeHeader().getToolbar()); -// ui.getNavigationView().addComponentListener(new ComponentAdapter() { -// -// @Override -// public void componentResized(ComponentEvent e) { -// -// JComponent source = (JComponent) e.getSource(); -// -// NavigationTreeHeader actions = ui.getNavigationTreeHeader(); -// -// Dimension preferredLayoutSize = actions.getLayout().preferredLayoutSize(actions); -// -// Dimension showLonglineSize = actions.getShowLongline().getSize(); -// Dimension showSeineSize = actions.getShowSeine().getSize(); -// Dimension showReferential = actions.getShowReferential().getSize(); -// Dimension showEmpty = actions.getShowEmptyProgram().getSize(); -// int minWidth = 18 + (int) Math.max(showLonglineSize.getWidth() + showSeineSize.getWidth(), showReferential.getWidth() + showEmpty.getWidth()); -// source.setMinimumSize(new Dimension(minWidth, (int) source.getSize().getHeight())); -// log.debug("Header resize to minimum: " + source.getMinimumSize()); -// -// int maxWidth = ui.getNavigationView().getWidth() - 10; -// -// int currentWidth = (int) preferredLayoutSize.getWidth(); -// int height = 32; -// if (currentWidth > maxWidth) { -// height += 32; -// } -// actions.setPreferredSize(new Dimension(maxWidth, height)); -// -// } -// }); } protected void init(ObserveActionMap actionMap, AbstractButton editor) { ===================================== client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java +++ b/client/src/main/java/fr/ird/observe/client/spi/context/ObserveClientImplementationFactory.java @@ -1,5 +1,27 @@ package fr.ird.observe.client.spi.context; +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ObserveMainUI; import fr.ird.observe.client.db.ObserveClientDataSource; import fr.ird.observe.client.db.ObserveClientDataSourcesManager; ===================================== services/src/main/java/fr/ird/observe/services/service/referential/SpeciesService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/SpeciesService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/SpeciesService.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.service.referential; +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.SpeciesGroupDto; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bbb7ea4dc2e96f0d0f4babf0b65… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bbb7ea4dc2e96f0d0f4babf0b65… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: use convention
by Tony CHEMIT 06 Nov '17

06 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da46b953 by Tony CHEMIT at 2017-11-06T15:55:17+01:00 use convention - - - - - da246b6f by Tony CHEMIT at 2017-11-06T15:56:18+01:00 add magic constants - - - - - 4314ca1b by Tony CHEMIT at 2017-11-06T15:58:29+01:00 begin of last refacotr on ui : create standalone ui for data source, extracted from ObserveMainUI, some stuff will move to common-client - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/pom.organizationId - + client-configuration/.mvn/pom.organizationId - client-configuration/pom.xml - client-configuration/src/main/i18n/client-configuration_en_GB.properties - client-configuration/src/main/i18n/client-configuration_es_ES.properties - client-configuration/src/main/i18n/client-configuration_fr_FR.properties - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - + client/.mvn/pom.organizationId - client/src/main/i18n/client_en_GB.properties - client/src/main/i18n/client_es_ES.properties - client/src/main/i18n/client_fr_FR.properties - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ObserveMainUIHandler.java - client/src/main/java/fr/ird/observe/client/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ObserveUICallback.java - − client/src/main/java/fr/ird/observe/client/ObserveUIMode.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/action/ObserveUIActionSupport.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivityLonglineSetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1251fc6175ef4b66664c4e33ab… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1251fc6175ef4b66664c4e33ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: use new i18n mojo and configuration
by Tony CHEMIT 03 Nov '17

03 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ecd72f5 by Tony CHEMIT at 2017-11-03T10:46:20+01:00 use new i18n mojo and configuration - - - - - a56301c1 by Tony CHEMIT at 2017-11-03T10:46:30+01:00 use last jaxx + optimize dependencies - - - - - 1251fc61 by Tony CHEMIT at 2017-11-03T10:46:30+01:00 clean ui code - - - - - 30 changed files: - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/i18n.xml - client/src/main/i18n/client_en_GB.properties - client/src/main/i18n/client_es_ES.properties - client/src/main/i18n/client_fr_FR.properties - client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java - client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx - dto/pom.xml - pom.xml - services-client/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -130,9 +130,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -163,15 +164,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -718,9 +718,9 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> + <id>default-parse-java-enumerations</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> </goals> <configuration> <enumerationSets> @@ -748,7 +748,7 @@ </configuration> </execution> <execution> - <id>check-convergence</id> + <id>default-check-i18n-artifacts</id> <goals> <goal>check-i18n-artifacts</goal> </goals> @@ -760,16 +760,16 @@ <goal>generate</goal> </goals> <configuration> - <entries> + <copyToClasses>false</copyToClasses> +  </configuration> </execution> <execution> - <id>make-bundle</id> + <id>default-bundle</id> <goals> <goal>bundle</goal> </goals> ===================================== client/src/main/assembly/i18n.xml ===================================== --- a/client/src/main/assembly/i18n.xml +++ b/client/src/main/assembly/i18n.xml @@ -37,7 +37,7 @@ </fileSet> <fileSet> - <directory>target/generated-sources/resources/META-INF</directory> + <directory>target/classes/META-INF</directory> <outputDirectory/> <includes> <include>observe-i18n*</include> ===================================== client/src/main/i18n/client_en_GB.properties ===================================== --- a/client/src/main/i18n/client_en_GB.properties +++ b/client/src/main/i18n/client_en_GB.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< No activity for curre observe.common.ActivityLonglineObsDto.message.not.open=Activity is not opened, no edit possible. observe.common.ActivityLonglineObsDto.message.updating=Updating an activity observe.common.ActivityLonglineObsDto.timeStamp=timestamp -observe.common.ActivityLonglineObsDto.titles=Activities observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity observe.common.ActivitySeineDto.action.addSet=Add a Set @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=Activity is not opened, no edit observe.common.ActivitySeineDto.message.updating=Updating an activity observe.common.ActivitySeineDto.observedSystemTab=Observed systems observe.common.ActivitySeineDto.selectedObservedSystem=Selected observed systems -observe.common.ActivitySeineDto.titles=Activities observe.common.ActivitySeineDto.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set. observe.common.BaitsCompositionObsDto.action.create=Insert this bait observe.common.BaitsCompositionObsDto.action.create.tip=Insert this bait @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancel modifications observe.common.DataDto.action.reset.well.tip=Reset observe.common.DataDto.action.resetTagNumber=Reset tag number observe.common.DataDto.message.historical.data=Historical data (can be closed, even if not valid) -observe.common.Dto.label.usage.data.title=Data '%1$s' (%2$d occurrences) observe.common.Dto.label.usage.referential.title=Referentiel '%1$s' (%2$d occurrences) observe.common.Dto.lastUpdateDate=Last update date observe.common.Dto.technicalInformations=Technical information of %1$s @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=Current route is not open, no modificat observe.common.RouteDto.message.updating=Route is in editing mode. observe.common.RouteDto.noneForTrip=< No route fo current trip > observe.common.RouteDto.title=Route -observe.common.RouteDto.titles=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type observe.common.Sample.length.computed.tip=Length was computed observe.common.Sample.length.observed.tip=Length was observed @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Data location observe.common.TdrDto.delete.data.message=Confirm to delete saved data observe.common.TdrDto.deleteData=Delete observe.common.TdrDto.deleteData.tip=Delete data -observe.common.TdrDto.deployementStart=Deployement start observe.common.TdrDto.enableTimestamp=Use timestamp observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder observe.common.TdrDto.exportData=Export @@ -1111,7 +1106,6 @@ observe.common.directory=Directory observe.common.exist.on.remote=%1$s (already exist) observe.common.file=File observe.common.global.progression.description=Global progression -observe.common.label=Label observe.common.ocean=Ocean observe.common.operation.resume=Summary of operations observe.common.resume=Summary @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=New activity observe.type.activitySeine.unsaved=New activity observe.type.floatingObject.unsaved=New DCP -observe.type.management=Management of %s observe.type.reference.common=Common Referential observe.type.reference.longline=Longline Referential observe.type.reference.seine=Seine Referential @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Founded references observe.validator.field.tip=Property '%1$s' observe.validator.message.tip=Message\: %1$s observe.validator.scope.tip=Message type\: '%1$s' -observe.view.message=Messages observe.view.navigation=Navigation observe.view.server=Local database in server mode observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. ===================================== client/src/main/i18n/client_es_ES.properties ===================================== --- a/client/src/main/i18n/client_es_ES.properties +++ b/client/src/main/i18n/client_es_ES.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Ninguna actividad por observe.common.ActivityLonglineObsDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivityLonglineObsDto.message.updating=Se está modificando la actividad actual. observe.common.ActivityLonglineObsDto.timeStamp=Timestamp -observe.common.ActivityLonglineObsDto.titles=Actividades observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un DCP observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad observe.common.ActivitySeineDto.action.addSet=Añadir un lance @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=La actividad no está abierta, observe.common.ActivitySeineDto.message.updating=Se está modificando la actividad actual. observe.common.ActivitySeineDto.observedSystemTab=Sistema observado observe.common.ActivitySeineDto.selectedObservedSystem=Sistemas observados seleccionados -observe.common.ActivitySeineDto.titles=Actividades observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance observe.common.BaitsCompositionObsDto.action.create=Insertar este cebo observe.common.BaitsCompositionObsDto.action.create.tip=Insertar este cebo @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancelar las modificaciones observe.common.DataDto.action.reset.well.tip=Reiniciar observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon \#TODO observe.common.DataDto.message.historical.data=Datos históricos (puede cerrarse incluso sin validar) -observe.common.Dto.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias) observe.common.Dto.label.usage.referential.title=Referencial '%1$s' (%2$d ocurrencias) observe.common.Dto.lastUpdateDate=Last update date observe.common.Dto.technicalInformations=Informaciones técnicas del referencial %1$s @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=la ruta actual no está abierta, no se observe.common.RouteDto.message.updating=Se está modificando la ruta actual. observe.common.RouteDto.noneForTrip=Ninguna ruta en la marea actual observe.common.RouteDto.title=Ruta -observe.common.RouteDto.titles=Rutas observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut \#TODO observe.common.Sample.length.computed.tip=Longitud calculada observe.common.Sample.length.observed.tip=Longitud observada @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=ubicación del archivo de datos observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos observe.common.TdrDto.deleteData=Eliminar observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos -observe.common.TdrDto.deployementStart=Inicio de despliegue observe.common.TdrDto.enableTimestamp=Activar el timestamp observe.common.TdrDto.enableTimestamp.tip=Activar el timestamp para este registrador observe.common.TdrDto.exportData=Exportar @@ -1111,7 +1106,6 @@ observe.common.directory=Carpeta observe.common.exist.on.remote=%1$s (ya existe) observe.common.file=Archivo observe.common.global.progression.description=Progresión global -observe.common.label=Texto observe.common.ocean=Océano observe.common.operation.resume=Resumen de operaciones observe.common.resume=Resumen de la configuración @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=Nueva actividad observe.type.activitySeine.unsaved=Nueva actividad observe.type.floatingObject.unsaved=Nuevo DCP -observe.type.management=Gestión de %s observe.type.reference.common=Referencial commun observe.type.reference.longline=Referencial Palangre observe.type.reference.seine=Referencial Senne @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Referencias encontradas observe.validator.field.tip=Propriedad '%1$s' observe.validator.message.tip=Mensaje \: %1$s observe.validator.scope.tip=Tipo de mensaje \: '%1$s' -observe.view.message=Mensajes observe.view.navigation=Navegación observe.view.server=Base locale en modo servidor observe.warning.nimbus.landf=El look and Feel Nimbus no fue encontrado, se necesita a minimo la versión 1.6u10 de java. ===================================== client/src/main/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/i18n/client_fr_FR.properties +++ b/client/src/main/i18n/client_fr_FR.properties @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Aucune activité pour observe.common.ActivityLonglineObsDto.message.not.open=L'opération de pêche n'est pas ouverte, aucune modification possible. observe.common.ActivityLonglineObsDto.message.updating=L'activité est en cours de modification. observe.common.ActivityLonglineObsDto.timeStamp=Horodatage -observe.common.ActivityLonglineObsDto.titles=Activités observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité observe.common.ActivitySeineDto.action.addSet=Ajouter la calée @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=L'activité n'est pas ouverte, observe.common.ActivitySeineDto.message.updating=L'activité est en cours de modification. observe.common.ActivitySeineDto.observedSystemTab=Systèmes observés observe.common.ActivitySeineDto.selectedObservedSystem=Systèmes observés sélectionnés -observe.common.ActivitySeineDto.titles=Activités observe.common.ActivitySeineDto.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée. observe.common.BaitsCompositionObsDto.action.create=Insérer cet appât observe.common.BaitsCompositionObsDto.action.create.tip=Insérer cet appât @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Annuler les modifications observe.common.DataDto.action.reset.well.tip=Réinitialiser observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon observe.common.DataDto.message.historical.data=Donnée historique (peut-être clôturé même si non valide) -observe.common.Dto.label.usage.data.title=Donnée '%1$s' (%2$d occurrences) observe.common.Dto.label.usage.referential.title=Référentiel '%1$s' (%2$d occurrences) observe.common.Dto.lastUpdateDate=Date de dernière mise à jour observe.common.Dto.technicalInformations=Informations techniques de l'objet de type '%1$s' @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=La route courante n'est pas ouverte, au observe.common.RouteDto.message.updating=La route est en cours de modification. observe.common.RouteDto.noneForTrip=< Aucune route pour la marée courante > observe.common.RouteDto.title=Route -observe.common.RouteDto.titles=Routes observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut observe.common.Sample.length.computed.tip=La longueur a été calculée observe.common.Sample.length.observed.tip=La longueur a été observée @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données observe.common.TdrDto.deleteData=Supprimer observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données -observe.common.TdrDto.deployementStart=Début déploiement observe.common.TdrDto.enableTimestamp=Activer l'horodatage observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur observe.common.TdrDto.exportData=Exporter @@ -1111,7 +1106,6 @@ observe.common.directory=Répertoire observe.common.exist.on.remote=%1$s (déjà existante) observe.common.file=Fichier observe.common.global.progression.description=Progression globale -observe.common.label=Libellé observe.common.ocean=Océan observe.common.operation.resume=Résumé des opérations observe.common.resume=Résumé de la configuration @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe observe.type.activityLongline.unsaved=Nouvelle activité observe.type.activitySeine.unsaved=Nouvelle activité observe.type.floatingObject.unsaved=Nouveau DCP -observe.type.management=Gestion des %s observe.type.reference.common=Référentiel commun observe.type.reference.longline=Référentiel Palangre observe.type.reference.seine=Référentiel Senne @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Références trouvées observe.validator.field.tip=Propriété '%1$s' observe.validator.message.tip=Message \: %1$s observe.validator.scope.tip=Type de message \: '%1$s' -observe.view.message=Messages observe.view.navigation=Navigation observe.view.server=Base locale en mode serveur observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. ===================================== client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java +++ b/client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java @@ -67,7 +67,7 @@ public class FormUIApplicationContext { return decoratorService.get(); } - public NavigationTree getNavigation() { + public final NavigationTree getNavigation() { return navigation.get(); } } ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java @@ -115,7 +115,6 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R @Override protected void initialize(FormUIInitializerContext<U> initializerContext) { - validationManager = new FormUIValidationMessageManager(model.getBeanType(), ui); super.initialize(initializerContext); OpenableDataDtoListCellRenderer<D, R> cellRenderer = new OpenableDataDtoListCellRenderer<>(ui.getList().getCellRenderer(), navigation); @@ -166,7 +165,7 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R @Override public void onDataSelected(MouseEvent event) { if (event.getClickCount() > 1) { - if (getModel().isOneSelectedData()) { + if (model.isOneSelectedData()) { gotoChild(ui.getSelectedData()); } } ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx @@ -48,7 +48,7 @@ <ObserveMainUI id="mainUI"/> - <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.titles' + <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.types' listText='{n("observe.common.ActivityDto.list")}' emptyListMessage='{n("observe.common.ActivityLonglineObsDto.message.nonForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx @@ -46,7 +46,7 @@ <ObserveMainUI id="mainUI"/> <TripLonglineListUIModel id='model' - title='observe.common.TripLonglineDto.titles' + title='observe.common.TripLonglineDto.types' listText='{n("observe.common.TripDto.list")}' emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx @@ -50,7 +50,7 @@ <ObserveMainUI id="mainUI"/> <ActivitySeineListUIModel id='model' - title='observe.common.ActivitySeineDto.titles' + title='observe.common.ActivitySeineDto.types' listText='{n("observe.common.ActivityDto.list")}' emptyListMessage='{n("observe.common.ActivitySeineDto.message.noneForRoute")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx @@ -46,7 +46,7 @@ <ObserveMainUI id="mainUI"/> - <RouteListUIModel id='model' title='observe.common.RouteDto.titles' + <RouteListUIModel id='model' title='observe.common.RouteDto.types' listText='{n("observe.common.RouteDto.list")}' emptyListMessage='{n("observe.common.RouteDto.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx @@ -47,7 +47,7 @@ <ObserveMainUI id="mainUI"/> <TripSeineListUIModel id='model' - title='observe.common.TripSeineDto.titles' + title='observe.common.TripSeineDto.types' listText='{n("observe.common.TripDto.list")}' emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/> ===================================== client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java @@ -35,6 +35,8 @@ import fr.ird.observe.client.form.spi.ReferentialReferencesFilter; import fr.ird.observe.client.form.spi.init.CoordinatesEditorInitializer; import fr.ird.observe.client.form.spi.init.TabInfoInitializer; import fr.ird.observe.client.form.table.longline.set.WeightMeasuresTableModel; +import fr.ird.observe.client.spi.ClientDataContext; +import fr.ird.observe.client.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableTableModelSupport; import fr.ird.observe.client.util.table.InlineTableAutotSelectRowAndShowPopupAction; @@ -42,6 +44,7 @@ import fr.ird.observe.client.validation.ClientValidationContext; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.DataListDto; import fr.ird.observe.dto.data.seine.TargetCatchDto; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; import java.awt.BorderLayout; @@ -73,6 +76,7 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.select.BeanListHeader; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -135,14 +139,15 @@ public abstract class ObserveDataTableFormUIHandler<D extends DataDto, C extends // // } // + // @Override -// public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) { -// String message = n("observe.entity.message.updating"); -// NavigationTreeNodeSupport node = navigation.getSelectedNode(); -// String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getBeanType()); -// message = t(message, t(entityLabel)); -// validationManager.addInfoMessage(node.getParent().getBeanType(), message); -// } + public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) { + String message = n("observe.entity.message.updating"); + NavigationTreeNodeSupport node = navigation.getSelectedNode(); + String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getDataType()); + message = t(message, t(entityLabel)); + validationManager.addInfoMessage(node.getParent().getDataType(), message); + } // // @Override // public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java @@ -58,6 +58,7 @@ import org.nuiton.jaxx.runtime.swing.JTables; import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -157,8 +158,8 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle } // FIXME!!! -// @Override -// protected void loadEditBean(String beanId) { + @Override + protected void loadEditBean(String beanId) { // loadForm(beanId); // // boolean showData = !model.getFormUIContext().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty(); @@ -171,11 +172,11 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle // // validationManager.removeAllMessages(); // -// validationManager.addInfoMessage( -// SetSeineDto.class, -// t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); + validationManager.addInfoMessage( + SetSeineDto.class, + t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); // } -// } + } @Override public void onSelectedRowChanged(int editingRow, NonTargetCatchReleaseDto bean, boolean create) { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss @@ -99,7 +99,7 @@ JToolBar { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; enabled: {tableEditBean.isIsLengthComputed()}; - toolTipText:{getLengthDataTip(tableEditBean.isIsLengthComputed())}; + toolTipText:{TargetSampleUIHandler.getLengthDataTip(tableEditBean.isIsLengthComputed())}; } #weightLabel { @@ -115,7 +115,7 @@ JToolBar { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; enabled: {tableEditBean.isIsWeightComputed()}; - toolTipText:{getWeightDataTip(tableEditBean.isIsWeightComputed())}; + toolTipText:{TargetSampleUIHandler.getWeightDataTip(tableEditBean.isIsWeightComputed())}; } #comment { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx @@ -68,27 +68,6 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='getHandler().updateAcquisitionMode((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> - <script><![CDATA[ - -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - -public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); -} - -public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); -} - -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} -]]> - </script> - <JLabel id='hideFormInformation' styleClass="skipI18n"/> <Table id='editorPanel' fill='both' insets='1'> ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss @@ -47,7 +47,7 @@ #speciesTypeTaille { font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; + text:{TargetSampleUIHandler.getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; } #hideFormInformation { ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java @@ -24,12 +24,16 @@ package fr.ird.observe.client.form.table.seine.samples; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import fr.ird.observe.client.constants.AcquisitionMode; +import fr.ird.observe.client.form.FormUIMode; import fr.ird.observe.client.form.spi.ReferentialReferencesFilter; import fr.ird.observe.client.form.table.ContentTableModel; import fr.ird.observe.client.form.table.ObserveDataTableFormUIHandler; +import fr.ird.observe.client.spi.ClientDataContext; +import fr.ird.observe.client.spi.OpenDtoManager; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.seine.NonTargetLengthDto; import fr.ird.observe.dto.data.seine.NonTargetSampleDto; +import fr.ird.observe.dto.data.seine.SetSeineDto; import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SexReference; @@ -48,6 +52,7 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -148,9 +153,9 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT UIHelper.setTableColumnRenderer(table, 7, renderer); } -// FIXME!!! + // FIXME!!! // @Override -// public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { + public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) { // FormUIMode mode = super.computeContentMode(dataContext, openDataManager); // // String setId = dataContext.getSelectedSetId(); @@ -164,10 +169,11 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT // // on repasse en mode resteint car on ne peut pas éditer l'écran // mode = FormUIMode.READ; // -// validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded")); + validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded")); // } // return mode; -// } + return null; + } @SuppressWarnings("unchecked") @Override ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx @@ -64,22 +64,6 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='TargetSampleUIHandler.updateAcquisitionMode(this, (AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> - <script><![CDATA[ - -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - -public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); -} - -public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); -} -]]> - </script> <Table id='editorPanel' fill='both' insets='1'>  ===================================== client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java @@ -50,6 +50,7 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -60,6 +61,11 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode /** Logger */ private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class); + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à @@ -332,4 +338,16 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode return result; } + public static String getWeightDataTip(boolean computed) { + return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + } + + public static String getLengthDataTip(boolean computed) { + return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + } + + public static String getSpeciesFauneTypeTaille(SpeciesReference species) { + return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); + } + } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -39,6 +39,7 @@ javax.swing.JComboBox static fr.ird.observe.client.util.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t </import> <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -48,21 +48,6 @@ <CardLayout2Ext id='creationModeLayout' constructorParams='this, "creationModeContent"'/> - <script><![CDATA[ -protected String updateMigrationPolicy(boolean canMigrate) { - if (canMigrate) { - return t("observe.storage.report.can.migrate", config.getModelVersion()); - } else { - return t("observe.storage.report.can.not.migrate"); - } -} - -protected String updateCreationModeContent(DbMode mode) { - return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode"; -} -]]> - </script> - <JPanel id='content'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss @@ -69,7 +69,7 @@ } #creationModeLayout { - selected:{updateCreationModeContent(model.getDbMode())}; + selected:{handler.updateCreationModeContent(model.getDbMode())}; } #creationModeContent { @@ -130,7 +130,7 @@ } #migrationPolicy { - text:{updateMigrationPolicy(model.isCanMigrate())}; + text:{handler.updateMigrationPolicy(model.isCanMigrate())}; } #showMigrationSql { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.I18nEnumHelper; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.constants.CreationMode; +import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.tools.ObserveTextGenerator; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; @@ -97,4 +98,16 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i } return visible; } + + String updateMigrationPolicy(boolean canMigrate) { + if (canMigrate) { + return t("observe.storage.report.can.migrate", ui.getConfig().getModelVersion()); + } else { + return t("observe.storage.report.can.not.migrate"); + } + } + + String updateCreationModeContent(DbMode mode) { + return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode"; + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.client.ui.storage.tabs.SecurityModel fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel + + static org.nuiton.i18n.I18n.t </import> <StorageStep id='step' initializer='StorageStep.ROLES'/> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -249,9 +249,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -278,16 +279,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.34</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> @@ -132,7 +132,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:http://git@gitlab.com/${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> @@ -156,7 +156,8 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> + <jaxx.version>3.0-alpha-17</jaxx.version> + <i18n.version>4.0-alpha-6</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -423,7 +424,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-api</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -435,7 +436,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> </dependency> @@ -835,7 +836,7 @@ <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> </plugin> <plugin> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -50,12 +50,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>validation</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -43,11 +43,6 @@ <artifactId>dto</artifactId> <version>${project.version}</version> </dependency> -  <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> @@ -156,6 +151,7 @@ <plugins> + <plugin> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>toolbox-maven-plugin</artifactId> @@ -165,27 +161,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <className>ClientI18nValidatorHelper</className> - <prefix>observe.common.</prefix> - <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> - <sourceRoot>../validation/src/main/resources</sourceRoot> - <inheritanceMapping> - <fr.ird.observe.dto.referential.I18nReferentialDto> - label1,label2,label3,label4,label5,label6,label7,label8 - </fr.ird.observe.dto.referential.I18nReferentialDto> - <fr.ird.observe.dto.referential.ReferentialDto> - code,status,uri,needComment - </fr.ird.observe.dto.referential.ReferentialDto> - </inheritanceMapping> - </configuration> - </execution> - <execution> - <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -215,17 +190,32 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> <goals> <goal>parse-java</goal> - <goal>parse-validation</goal> + <goal>parse-validation-fields</goal> + <goal>parse-validation-messages</goal> <goal>generate</goal> </goals> <configuration> - <force>true</force> + <validationFieldPrefix>observe.common.</validationFieldPrefix> + <inheritanceMapping> + <fr.ird.observe.dto.referential.I18nReferentialDto> + label1,label2,label3,label4,label5,label6,label7,label8 + </fr.ird.observe.dto.referential.I18nReferentialDto> + <fr.ird.observe.dto.referential.ReferentialDto> + code,status,uri,needComment + </fr.ird.observe.dto.referential.ReferentialDto> + </inheritanceMapping> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dto</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/200e6bfc25867f0d28e5e5580e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/200e6bfc25867f0d28e5e5580e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: use new i18n mojos
by Tony CHEMIT 01 Nov '17

01 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3c2de76e by Tony CHEMIT at 2017-11-01T09:49:08+01:00 use new i18n mojos - - - - - 200e6bfc by Tony CHEMIT at 2017-11-01T17:39:01+01:00 use new i18n mojo - - - - - 8 changed files: - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/i18n.xml - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx - dto/pom.xml - pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -130,9 +130,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -163,15 +164,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -718,9 +718,9 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> + <id>default-parse-java-enumerations</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> </goals> <configuration> <enumerationSets> @@ -748,7 +748,7 @@ </configuration> </execution> <execution> - <id>check-convergence</id> + <id>default-check-i18n-artifacts</id> <goals> <goal>check-i18n-artifacts</goal> </goals> @@ -760,16 +760,16 @@ <goal>generate</goal> </goals> <configuration> + <copyToClasses>false</copyToClasses> <entries> <entry> - <specificGoal>parse-java</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> </execution> <execution> - <id>make-bundle</id> + <id>default-bundle</id> <goals> <goal>bundle</goal> </goals> ===================================== client/src/main/assembly/i18n.xml ===================================== --- a/client/src/main/assembly/i18n.xml +++ b/client/src/main/assembly/i18n.xml @@ -37,7 +37,7 @@ </fileSet> <fileSet> - <directory>target/generated-sources/resources/META-INF</directory> + <directory>target/classes/META-INF</directory> <outputDirectory/> <includes> <include>observe-i18n*</include> ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -39,6 +39,7 @@ javax.swing.JComboBox static fr.ird.observe.client.util.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t </import> <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.client.ui.storage.tabs.SecurityModel fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel + + static org.nuiton.i18n.I18n.t </import> <StorageStep id='step' initializer='StorageStep.ROLES'/> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -249,9 +249,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -278,16 +279,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.34</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> @@ -132,7 +132,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:http://git@gitlab.com/${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> @@ -156,7 +156,8 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> + <jaxx.version>3.0-alpha-17-SNAPSHOT</jaxx.version> + <i18n.version>4.0-alpha-6</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -423,7 +424,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-api</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -435,7 +436,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> </dependency> @@ -835,7 +836,7 @@ <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> </plugin> <plugin> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -43,11 +43,6 @@ <artifactId>dto</artifactId> <version>${project.version}</version> </dependency> -  <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> @@ -156,6 +151,7 @@ <plugins> + <plugin> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>toolbox-maven-plugin</artifactId> @@ -165,27 +161,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <className>ClientI18nValidatorHelper</className> - <prefix>observe.common.</prefix> - <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> - <sourceRoot>../validation/src/main/resources</sourceRoot> - <inheritanceMapping> - <fr.ird.observe.dto.referential.I18nReferentialDto> - label1,label2,label3,label4,label5,label6,label7,label8 - </fr.ird.observe.dto.referential.I18nReferentialDto> - <fr.ird.observe.dto.referential.ReferentialDto> - code,status,uri,needComment - </fr.ird.observe.dto.referential.ReferentialDto> - </inheritanceMapping> - </configuration> - </execution> - <execution> - <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -215,17 +190,32 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> <goals> <goal>parse-java</goal> - <goal>parse-validation</goal> + <goal>parse-validation-fields</goal> + <goal>parse-validation-messages</goal> <goal>generate</goal> </goals> <configuration> - <force>true</force> + <validationFieldPrefix>observe.common.</validationFieldPrefix> + <inheritanceMapping> + <fr.ird.observe.dto.referential.I18nReferentialDto> + label1,label2,label3,label4,label5,label6,label7,label8 + </fr.ird.observe.dto.referential.I18nReferentialDto> + <fr.ird.observe.dto.referential.ReferentialDto> + code,status,uri,needComment + </fr.ird.observe.dto.referential.ReferentialDto> + </inheritanceMapping> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dto</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5… You're receiving this email because of your account on gitlab.com.

1 0