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

[Git][ultreiaio/ird-observe][develop] Déploiement du calendrier - Closes #1643
by Tony CHEMIT 13 Dec '20

13 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67b3e882 by Tony Chemit at 2020-12-13T01:11:36+01:00 Déploiement du calendrier - Closes #1643 - - - - - 5 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -275,6 +275,7 @@ observe.ui.datasource.storage.server.sessionExpire.reload observe.ui.datasource.storage.server.sessionExpire.title observe.ui.datasource.storage.serverConfiguration.presets.save observe.ui.datasource.storage.step.label +observe.ui.datepicker.show observe.ui.menu.navigation.ll observe.ui.menu.navigation.ps observe.ui.message.db.closed ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.api.content; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.WithClientConfig; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.GoToTab; import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; @@ -43,6 +44,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox; import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; @@ -56,6 +58,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.widgets.BeanUIUtil; import org.nuiton.jaxx.widgets.datetime.BeanDateEditor; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; +import org.nuiton.jaxx.widgets.datetime.ExtendedBasicDatePickerUI; import org.nuiton.jaxx.widgets.datetime.JAXXDatePicker; import org.nuiton.jaxx.widgets.datetime.TimeEditor; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; @@ -70,6 +73,7 @@ import org.nuiton.jaxx.widgets.text.NormalTextEditor; import org.nuiton.jaxx.widgets.text.UrlEditor; import javax.swing.ActionMap; +import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; @@ -409,6 +413,17 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(JAXXDatePicker editor) { initializerContext.checkFirstPass(); editor.setFormats("dd/MM/yyyy"); + ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { + @Override + protected JButton createPopupButton() { + JButton popupButton = super.createPopupButton(); + if (popupButton != null) { + popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); + } + return popupButton; + } + }; + editor.setUI(ui); } protected void init(BooleanEditor editor) { @@ -429,6 +444,18 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(BeanDateEditor editor) { initializerContext.checkFirstPass(); editor.setLocale(getClientConfig().getLocale()); + ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { + @Override + protected JButton createPopupButton() { + JButton popupButton = super.createPopupButton(); + if (popupButton != null) { + popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); + } + return popupButton; + } + }; + ui.setShowPopupButton(true); + editor.setUI(ui); editor.init(); } ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configure remote data sour observe.ui.datasource.storage.useRemoteStorage.description=Please configure connexion to remote data source\nYou must validate your connexion to continue. observe.ui.datasource.storage.useServerStorage.config=Configure remote server to use observe.ui.datasource.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue. +observe.ui.datepicker.show=To show date picker dialog observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=To configure application ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurar la base remota observe.ui.datasource.storage.useRemoteStorage.description=Configure la conexión a la base remota\nAntes de continuar, debe validar la conexión. observe.ui.datasource.storage.useServerStorage.config=Configurar el servidor remoto a utilizar observe.ui.datasource.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión. +observe.ui.datepicker.show=To show date picker dialog \#TODO observe.ui.menu.actions=Acciones observe.ui.menu.configuration=Configuración observe.ui.menu.configuration.tip=Menú de configuración ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurer la base distant observe.ui.datasource.storage.useRemoteStorage.description=Veuillez configurer votre connexion à la base distante\nAvant de pouvoir poursuivre, vous devez valider la connexion. observe.ui.datasource.storage.useServerStorage.config=Configurer le serveur distant à utiliser observe.ui.datasource.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion. +observe.ui.datepicker.show=Pour ouvrir l'éditeur de date observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=Menu de configuration View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67b3e8822a805060e8532361c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67b3e8822a805060e8532361c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] CTROL+F8 non fonctionnel (sous Mac) - Closes #1644
by Tony CHEMIT 12 Dec '20

12 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a3a7921a by Tony Chemit at 2020-12-13T00:27:40+01:00 CTROL+F8 non fonctionnel (sous Mac) - Closes #1644 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java ===================================== @@ -43,11 +43,11 @@ public class GoToTab extends ContentUIActionSupport<ContentUI> { private final int tabIndex; public static void installMain(ContentUI ui) { - install0(ui, DefaultUIInitializer.MAIN_TABBED_PANE, "ctrl pressed F"); + install0(ui, DefaultUIInitializer.MAIN_TABBED_PANE, "shift pressed F"); } public static void installSub(ContentUI ui) { - install0(ui, DefaultUIInitializer.SUB_TABBED_PANE, "shift ctrl pressed F"); + install0(ui, DefaultUIInitializer.SUB_TABBED_PANE, "shift alt pressed F"); } private static void install0(ContentUI ui, String tabbedPaneName, String keyStrokePrefix) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a3a7921a1b94bc6aa961bf15c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a3a7921a1b94bc6aa961bf15c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: clean code
by Tony CHEMIT 12 Dec '20

