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

[Git][ultreiaio/ird-observe][develop] 2 commits: Correction des listes qui ne sont pas active
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26321405 by Tony Chemit at 2020-07-15T17:00:49+02:00 Correction des listes qui ne sont pas active - - - - - 57b88df8 by Tony Chemit at 2020-07-15T17:01:47+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/util/action/ObserveExecutorService.java - client-core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/MainDataSourceListener.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/actions/DataSourceEditorActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ContentUIActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/TripUIMoveMultipleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/Close.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/Open.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/TripUIMoveSingleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/ContentSimpleUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f15111ef5832b1cc484e085f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f15111ef5832b1cc484e085f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Optimize i18n keys (make better categories)
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ed557d28 by Tony Chemit at 2020-07-15T13:59:00+02:00 Optimize i18n keys (make better categories) - - - - - f15111ef by Tony Chemit at 2020-07-15T14:17:34+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadDefaultConfigurationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadResourcesAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01ef1ec9a508926b3b82b3a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01ef1ec9a508926b3b82b3a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Clean i18n keys
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 20fa0bb1 by Tony Chemit at 2020-07-15T12:00:53+02:00 Clean i18n keys - - - - - 01ef1ec9 by Tony Chemit at 2020-07-15T12:35:55+02:00 Optimize i18n keys - - - - - 13 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== client-datasource-actions/src/main/i18n/getters/java.getter ===================================== @@ -124,10 +124,10 @@ observe.actions.synchro.referential.replaceBeforeDeactivate.title observe.actions.synchro.referential.replaceBeforeDelete.title observe.actions.synchro.referential.task.addToLeft observe.actions.synchro.referential.task.addToRight -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement -observe.actions.synchro.referential.task.deactivateWithReplaceFromRight -observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement +observe.actions.synchro.referential.task.deactivateFromLeft +observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement +observe.actions.synchro.referential.task.deactivateFromRight +observe.actions.synchro.referential.task.deactivateFromRightWithReplacement observe.actions.synchro.referential.task.deleteFromLeft observe.actions.synchro.referential.task.deleteFromRight observe.actions.synchro.referential.task.include.properties ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java ===================================== @@ -142,8 +142,8 @@ public enum ReferentialSynchronizeResources { DEACTIVATE( "deactivateFromLeft", "deactivateFromRight", - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft"), - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRight"), + n("observe.actions.synchro.referential.task.deactivateFromLeft"), + n("observe.actions.synchro.referential.task.deactivateFromRight"), n("observe.actions.synchro.referential.action.deactivateFromLeft.tip"), n("observe.actions.synchro.referential.action.deactivateFromRight.tip"), ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME, @@ -155,8 +155,8 @@ public enum ReferentialSynchronizeResources { DEACTIVATE_WITH_REPLACEMENT( "deactivateFromLeft", "deactivateFromRight", - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement"), - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement"), + n("observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement"), + n("observe.actions.synchro.referential.task.deactivateFromRightWithReplacement"), n("observe.actions.synchro.referential.action.deactivateFromLeftWithReplacement.tip"), n("observe.actions.synchro.referential.action.deactivateFromRightWithReplacement.tip"), ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME, ===================================== client-datasource-editor-api/pom.xml ===================================== @@ -280,6 +280,14 @@ <enum>fr.ird.observe.client.datasource.editor.wizard.ObstunaAdminAction</enum> </enums> </enumerationSet> + <enumerationSet> + <name>tip</name> +  + <pattern>observe.Id.mode.@NAME@.tip</pattern> + <enums> + <enum>fr.ird.observe.client.datasource.editor.content.ContentMode</enum> + </enums> + </enumerationSet> </enumerationSets> </configuration> </execution> ===================================== client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -1,3 +1,6 @@ +observe.Id.mode.CREATE.tip +observe.Id.mode.READ.tip +observe.Id.mode.UPDATE.tip observe.constant.ObstunaAdminAction.CREATE observe.constant.ObstunaAdminAction.CREATE.description observe.constant.ObstunaAdminAction.SECURITY ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java ===================================== @@ -21,6 +21,8 @@ */ package fr.ird.observe.client.datasource.editor.content; +import fr.ird.observe.dto.I18nEnumHelper; +import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.Icon; @@ -46,6 +48,10 @@ public enum ContentMode { return icon == null ? icon = SwingUtil.createActionIcon("mode-" + name().toLowerCase()) : icon; } + public String getTip() { + return I18n.t(String.format("observe.Id.mode.%s.tip", name())); + } + public String getValidationContext() { return name().toLowerCase(); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx ===================================== @@ -22,10 +22,7 @@ abstract='true' contentContainer='{contentContainer}' leftDecoration='{titleLeft}' - rightDecoration='{titleRightToolBar}' - _READTip='t("observe.Id.mode.read.tip")' - _CREATERip='t("observe.Id.mode.create.tip")' - _UPDATETip='t("observe.Id.mode.update.tip")'> + rightDecoration='{titleRightToolBar}'> <import> fr.ird.observe.client.configuration.ClientConfig ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -541,14 +541,12 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe protected final void onModeChanged(ContentMode mode) { String tip = null; - if (mode != null) { - tip = (String) ui.getClientProperty(mode.name() + "Tip"); - } - ui.getTitleRight().setToolTipText(tip); Icon icon = null; if (mode != null) { + tip = mode.getTip(); icon = mode.getIcon(); } + ui.getTitleRight().setToolTipText(tip); ui.getTitleRight().setIcon(icon); getModel().setFormFocusOwner(null); } ===================================== client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -24,7 +24,6 @@ observe.data.Data.timerTimeOnBoard observe.data.Data.traceCutOff observe.data.Data.vessel observe.data.Data.weightMeasureMethod -observe.data.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ll.common.GearUseFeatures.gear observe.data.ll.common.GearUseFeatures.generalTab observe.data.ll.common.GearUseFeatures.measurementsTab @@ -97,7 +96,6 @@ observe.data.ll.logbook.Activity.titles observe.data.ll.logbook.Activity.vesselActivity observe.data.ll.logbook.Activity.wind observe.data.ll.logbook.Activity.windDirection -observe.data.ll.logbook.Activity.windSpeed observe.data.ll.logbook.BaitsComposition.action.create observe.data.ll.logbook.BaitsComposition.action.create.tip observe.data.ll.logbook.BaitsComposition.baitSettingStatus ===================================== client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -22,7 +22,6 @@ observe.data.Data.speciesFate observe.data.Data.startDate observe.data.Data.vessel observe.data.Data.weightMeasureMethod -observe.data.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ps.common.GearUseFeatures.action.create.tip observe.data.ps.common.GearUseFeatures.action.create.tip.tip observe.data.ps.common.GearUseFeatures.gear ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -58,7 +58,6 @@ observe.data.ll.logbook.Activity.startTimeStamp observe.data.ll.logbook.Activity.vesselActivity observe.data.ll.logbook.Activity.wind observe.data.ll.logbook.Activity.windDirection -observe.data.ll.logbook.Activity.windSpeed observe.data.ll.logbook.BaitsComposition.baitSettingStatus observe.data.ll.logbook.BaitsComposition.baitType observe.data.ll.logbook.BaitsComposition.individualSize View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 149ef8af by Tony Chemit at 2020-07-15T11:20:04+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - 1 changed file: - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml ===================================== @@ -31,6 +31,12 @@ </param> <message>observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped</message> </field-validator> - + </field> + <field name="depredatedProportion"> + <field-validator type="boundNumber" short-circuit="true"> + <param name="min">0.0</param> + <param name="max">100.0</param> + <message/> + </field-validator> </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/149ef8af9d5e00bc630b8aea7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/149ef8af9d5e00bc630b8aea7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve Exception API :
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26d2c33b by Tony Chemit at 2020-07-15T10:34:28+02:00 Improve Exception API : * now have nice message in exception, instead of dummy exception ith data but no message! Thanks to Bavencoff (go to hell bad coder) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/ObstunaAdminAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/TestRemote.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/TestServer.java - client-runner/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - common-persistence/src/main/java/fr/ird/observe/entities/DataAssociationParentNotFoundException.java - common-persistence/src/main/java/fr/ird/observe/entities/DataNotFoundException.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - common-service/src/main/i18n/getters/java.getter - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateConfigurationDto.java - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateWithNoReferentialImportException.java - common-service/src/main/java/fr/ird/observe/services/configuration/IncompatibleDataSourceCreateConfigurationException.java - common-service/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java - common-service/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java - common-service/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java - − common-service/src/main/java/fr/ird/observe/services/service/DatabaseOpenException.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26d2c33bbbfab360f4da5ddc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26d2c33bbbfab360f4da5ddc7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve Dto API :
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36546947 by Tony Chemit at 2020-07-15T07:38:11+02:00 Improve Dto API : * add a new static instance factory - - - - - 13 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BasketTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java - templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.common; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.referential.common.GearCaracteristicReference; @@ -132,6 +131,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach @Override protected GearUseFeaturesMeasurementDto createNewRow() { - return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); + return GearUseFeaturesMeasurementDto.newDto(new Date()); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java ===================================== @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUITableModel; import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto; @@ -224,7 +223,7 @@ class GearUseFeaturesUITableModel extends ContentTableUITableModel<TripGearUseFe return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); + GearUseFeaturesMeasurementDto measurementDto = GearUseFeaturesMeasurementDto.newDto(new Date()); if (input.getGearCaracteristicType().isBoolean()) { measurementDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BasketTableModel.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.BasketDto; import fr.ird.observe.dto.data.ll.observation.SectionTemplate; @@ -37,13 +36,14 @@ import java.util.Date; public class BasketTableModel extends LonglineCompositionObsTableModelSupport<BasketDto> { public static final Class<?>[] CLASSES = {Integer.class, Integer.class, Float.class, Float.class}; + public BasketTableModel(SetDetailCompositionUIModel model) { super(model); } @Override public BasketDto createNewRow() { - return IdDto.newDto(BasketDto.class, new Date()); + return BasketDto.newDto(new Date()); } @Override ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import java.util.Date; @@ -50,7 +49,7 @@ public class BranchlineTableModel extends LonglineCompositionObsTableModelSuppor @Override public BranchlineDto createNewRow() { - BranchlineDto branchline = IdDto.newDto(BranchlineDto.class, new Date()); + BranchlineDto branchline = BranchlineDto.newDto(new Date()); branchline.setTimerTimeOnBoard(defaultDate); branchline.setTimer(useTimer); return branchline; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; @@ -101,7 +100,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo @Override protected SizeMeasureDto createNewRow() { - return IdDto.newDto(SizeMeasureDto.class, new Date()); + return SizeMeasureDto.newDto(new Date()); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto; import fr.ird.observe.dto.referential.common.WeightMeasureTypeReference; @@ -57,7 +56,7 @@ public class WeightMeasureTableModel extends EditableTableWithCacheTableModelSup @Override protected WeightMeasureDto createNewRow() { - return IdDto.newDto(WeightMeasureDto.class, new Date()); + return WeightMeasureDto.newDto(new Date()); } @Override ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.common; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.referential.common.GearCaracteristicReference; @@ -132,6 +131,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach @Override protected GearUseFeaturesMeasurementDto createNewRow() { - return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); + return GearUseFeaturesMeasurementDto.newDto(new Date()); } } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUITableModel.java ===================================== @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUITableModel; import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto; @@ -224,7 +223,7 @@ class GearUseFeaturesUITableModel extends ContentTableUITableModel<TripGearUseFe return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); + GearUseFeaturesMeasurementDto measurementDto = GearUseFeaturesMeasurementDto.newDto(new Date()); if (input.getGearCaracteristicType().isBoolean()) { measurementDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -32,7 +32,6 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.data.ps.observation.ObjectMaterialHierarchyDto; import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto; -import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyHelper; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.ps.common.ObjectOperationReference; import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationDto; @@ -338,7 +337,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject if (transmittingBuoy == null) { - TransmittingBuoyHelper.copyTransmittingBuoyDto(TransmittingBuoyDto.newDto(TransmittingBuoyDto.class, new Date()), editBean); + TransmittingBuoyDto.newDto(new Date()).copy(editBean); editBean.setCreateDate(new Date()); editBean.setTransmittingBuoyOperation(operation); ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java ===================================== @@ -91,7 +91,7 @@ public class FloatingObjectUIModel extends ContentEditUIModel<FloatingObjectDto, ImmutableSet.Builder<FloatingObjectPartDto> result = ImmutableSet.builder(); Date now = new Date(); for (ObjectMaterialDto o : getAllWithData()) { - FloatingObjectPartDto partDto = FloatingObjectPartDto.newDto(FloatingObjectPartDto.class, now); + FloatingObjectPartDto partDto = FloatingObjectPartDto.newDto(now); partDto.setObjectMaterial(o.toReference(referentialLocale)); if (arriving) { partDto.setWhenArriving(whenArriving.get(o)); ===================================== common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.spi.context; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReference; @@ -130,7 +131,7 @@ public class DataDtoEntityContext<D extends DataDto, R extends DataDtoReference< @Override public D toDto(ReferentialLocale referentialLocale, Class<D> dtoType, E entity) { - D dto = Objects2.newInstance(dtoType); + D dto = IdDto.newDto(dtoType, entity.getTopiaCreateDate()); entity.toDto(referentialLocale, dto); return dto; } ===================================== dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java ===================================== @@ -139,7 +139,7 @@ public class ActivityDto extends GeneratedActivityDto { } public SampleReference toNewSampleReference(ReferentialLocale referentialLocale) { - SampleDto sampleDto = SampleDto.newDto(SampleDto.class, new Date()); + SampleDto sampleDto = SampleDto.newDto(new Date()); sampleDto.setTimeStamp(getStartTimeStamp()); sampleDto.setLatitude(getLatitude()); sampleDto.setLongitude(getLongitude()); ===================================== templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java ===================================== @@ -61,6 +61,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; import java.util.Arrays; import java.util.Collection; +import java.util.Date; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Map; @@ -86,10 +87,9 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract private final EugeneJavaTagValues javaTemplatesTagValues; private final BeanTransformerTagValues beanTagValues; private final ObserveTagValues observeTagValues; - - private BeanTransformerContext context; private final Map<String, String> dtoFormMapping = new TreeMap<>(); private final Map<String, String> dtoMainMapping = new TreeMap<>(); + private BeanTransformerContext context; public DtoTransformer() { coreTagValues = new EugeneCoreTagValues(); @@ -129,6 +129,10 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract protected ObjectModelClass generateGeneratedClass(ObjectModelPackage aPackage, ObjectModelClass input, String className, String mainClassName) { ObjectModelClass output = super.generateGeneratedClass(aPackage, input, className, mainClassName); boolean referential = TemplateContract.isReferentialFromPackageName(aPackage.getName()); + boolean notAbstract = !input.isAbstract(); + if (notAbstract) { + addStaticFactoryMethod(output, mainClassName); + } if (context.selectedClasses.contains(input)) { String referencesTagValue = observeTagValues.getReferencesTagValue(input); @@ -148,13 +152,22 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract addInterface(output, String.format("%s<%s, %s>", DtoToReference.class.getName(), mainClassName, referenceName)); addToReferenceMethod(output, binderProperties, referenceName); } - if (!input.isAbstract()) { + + if (notAbstract) { addFormDefinitionAttribute(input, output, referential); addMainDtoMapping(input, referential); } return output; } + private void addStaticFactoryMethod(ObjectModelClass output, String className) { + ObjectModelOperation operation = addOperation(output, "newDto", className, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); + addParameter(operation, importAndSimplify(output, Date.class.getName()), "createDate"); + setOperationBody(operation, ""/*{ + return newDto(<%=className%>.class, createDate); + }*/); + } + private void addMainDtoMapping(ObjectModelClass input, boolean referential) { String mainDtoTagValue = observeTagValues.getMainDtoTagValue(input); if (Objects.equals("skip", mainDtoTagValue)) { @@ -256,7 +269,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract protected ObjectModel initOutputModel() { //FIXME Override builder to avoid bad imports when using synonyms in model... - builder = new JavaBuilder(getModel().getName()){ + builder = new JavaBuilder(getModel().getName()) { @Override public ObjectModelOperation addOperation(ObjectModelClassifier classifier, String name, String type, ObjectModelModifier... modifiers) { ObjectModelOperationImpl result = new ObjectModelOperationImpl(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36546947b0844f90a4f100123… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36546947b0844f90a4f100123… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve DtoReference API :
by Tony CHEMIT 14 Jul '20

14 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1ba5c472 by Tony Chemit at 2020-07-14T14:59:35+02:00 Improve DtoReference API : * now only one way to create a reference (from dto) * improve constructor (only used dto parameter and referential locale) * simplify generated code - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/NavigationTreeNodeSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/actions/ActivityUIAddSample.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookListNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/TripLonglineLandingLogbookListNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/TripLonglineSampleLogbookListNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsListNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/common/ProgramSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/ActivitySeineListNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/ActivitySeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/RouteSeineListNavigationTreeNode.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripReference.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReference.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SampleReference.java - dto/src/main/java/fr/ird/observe/dto/data/ll/observation/ActivityReference.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/FpaZoneReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/LengthLengthParameterReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/LengthWeightParameterReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/PersonReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/ProgramReference.java - dto/src/main/java/fr/ird/observe/dto/referential/common/SizeMeasureTypeReference.java - dto/src/main/java/fr/ird/observe/dto/referential/ll/common/VesselActivityReference.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ba5c472787fe66de565a7735… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ba5c472787fe66de565a7735… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Add missing protectd id
by Tony CHEMIT 14 Jul '20

14 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5fc58d18 by Tony Chemit at 2020-07-14T09:49:26+02:00 Add missing protectd id - - - - - 15130976 by Tony Chemit at 2020-07-14T09:57:19+02:00 Clean some code (remove usage of ClientUIContextApplicationComponent.value() for example) - - - - - 596bcf7f by Tony Chemit at 2020-07-14T10:10:10+02:00 Amélioration API ContentUITableModel (third part - focus and clean code) - - - - - 270f2ace by Tony Chemit at 2020-07-14T10:18:48+02:00 L'option afficher/cacher la légende semble ne pas fonctionner - Closes #1576 - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/DataSynchronizeTaskSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateEntityListCellRenderer.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - − client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/UIHandlerSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableNavigationLayerUI.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUILayoutFocusTraversalPolicy.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUITableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/UniqueKeyTableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageUIHandlerSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ui/table/EditableTableModelSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/RemotePresetsUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUISaveRemoteConfigurationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUISaveServerConfigurationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUIUseRemoteConfigurationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUIUseServerConfigurationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/StorageTabUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/209e5a4b66e09990155e2307… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/209e5a4b66e09990155e2307… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Fix usage of new JaxxComboBox
by Tony CHEMIT 12 Jul '20

12 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9af390ed by Tony Chemit at 2020-07-12T13:52:28+02:00 Fix usage of new JaxxComboBox - - - - - adbcf319 by Tony Chemit at 2020-07-12T13:54:53+02:00 Add ComputedDataInformation css class (once for all) - - - - - ef30a840 by Tony Chemit at 2020-07-12T13:56:59+02:00 Improve data source editor content API (using no jaxx power feature @override + auto import from parent css) - - - - - 209e5a4b by Tony Chemit at 2020-07-12T19:33:21+02:00 Amélioration API ContentUITableModel (second part) - - - - - 30 changed files: - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ShowTechnicalInformation.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java_95141346949899 - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/MoveSingleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/ContentSimpleUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableModel.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUITableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/ContentTableUIEntryActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MoveBottom.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MoveDown.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MoveTop.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MoveUp.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/Save.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentI18nReferenceUI.jaxx → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentI18nReferentialUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentI18nReferenceUI.jcss → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentI18nReferentialUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUIHandler.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUIInitializer.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUILayoutFocusTraversalPolicy.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUILayoutFocusTraversalPolicy.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUIModel.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ReferenceHomeUI.jaxx → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ReferentialHomeUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ReferenceHomeUIHandler.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ReferentialHomeUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b6c2f02437f7e7f0ecb9c8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b6c2f02437f7e7f0ecb9c8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration API ContentUITableModel (first part)
by Tony CHEMIT 11 Jul '20

11 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b6c2f02 by Tony Chemit at 2020-07-11T12:57:23+02:00 Amélioration API ContentUITableModel (first part) - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/sample/SampleUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesTableModel.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartContentTableModel.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BaitsCompositionUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BaitsCompositionUIModel.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BaitsCompositionUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BranchlinesCompositionUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BranchlinesCompositionUIModel.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BranchlinesCompositionUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/FloatlinesCompositionUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/FloatlinesCompositionUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartContentTableModel.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/FloatlinesCompositionUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/HooksCompositionUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/HooksCompositionUIModel.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/HooksCompositionUITableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b6c2f02437f7e7f0ecb9c8f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b6c2f02437f7e7f0ecb9c8f4… You're receiving this email because of your account on gitlab.com.

1 0