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

[Git][ultreiaio/ird-observe][develop] action storm + ds storm
by Tony CHEMIT 11 Nov '17

11 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 19a8f673 by Tony CHEMIT at 2017-11-11T14:46:52+01:00 action storm + ds storm - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - − client/src/main/java/fr/ird/observe/client/db/ObserveClientDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveClientDataSource.java → client/src/main/java/fr/ird/observe/client/ds/ObserveClientDataSource.java - + client/src/main/java/fr/ird/observe/client/ds/ObserveClientDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourceServicesProvider.java → client/src/main/java/fr/ird/observe/client/ds/ObserveDataSourceServicesProvider.java - client/src/main/java/fr/ird/observe/client/db/ObserveMainDataSourceServicesProvider.java → client/src/main/java/fr/ird/observe/client/ds/ObserveMainDataSourceServicesProvider.java - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsManager.java - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsUI.jcss - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/FloatingObjectPresetsUIModel.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/DeleteFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/dcppresets/actions/DeleteFloatingObjectPresetUIAction.java - + client/src/main/java/fr/ird/observe/client/ds/dcppresets/actions/FloatingObjectPresetsUIActionSupport.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/QuitFloatingObjectPresetsUIAction.java → client/src/main/java/fr/ird/observe/client/ds/dcppresets/actions/QuitFloatingObjectPresetsUIAction.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/SaveFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/dcppresets/actions/SaveFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/form/CommonFormUI.jcss → client/src/main/java/fr/ird/observe/client/ds/editor/form/CommonFormUI.jcss - client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/FormUIApplicationContext.java - client/src/main/java/fr/ird/observe/client/form/FormUIFocusManager.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/FormUIFocusManager.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIHandler.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormUIHandler.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIInitializer.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormUIInitializer.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormUIInitializerContext.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormUIInitializerContext.java - client/src/main/java/fr/ird/observe/client/form/ObserveFormWithBeanUIHandler.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormWithBeanUIHandler.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivityLonglineSetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/actions/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineFloatingObjectUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/actions/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineSetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/actions/AddActivitySeineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddFloatingObjectPresetUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/actions/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/CloseAndCreateUIAction.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/actions/CloseAndCreateUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/19a8f673381c3ee48b95c90ecd3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/19a8f673381c3ee48b95c90ecd3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] continue moving stuff to toolkit, we are nearly done, ...
by Tony CHEMIT 08 Nov '17

08 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 172133a1 by Tony CHEMIT at 2017-11-08T20:34:04+01:00 continue moving stuff to toolkit, we are nearly done,... - - - - - 30 changed files: - CONTRIBUTING.md - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveMainUI.jcss - − 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/AbstractContentUIAction.java - − client/src/main/java/fr/ird/observe/client/action/ObserveUIActionSupport.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/DeleteFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/QuitFloatingObjectPresetsUIAction.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/SaveFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddFloatingObjectPresetUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/BackToReferentialListUIAction.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/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/action/form/CopyFloatingObjectPartToRightAction.java - − client/src/main/java/fr/ird/observe/client/action/form/CreateNewReferentialUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/CreateOpenUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteDataUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteReferenceUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/EditFloatingObjectPresetUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/EditReferentialFromListUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/EditReferentialUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/172133a1d675f82b47b685c5acc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/172133a1d675f82b47b685c5acc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] ui storm again
by Tony CHEMIT 08 Nov '17

08 Nov '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf6dd7bd by Tony CHEMIT at 2017-11-08T13:00:04+01:00 ui storm again - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - − client/src/main/java/fr/ird/observe/client/action/AbstractContentUIAction.java - − client/src/main/java/fr/ird/observe/client/action/ObserveUIActionSupport.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/DeleteFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/QuitFloatingObjectPresetsUIAction.java - client/src/main/java/fr/ird/observe/client/action/dcppresets/SaveFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddActivitySeineSetUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/AddFloatingObjectPresetUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/BackToReferentialListUIAction.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/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/action/form/CopyFloatingObjectPartToRightAction.java - − client/src/main/java/fr/ird/observe/client/action/form/CreateNewReferentialUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/CreateOpenUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteDataUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteReferenceUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/DeleteTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/action/form/EditFloatingObjectPresetUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/EditReferentialFromListUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/EditReferentialUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/GoDownUIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/GoToSubTab2UIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/GoToSubTab3UIAction.java - − client/src/main/java/fr/ird/observe/client/action/form/GoToTab1UIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bf6dd7bdbc21863c3ca9736e91e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bf6dd7bdbc21863c3ca9736e91e… You're receiving this email because of your account on gitlab.com.

1 0

[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