12 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf387649 by Tony Chemit at 2020-12-13T00:04:23+01:00 clean code - - - - - 60857167 by Tony Chemit at 2020-12-13T00:04:47+01:00 Boutons de navigation devraient avoir disparu - Closes #1648 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -116,6 +116,7 @@ public class ContentTableUIHandler<D extends DataDto, C extends DataDto, U exten } protected void onTableModelChanged() { + ui.getSelectToolbar().setVisible(getTableModel().getRowCount()>1); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java ===================================== @@ -40,6 +40,7 @@ import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.FocusTraversalPolicy; +import java.util.Objects; /** * To initialize ui. @@ -83,7 +84,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e UIHelper.setLayerUI(ui.getExtraZone(), ui.getBlockLayerUI()); } // layer pour dispatcher le focus entre le tableau et l'éditeurt - UIHelper.getLayer(ui.getTableScrollPane()).setUI(new ContentTableNavigationLayerUI(ui)); + Objects.requireNonNull(UIHelper.getLayer(ui.getTableScrollPane())).setUI(new ContentTableNavigationLayerUI(ui)); // on ajoute un layer pour bloquer l'édition des entrées si nécessaire et redispatcher le focus UIHelper.setLayerUI(ui.getEditor(), ui.getEditorBlockLayerUI()); @@ -94,8 +95,6 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e tableModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> this.onSelectedItemChanged((Integer) evt.getNewValue())); -// getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue())); - ui.getSelectFirstTableEntry().setEnabled(false); ui.getSelectPreviousTableEntry().setEnabled(false); ui.getSelectNextTableEntry().setEnabled(false); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e4001bc515a4869391cea6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e4001bc515a4869391cea6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Bien vérifier le fonctionnement des flags observe/calculé - Closes #1650
by Tony CHEMIT 12 Dec '20

12 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 110a9699 by Tony Chemit at 2020-12-12T23:48:12+01:00 Bien vérifier le fonctionnement des flags observe/calculé - Closes #1650 - - - - - 3c13b948 by Tony Chemit at 2020-12-12T23:54:11+01:00 Calée : racourcis inopportuns - Closes #1645 - - - - - 72e4001b by Tony Chemit at 2020-12-12T23:54:24+01:00 remove unused code - - - - - 3 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -100,8 +100,8 @@ } .computedDataInformation { - icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; - disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; + icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; + disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; } JToolBar { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationContext.java ===================================== @@ -33,10 +33,6 @@ import fr.ird.observe.dto.data.DataDto; */ public class ContentTableUINavigationContext extends NavigationContext<ContentTableUINavigationContext> { - protected boolean computeShowSata(ContentTableUINavigationInitializer initializer) { - return true; - } - public <D extends DataDto, C extends DataDto> ContentTableUIModelStates<D, C> newModelStates(ContentTableUINavigationInitializer initializer) { return new ContentTableUIModelStates<>(newReferenceCache(), initializer.getScope().newMainBean(), initializer.getScope().newChildBean(), initializer.getSelectedId(), initializer.getScope().isStandalone()); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java ===================================== @@ -47,6 +47,9 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa @Override public Color getColor() { + if (!getNode().getInitializer().isShowData()) { + return Color.GRAY; + } return super.getColor(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27f807f4543bfedca1fbf08d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27f807f4543bfedca1fbf08d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: nice method on dto (still moving some stuff from ui to dto)
by Tony CHEMIT 12 Dec '20

12 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d112789b by Tony Chemit at 2020-12-11T12:34:11+01:00 nice method on dto (still moving some stuff from ui to dto) - - - - - 23a211f3 by Tony Chemit at 2020-12-11T12:35:00+01:00 Improve init UI API (step two: make it neutral before moving it to JAXX) - - - - - 1ab7b0d1 by Tony Chemit at 2020-12-11T13:44:40+01:00 Improve init UI API (step three: using new JAXX API) - - - - - 3c87c0d2 by Tony Chemit at 2020-12-12T10:22:55+01:00 Use last pom and jaxx version - - - - - 27f807f4 by Tony Chemit at 2020-12-12T23:18:35+01:00 * Improve data source cache API * Remove standalone service methods to get extra data: now include them in dto - - - - - 30 changed files: - − client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/spi/ContentUIReferenceCache.java → client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/spi/ReferentialReferencesFilter.java → client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilter.java - + client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUINavigationContext.java → client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerResult.java → client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerResult.java - − client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/spi/NotStandaloneContentUI.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/NotStandaloneContentUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/NotStandaloneContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/NotStandaloneContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableUIAdapter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fc7bfe23a776a6b9be200d83… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fc7bfe23a776a6b9be200d83… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce a fine and simple way to initialize Jaxx objects
by Tony CHEMIT 10 Dec '20

10 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 35fd022b by Tony Chemit at 2020-12-10T10:16:22+01:00 Introduce a fine and simple way to initialize Jaxx objects - - - - - 08a541cb by Tony Chemit at 2020-12-10T21:57:03+01:00 Improve init UI API (should reverse it to JAXX...) - - - - - fc7bfe23 by Tony Chemit at 2020-12-10T22:55:51+01:00 Avoid nasty side effects while clearing beans + make works last form :) - - - - - 30 changed files: - client/core/pom.xml - + client/core/src/main/java/fr/ird/observe/client/util/UIFileHelper.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java → client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerContext.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerResult.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerSupport.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ChooseFileReport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/ChooseBackupDirectory.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTree.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/ChooseValidationReportFile.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentMessageTableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ExportPng.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIFocus.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/305bc16f60f09f5dd30d2318… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/305bc16f60f09f5dd30d2318… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Add nice methods on dto (stop doing stuff on ui about data)
by Tony CHEMIT 09 Dec '20

09 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f80c50a8 by Tony Chemit at 2020-12-09T11:10:19+01:00 Add nice methods on dto (stop doing stuff on ui about data) - - - - - 94f79fac by Tony Chemit at 2020-12-09T12:18:50+01:00 Improve DecoratorServiceTest and fix dependencies - - - - - 305bc16f by Tony Chemit at 2020-12-09T12:19:27+01:00 Introduce a fine and simple way to initialize Jaxx objects - - - - - 30 changed files: - client/core/pom.xml - + client/core/src/main/java/fr/ird/observe/client/util/UIFileHelper.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java → client/core/src/main/java/fr/ird/observe/client/util/init/JaxxObjectInitializer.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - + client/core/src/main/java/fr/ird/observe/client/util/init/UIInitializerContext.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ChooseFileReport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/ChooseBackupDirectory.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTree.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/ChooseValidationReportFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ExportPng.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIFocus.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ImportDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/spi/ContentUIReferenceCache.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/ObserveLayoutFocusTraversalPolicy.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/48974faf3c02ec6d0e21d7e9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/48974faf3c02ec6d0e21d7e9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Remove abstract notion on ContentTable, now everything seems to be ok without...
by Tony CHEMIT 08 Dec '20

08 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69a9fe82 by Tony Chemit at 2020-12-07T23:30:09+01:00 Remove abstract notion on ContentTable, now everything seems to be ok without using the abstract trick - - - - - da3985ed by Tony Chemit at 2020-12-07T23:32:16+01:00 Realign at last GearUseFeatures - on both model we got exactly the same code even if not factorize. - - - - - d2ac7813 by Tony Chemit at 2020-12-07T23:37:26+01:00 no need to expose I18n property - - - - - a52fc657 by Tony Chemit at 2020-12-07T23:54:50+01:00 * Clean content css * Unify the way to use not standalone table ui (remove notion of abstract ui) * Move logic of referential filters to model * Improve the ContentUIHandler design (now a lot is done by OpenExecutor) - - - - - 3a267327 by Tony Chemit at 2020-12-08T17:06:03+01:00 Add nice methods on dto (stop doing stuff on ui about data) - - - - - 9e280878 by Tony Chemit at 2020-12-08T17:11:35+01:00 Clean ui files Make models safer (sub models are not contained by main model), make it always the same (was not the case actually) - - - - - 0ced5083 by Tony Chemit at 2020-12-08T17:12:11+01:00 Remove full generated files :) - - - - - 48974faf by Tony Chemit at 2020-12-08T17:12:34+01:00 ContentHandler APi review (need just more tests and a finish) - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ComboBoxListCellRenderer.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetSchoolEstimateUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentMessageTableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/EditableContentUI.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/NotStandaloneContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/InsertMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ResetForm.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableNavigationLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIFocus.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0693c77073f3dd3d2c70d128… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0693c77073f3dd3d2c70d128… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Reconnaissance des paramètres de sécurité - See #1638
by Tony CHEMIT 07 Dec '20

07 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0693c770 by Tony Chemit at 2020-12-07T22:35:35+01:00 Reconnaissance des paramètres de sécurité - See #1638 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java ===================================== @@ -77,11 +77,11 @@ public class RolesTableModel extends AbstractTableModel { Collections.sort(roles); for (ObserveDbUserDto role : roles) { String name = role.getName(); - if (name.endsWith("-referentiel") || name.endsWith("-referential")) { + if (name.equals("referentiel") || name.equals("referential") || name.endsWith("-referentiel") || name.endsWith("-referential")) { role.setRole(ObserveDbRole.REFERENTIAL); - } else if (name.endsWith("-technicien") || name.endsWith("-technical")) { + } else if (name.equals("technicien") || name.equals("technician") || name.endsWith("-technicien") || name.endsWith("-technician")) { role.setRole(ObserveDbRole.TECHNICAL); - } else if (name.endsWith("-utilisateur") || name.endsWith("-user")) { + } else if (name.equals("utilisateur") || name.equals("user") ||name.endsWith("-utilisateur") || name.endsWith("-user")) { role.setRole(ObserveDbRole.USER); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0693c77073f3dd3d2c70d128e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0693c77073f3dd3d2c70d128e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: By default nothing to do on closing ServicesProvider.
by Tony CHEMIT 07 Dec '20

07 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0920f857 by Tony Chemit at 2020-12-07T15:50:43+01:00 By default nothing to do on closing ServicesProvider. - - - - - 4642347a by Tony Chemit at 2020-12-07T21:55:02+01:00 Reconnaissance des paramètres de sécurité - See #1638 - - - - - 3 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java - toolkit/service/src/main/java/fr/ird/observe/spi/ServicesProvider.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -85,7 +85,6 @@ import javax.swing.Icon; import javax.swing.JOptionPane; import javax.swing.event.EventListenerList; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Iterator; @@ -262,7 +261,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple } finally { try { servicesProvider.close(); - } catch (IOException e) { + } catch (Exception e) { log.error("Could not close properly services provider", e); } ObserveUtil.cleanMemory(); @@ -285,7 +284,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple ObserveUtil.cleanMemory(); try { servicesProvider.close(); - } catch (IOException e) { + } catch (Exception e) { log.error("Could not close properly services provider", e); } connection = null; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java ===================================== @@ -77,11 +77,11 @@ public class RolesTableModel extends AbstractTableModel { Collections.sort(roles); for (ObserveDbUserDto role : roles) { String name = role.getName(); - if (name.endsWith("-referentiel") || name.endsWith("-referential")) { + if (name.equals("referentiel") || name.equals("referential") || name.endsWith("-referentiel") || name.endsWith("-referential")) { role.setRole(ObserveDbRole.REFERENTIAL); - } else if (name.endsWith("-technicien") || name.endsWith("-technical")) { + } else if (name.equals("technicien") || name.equals("technical") || name.endsWith("-technicien") || name.endsWith("-technical")) { role.setRole(ObserveDbRole.TECHNICAL); - } else if (name.endsWith("-utilisateur") || name.endsWith("-user")) { + } else if (name.equals("utilisateur") || name.equals("user") ||name.endsWith("-utilisateur") || name.endsWith("-user")) { role.setRole(ObserveDbRole.USER); } } ===================================== toolkit/service/src/main/java/fr/ird/observe/spi/ServicesProvider.java ===================================== @@ -35,4 +35,8 @@ import java.io.Closeable; public interface ServicesProvider extends Closeable { <S extends ObserveService> S getService(Class<S> serviceType); + + default void close() { + // do nothing + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fe18f76aee7505b7fef4d1a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9fe18f76aee7505b7fef4d1a… You're receiving this email because of your account on gitlab.com.

1 0