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

[Git][ultreiaio/ird-observe][develop] Fix observe.Common.tracelineLength I18n value
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c834f986 by Tony Chemit at 2024-09-11T15:45:44+02:00 Fix observe.Common.tracelineLength I18n value - - - - - 3 changed files: - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Total number of lightsticks observe.Common.totalLineLength=Total line length observe.Common.totalSectionsCount=Total sections observe.Common.traceCutOff=Trace cut off -observe.Common.tracelineLength=Traceline length (m) +observe.Common.tracelineLength=Traceline length observe.Common.tracelineLength.short=Traceline length (m) observe.Common.tracelineType=Traceline type observe.Common.tracelineType.short=Traceline type ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Número total de barras de luz observe.Common.totalLineLength=Total line length\#TODO observe.Common.totalSectionsCount=totalSectionsCount \#TODO observe.Common.traceCutOff=Bajo de línea cortada -observe.Common.tracelineLength=Parte baja (m) +observe.Common.tracelineLength=Parte baja observe.Common.tracelineLength.short=Parte baja (m) observe.Common.tracelineType=Tipo bajo de línea observe.Common.tracelineType.short=Tipo bajo de línea ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Nombre total de cyalumes observe.Common.totalLineLength=Longueur totale de la ligne observe.Common.totalSectionsCount=Nombre total de sections observe.Common.traceCutOff=Bas de ligne coupé -observe.Common.tracelineLength=Longueur bas de ligne (m) +observe.Common.tracelineLength=Longueur bas de ligne observe.Common.tracelineLength.short=Longueur bas de ligne (m) observe.Common.tracelineType=Type bas de ligne observe.Common.tracelineType.short=Type bas de ligne View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c834f986f40d80af8d7d3bdbd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c834f986f40d80af8d7d3bdbd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] Fix observe.Common.tracelineLength I18n value
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: c928e6ce by Tony Chemit at 2024-09-11T15:49:04+02:00 Fix observe.Common.tracelineLength I18n value - - - - - 3 changed files: - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Total number of lightsticks observe.Common.totalLineLength=Total line length observe.Common.totalSectionsCount=Total sections observe.Common.traceCutOff=Trace cut off -observe.Common.tracelineLength=Traceline length (m) +observe.Common.tracelineLength=Traceline length observe.Common.tracelineLength.short=Traceline length (m) observe.Common.tracelineType=Traceline type observe.Common.tracelineType.short=Traceline type ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Número total de barras de luz observe.Common.totalLineLength=Total line length\#TODO observe.Common.totalSectionsCount=totalSectionsCount \#TODO observe.Common.traceCutOff=Bajo de línea cortada -observe.Common.tracelineLength=Parte baja (m) +observe.Common.tracelineLength=Parte baja observe.Common.tracelineLength.short=Parte baja (m) observe.Common.tracelineType=Tipo bajo de línea observe.Common.tracelineType.short=Tipo bajo de línea ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Nombre total de cyalumes observe.Common.totalLineLength=Longueur totale de la ligne observe.Common.totalSectionsCount=Nombre total de sections observe.Common.traceCutOff=Bas de ligne coupé -observe.Common.tracelineLength=Longueur bas de ligne (m) +observe.Common.tracelineLength=Longueur bas de ligne observe.Common.tracelineLength.short=Longueur bas de ligne (m) observe.Common.tracelineType=Type bas de ligne observe.Common.tracelineType.short=Type bas de ligne View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c928e6ceea7cc53ee24ef6400… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c928e6ceea7cc53ee24ef6400… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 39 commits: Move I18nReferentialDto.isLabelTranslated method to WithI18n
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 94f6df7f by Tony Chemit at 2024-09-11T12:15:23+02:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 9e068fe4 by Tony Chemit at 2024-09-11T12:15:23+02:00 Fix some missing i18n keys - - - - - aeb7faac by Tony Chemit at 2024-09-11T12:15:23+02:00 use correct commons-configuration2 - - - - - 2f12589f by Tony Chemit at 2024-09-11T12:15:23+02:00 Add FIXME to resolve - - - - - 85945a65 by Tony Chemit at 2024-09-11T12:17:34+02:00 Improve validation comments - - - - - d52f35b6 by Tony Chemit at 2024-09-11T12:17:34+02:00 Depreciate xwork field validators - - - - - 4d4a8573 by Tony Chemit at 2024-09-11T12:17:34+02:00 use new validation and jaxx validation API - - - - - a771d97d by Tony Chemit at 2024-09-11T12:17:35+02:00 implements new field validator using new API - - - - - 022dbe80 by Tony Chemit at 2024-09-11T12:17:35+02:00 rewrite validation models - - - - - fd4ff63e by Tony Chemit at 2024-09-11T12:17:37+02:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - 5eabd245 by Tony Chemit at 2024-09-11T12:17:37+02:00 Test both validation implementations in services tck - - - - - ceed4b96 by Tony Chemit at 2024-09-11T12:17:37+02:00 update pom - - - - - c54cab5b by Tony Chemit at 2024-09-11T12:17:38+02:00 I18n does not parse any longer xml files - - - - - 09247f70 by Tony Chemit at 2024-09-11T12:17:39+02:00 Manage extra validators in client datasource editors - - - - - 3153d3bf by Tony Chemit at 2024-09-11T12:17:39+02:00 use new validation and jaxx validation API - - - - - 46beaf8d by Tony Chemit at 2024-09-11T12:17:39+02:00 add a temporary configuration option to be able to change the validation default factory name - - - - - 0dcaade2 by Tony Chemit at 2024-09-11T12:17:55+02:00 Merge branch 'feature/feature/issue-2594' into develop Suppression de la technologie XWorks (utilisé pour la validation) - Closes #2594 - - - - - 97d0d1a2 by Tony Chemit at 2024-09-11T12:18:43+02:00 compositionTabValid can not be bind to tableModels since there is some validation done outside of them... and must be always true on reading mode - - - - - eb4eb914 by Tony Chemit at 2024-09-11T12:18:43+02:00 Make table not sortable - - - - - bd494676 by Tony Chemit at 2024-09-11T12:18:44+02:00 Open ContentMessageTableModel.data property - - - - - b4ed950e by Tony Chemit at 2024-09-11T12:18:44+02:00 Fix i18n key name (replace Section.template by Section.sectionTemplate) - - - - - 1100adf9 by Tony Chemit at 2024-09-11T12:18:44+02:00 clean SetDetailCompositionUIInitializer code - - - - - f0ab1726 by Tony Chemit at 2024-09-11T12:18:44+02:00 Improve Reset action - - - - - cc22d8c6 by Tony Chemit at 2024-09-11T12:18:44+02:00 Improve validation flow to validate less things (before we revalidate all sections each time...) - - - - - 31785b0a by Tony Chemit at 2024-09-11T12:18:44+02:00 Improve open form performance - - - - - 852af4bd by Tony Chemit at 2024-09-11T12:18:44+02:00 Fix where to call validation helper - - - - - 6382ad48 by Tony Chemit at 2024-09-11T12:18:45+02:00 Limit when use rearrangeIds method - - - - - 54988238 by Tony Chemit at 2024-09-11T12:18:45+02:00 Fix validators editors mapping (but still not working to display icons on validator ui) - - - - - 370d4723 by Tony Chemit at 2024-09-11T12:19:00+02:00 Merge branch 'feature/feature/issue-2906' into develop LL observations/composition détaillée : amélioration de la réactivité du formulaire en mode édition - Closes #2906 - - - - - 2a59107d by Tony Chemit at 2024-09-11T12:19:24+02:00 Fix jaxx id - - - - - 398eba4f by Tony Chemit at 2024-09-11T12:19:24+02:00 update pom - - - - - 79f950dd by Tony Chemit at 2024-09-11T12:19:24+02:00 Improve table column sort for enum and boolean - See #1203 - - - - - 9125f976 by Tony Chemit at 2024-09-11T12:19:24+02:00 Introduce DecoratorTableRenderer - - - - - 6682693e by Tony Chemit at 2024-09-11T12:19:24+02:00 Fix focus owner to number (but should review this in Focus session) - See #2902 - - - - - b0268053 by Tony Chemit at 2024-09-11T12:55:57+02:00 fix new maven modules version - - - - - 0bf5aee6 by Tony Chemit at 2024-09-11T15:00:19+02:00 Move to persistence model 9.4 - - - - - da9d2db2 by Tony Chemit at 2024-09-11T15:00:19+02:00 Fix IO issues - - - - - 8f0dd4d6 by Tony Chemit at 2024-09-11T15:00:19+02:00 Review generateTckScripts method (will now migrate referential and data) then will add optional data extra script - - - - - 3f6e948d by Tony Chemit at 2024-09-11T15:11:39+02:00 Downgrade log4j version (need to understand new warnings) - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableRenderer.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveSwingValidator.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - + client/core/src/main/java/fr/ird/observe/client/util/table/renderer/DecoratorTableRenderer.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SelectValidationScope.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e61ab5b8b276e044ff50986a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e61ab5b8b276e044ff50986a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] Downgrade log4j version (need to understand new warnings)
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 4be41afb by Tony Chemit at 2024-09-11T15:16:58+02:00 Downgrade log4j version (need to understand new warnings) - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -112,6 +112,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate>  + <lib.version.log4j2>2.23.1</lib.version.log4j2> <plugin.version.site>4.0.0-M13</plugin.version.site> <lib.version.ognl>3.1.29</lib.version.ognl>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4be41afbd07192428860ba90a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4be41afbd07192428860ba90a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2594-old
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT deleted branch feature/issue-2594-old at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2907] 6 commits: Improve table column sort for enum and boolean - See #1203
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch feature/issue-2907 at ultreiaio / ird-observe Commits: 270eee57 by Tony Chemit at 2024-09-11T11:57:25+02:00 Improve table column sort for enum and boolean - See #1203 - - - - - b4945146 by Tony Chemit at 2024-09-11T11:57:25+02:00 Introduce DecoratorTableRenderer - - - - - 224a5b40 by Tony Chemit at 2024-09-11T12:06:35+02:00 Fix focus owner to number (but should review this in Focus session) - See #2902 - - - - - 1f940567 by Tony Chemit at 2024-09-11T12:06:57+02:00 Fix decorator in table for location on branchline - - - - - 90f70522 by Tony Chemit at 2024-09-11T12:06:57+02:00 New design of form - - - - - 5e6b88c9 by Tony Chemit at 2024-09-11T12:06:57+02:00 Fix focus owner to number (but should review this in Focus session) - - - - - 9 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - + client/core/src/main/java/fr/ird/observe/client/util/table/renderer/DecoratorTableRenderer.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/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.util.table; import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.client.util.table.renderer.DecoratorTableRenderer; import fr.ird.observe.dto.I18nDecoratorHelper; import io.ultreia.java4all.decoration.Decorated; import io.ultreia.java4all.decoration.Decorator; @@ -106,15 +107,7 @@ public class JXTableUtil { } public static TableCellRenderer newDecoratedRenderer(Decorator decorator) { - StringValue sv = value -> { - if (value == null) { - return null; - } - Decorated reference = (Decorated) value; - reference.registerDecorator(decorator); - return reference.decorate(); - }; - return getDefaultTableRenderer(sv, true); + return new DecoratorTableRenderer(decorator); } public static TableCellRenderer newEmptyNumberTableCellRenderer() { ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/renderer/DecoratorTableRenderer.java ===================================== @@ -0,0 +1,97 @@ +package fr.ird.observe.client.util.table.renderer; + +/*- + * #%L + * ObServe Client :: Core + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import io.ultreia.java4all.decoration.Decorated; +import io.ultreia.java4all.decoration.Decorator; +import org.jdesktop.swingx.renderer.DefaultTableRenderer; +import org.jdesktop.swingx.renderer.LabelProvider; +import org.jdesktop.swingx.renderer.StringValue; + +import javax.swing.JComponent; +import javax.swing.JTable; +import java.awt.Component; + +/** + * Created at 11/09/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + */ +public class DecoratorTableRenderer extends DefaultTableRenderer { + + public DecoratorTableRenderer(Decorator decorator) { + super(new DecoratorLabelProvider(decorator)); + } + + @Override + public DecoratorLabelProvider getComponentProvider() { + return (DecoratorLabelProvider) super.getComponentProvider(); + } + public Decorator getDecorator() { + return getComponentProvider().getStringValue().getDecorator(); + } + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + JComponent tableCellRendererComponent = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + String toolTipText = getString(value); + tableCellRendererComponent.setToolTipText(toolTipText); + return tableCellRendererComponent; + } + + public static class DecoratorStringValue implements StringValue { + + private final Decorator decorator; + + private DecoratorStringValue(Decorator decorator) { + this.decorator = decorator; + } + + @Override + public String getString(Object value) { + if (value == null) { + return null; + } + Decorated reference = (Decorated) value; + reference.registerDecorator(decorator); + return reference.decorate(); + } + + public Decorator getDecorator() { + return decorator; + } + } + + public static class DecoratorLabelProvider extends LabelProvider { + + + public DecoratorLabelProvider(Decorator decorator) { + super(new DecoratorStringValue(decorator)); + } + + @Override + public DecoratorStringValue getStringValue() { + return (DecoratorStringValue) super.getStringValue(); + } + } +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -173,6 +173,10 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe container = (Container) ui.getObjectById(DefaultUIInitializer.MAIN_TABBED_PANE); if (withSubTab) { container = (Container) ui.getObjectById(DefaultUIInitializer.SUB_TABBED_PANE); + if (!container.isShowing()) { + // stay on main tabbed pane + container = (Container) ui.getObjectById(DefaultUIInitializer.MAIN_TABBED_PANE); + } } } else { container = ui.getContentBody(); @@ -183,11 +187,19 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } public Component computeFocusOwner() { + //FIXME Review this on Focus clean session Container container = computeFocusOwnerContainer(); if (container instanceof JTabbedPane) { container = (Container) ((JTabbedPane) container).getSelectedComponent(); } - return ui.getFocusTraversalPolicy().getFirstComponent(container); + Component result = ui.getFocusTraversalPolicy().getFirstComponent(container); + if (ui.getModel().getStates().isReadingMode()) { + return result; + } + if (result instanceof JTabbedPane) { + result = ((JTabbedPane) result).getSelectedComponent(); + } + return ui.getFocusTraversalPolicy().getFirstComponent((Container) result); } public void onModeChanged(ContentMode newMode) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -45,6 +45,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectNext; import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectPrevious; import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.AutoSelectWithMoveUpAndDownShowPopupAction; +import fr.ird.observe.client.datasource.editor.api.focus.ContentZone; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; import fr.ird.observe.client.main.focus.FocusDispatcher; @@ -64,6 +65,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Container; import java.awt.Rectangle; +import java.util.Objects; import java.util.function.Function; /** @@ -376,7 +378,7 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends Contain if (focusComponent instanceof JComponent) { focusComponent = focusDispatcher.dispatchFocus((JComponent) focusComponent); } - SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); +// SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); } } @@ -385,11 +387,13 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends Contain SwingUtilities.invokeLater(() -> { if (getFocusModel() != null) { unblockFocus(); - ui.getHandler().grabFocusOnForm(); - if (finalFocusComponent != null) { - SwingUtilities.invokeLater(finalFocusComponent::requestFocusInWindow); + //FIXME Review this on Focus clean session (the blockFocus does not work!!!) + if (Objects.equals(getFocusModel().getFocusOwnerZone(), ContentZone.ZONE_NAME)) { + ui.getHandler().grabFocusOnForm(); + if (finalFocusComponent != null) { + SwingUtilities.invokeLater(finalFocusComponent::requestFocusInWindow); + } } - ; } }); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -194,7 +194,7 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont if (getColumnMeta(0).getType().equals(int.class)) { sorter.setComparator(0, Comparator.comparingInt(v -> (int) v)); } - int index=-1; + int index = -1; for (ContentTableMeta<C> meta : metas) { index++; Class<?> type = meta.getType(); @@ -205,6 +205,12 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont DecoratedSorter<?> decoratedSorter = decorator.definition().sorter(); Comparator<?> comparator = decoratedSorter.getComparator((DecoratorDefinition) decorator.definition(), decoratorService.getReferentialLocale().getLocale(), decoratorIndex); sorter.setComparator(index, comparator); + } else if (boolean.class.equals(type)) { + sorter.setComparator(index, Comparator.comparingInt(v -> (boolean) v ? 1 : 0)); + } else if (Boolean.class.equals(type)) { + sorter.setComparator(index, Comparator.nullsLast(Comparator.comparingInt(v -> (Boolean) v ? 1 : 0))); + } else if (Enum.class.isAssignableFrom(type)) { + sorter.setComparator(index, Comparator.comparing(Object::toString)); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx ===================================== @@ -120,17 +120,27 @@ <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicTab' i18nProperty=""> <Table id='editForm' fill='both' insets='1'> - <row> - <cell columns="2"> -  + <cell columns="2" rows="2"> <JPanel id='acquisitionMode'> <JRadioButton id='acquisitionModeIndividual'/> <JRadioButton id='acquisitionModeGrouped'/> </JPanel> </cell> - <cell columns="2" rows="2"> -  + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + </row> + <row> + <cell columns="2" rows="4"> <Table id="locationOnLonglinePanel"> <row> <cell anchor="west"> @@ -158,9 +168,6 @@ </row> </Table> </cell> - </row> -  - <row> <cell> <JLabel id='speciesLabel'/> </cell> @@ -168,16 +175,7 @@ <FilterableComboBox id='species' genericType='SpeciesReference'/> </cell> </row> - -  -  <row> - <cell anchor='west'> - <JLabel id='tagNumberLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='tagNumber'/> - </cell> <cell> <JLabel id='countLabel'/> </cell> @@ -185,22 +183,6 @@ <NumberEditor id='count' styleClass="int6"/> </cell> </row> - -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - <cell columns="2"> - <JPanel/> - </cell> - </row> - -  -  <row> <cell> <JLabel id='totalWeightLabel'/> @@ -208,6 +190,8 @@ <cell weightx='1' anchor='east'> <NumberEditor id='totalWeight' styleClass="float3"/> </cell> + </row> + <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> @@ -215,9 +199,6 @@ <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> - -  -  <row> <cell> <JLabel id='catchHealthStatusLabel'/> @@ -225,16 +206,7 @@ <cell weightx='1' anchor='east'> <FilterableComboBox id='catchHealthStatus' genericType='HealthStatusReference'/> </cell> - <cell> - <JLabel id='hookPositionLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='hookPosition' genericType='HookPositionReference'/> - </cell> </row> - -  -  <row> <cell> <JLabel id='catchFateLabel'/> @@ -249,24 +221,44 @@ <FilterableComboBox id='discardHealthStatus' genericType='HealthStatusReference'/> </cell> </row> - -  -  <row> + <cell> + <JLabel id='hookPositionLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='hookPosition' genericType='HookPositionReference'/> + </cell> <cell anchor="west"> <JLabel id='hookWhenDiscardedLabel'/> </cell> <cell anchor='west' fill="both"> <BooleanEditor id='hookWhenDiscarded'/> </cell> + </row> + <row> <cell anchor='west'> <JLabel id='photoReferencesLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> <NormalTextEditor id='photoReferences'/> </cell> + <cell columns="2"/> +  +  +  +  +  +  </row> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='tagNumber'/> + </cell> + </row> </Table> </tab> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss ===================================== @@ -26,7 +26,7 @@ } #mainTabbedPane { - _focusComponent:{newComponentArray(acquisitionModeIndividual,depredated,beatDiameter)}; + _focusComponent:{newComponentArray(number,depredated,beatDiameter)}; } /* ***************************************************************************** */ ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -43,7 +43,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.AbstractAction; -import javax.swing.JComponent; import javax.swing.JToolBar; import java.awt.Component; import java.awt.event.ActionEvent; @@ -74,19 +73,20 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { @Override protected Component getFocusComponentOnSelectedRow(SetCatchUI ui, boolean notPersisted, boolean newRow, CatchDto tableEditBean, CatchDto previousRowBean) { - JComponent requestFocus; - if (newRow) { - requestFocus = ui.getSpecies(); - } else { - int acquisitionMode = tableEditBean.getAcquisitionMode(); - CatchAcquisitionMode acquisitionModeEnum = CatchAcquisitionMode.valueOf(acquisitionMode); - if (acquisitionModeEnum.equals(CatchAcquisitionMode.GROUPED)) { - requestFocus = ui.getCount(); - } else { - requestFocus = ui.getCatchHealthStatus(); - } - } - return requestFocus; + //FIXME Review this on Focus clean session +// JComponent requestFocus; +// if (newRow) { +// requestFocus = ui.getNumber(); +// } else { +// int acquisitionMode = tableEditBean.getAcquisitionMode(); +// CatchAcquisitionMode acquisitionModeEnum = CatchAcquisitionMode.valueOf(acquisitionMode); +// if (acquisitionModeEnum.equals(CatchAcquisitionMode.GROUPED)) { +// requestFocus = ui.getCount(); +// } else { +// requestFocus = ui.getCatchHealthStatus(); +// } +// } + return ui.getNumber(); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; */ import fr.ird.observe.client.util.table.EditableListProperty; +import fr.ird.observe.client.util.table.renderer.DecoratorTableRenderer; import fr.ird.observe.dto.data.CatchAcquisitionMode; import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto; @@ -30,6 +31,8 @@ import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.JTable; +import javax.swing.table.TableColumnModel; import java.util.Collection; import java.util.List; @@ -79,6 +82,15 @@ public class SetCatchUITableModel extends GeneratedSetCatchUITableModel { return weightMeasuresTableModel; } + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + TableColumnModel columnModel = table.getColumnModel(); + ((DecoratorTableRenderer) columnModel.getColumn(2).getCellRenderer()).getDecorator().setIndex(1); + ((DecoratorTableRenderer) columnModel.getColumn(3).getCellRenderer()).getDecorator().setIndex(1); + ((DecoratorTableRenderer) columnModel.getColumn(4).getCellRenderer()).getDecorator().setIndex(1); + } + @Override protected void onBeforeResetRow(int row) { super.onBeforeResetRow(row); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3fe60734f0d6451421af4d5d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3fe60734f0d6451421af4d5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] 3 commits: Improve table column sort for enum and boolean - See #1203
by Tony CHEMIT (＠tchemit) 11 Sep '24

11 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 270eee57 by Tony Chemit at 2024-09-11T11:57:25+02:00 Improve table column sort for enum and boolean - See #1203 - - - - - b4945146 by Tony Chemit at 2024-09-11T11:57:25+02:00 Introduce DecoratorTableRenderer - - - - - 224a5b40 by Tony Chemit at 2024-09-11T12:06:35+02:00 Fix focus owner to number (but should review this in Focus session) - See #2902 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - + client/core/src/main/java/fr/ird/observe/client/util/table/renderer/DecoratorTableRenderer.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/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.util.table; import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.client.util.table.renderer.DecoratorTableRenderer; import fr.ird.observe.dto.I18nDecoratorHelper; import io.ultreia.java4all.decoration.Decorated; import io.ultreia.java4all.decoration.Decorator; @@ -106,15 +107,7 @@ public class JXTableUtil { } public static TableCellRenderer newDecoratedRenderer(Decorator decorator) { - StringValue sv = value -> { - if (value == null) { - return null; - } - Decorated reference = (Decorated) value; - reference.registerDecorator(decorator); - return reference.decorate(); - }; - return getDefaultTableRenderer(sv, true); + return new DecoratorTableRenderer(decorator); } public static TableCellRenderer newEmptyNumberTableCellRenderer() { ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/renderer/DecoratorTableRenderer.java ===================================== @@ -0,0 +1,97 @@ +package fr.ird.observe.client.util.table.renderer; + +/*- + * #%L + * ObServe Client :: Core + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import io.ultreia.java4all.decoration.Decorated; +import io.ultreia.java4all.decoration.Decorator; +import org.jdesktop.swingx.renderer.DefaultTableRenderer; +import org.jdesktop.swingx.renderer.LabelProvider; +import org.jdesktop.swingx.renderer.StringValue; + +import javax.swing.JComponent; +import javax.swing.JTable; +import java.awt.Component; + +/** + * Created at 11/09/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + */ +public class DecoratorTableRenderer extends DefaultTableRenderer { + + public DecoratorTableRenderer(Decorator decorator) { + super(new DecoratorLabelProvider(decorator)); + } + + @Override + public DecoratorLabelProvider getComponentProvider() { + return (DecoratorLabelProvider) super.getComponentProvider(); + } + public Decorator getDecorator() { + return getComponentProvider().getStringValue().getDecorator(); + } + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + JComponent tableCellRendererComponent = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + String toolTipText = getString(value); + tableCellRendererComponent.setToolTipText(toolTipText); + return tableCellRendererComponent; + } + + public static class DecoratorStringValue implements StringValue { + + private final Decorator decorator; + + private DecoratorStringValue(Decorator decorator) { + this.decorator = decorator; + } + + @Override + public String getString(Object value) { + if (value == null) { + return null; + } + Decorated reference = (Decorated) value; + reference.registerDecorator(decorator); + return reference.decorate(); + } + + public Decorator getDecorator() { + return decorator; + } + } + + public static class DecoratorLabelProvider extends LabelProvider { + + + public DecoratorLabelProvider(Decorator decorator) { + super(new DecoratorStringValue(decorator)); + } + + @Override + public DecoratorStringValue getStringValue() { + return (DecoratorStringValue) super.getStringValue(); + } + } +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -173,6 +173,10 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe container = (Container) ui.getObjectById(DefaultUIInitializer.MAIN_TABBED_PANE); if (withSubTab) { container = (Container) ui.getObjectById(DefaultUIInitializer.SUB_TABBED_PANE); + if (!container.isShowing()) { + // stay on main tabbed pane + container = (Container) ui.getObjectById(DefaultUIInitializer.MAIN_TABBED_PANE); + } } } else { container = ui.getContentBody(); @@ -183,11 +187,19 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } public Component computeFocusOwner() { + //FIXME Review this on Focus clean session Container container = computeFocusOwnerContainer(); if (container instanceof JTabbedPane) { container = (Container) ((JTabbedPane) container).getSelectedComponent(); } - return ui.getFocusTraversalPolicy().getFirstComponent(container); + Component result = ui.getFocusTraversalPolicy().getFirstComponent(container); + if (ui.getModel().getStates().isReadingMode()) { + return result; + } + if (result instanceof JTabbedPane) { + result = ((JTabbedPane) result).getSelectedComponent(); + } + return ui.getFocusTraversalPolicy().getFirstComponent((Container) result); } public void onModeChanged(ContentMode newMode) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -45,6 +45,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectNext; import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectPrevious; import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.AutoSelectWithMoveUpAndDownShowPopupAction; +import fr.ird.observe.client.datasource.editor.api.focus.ContentZone; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; import fr.ird.observe.client.main.focus.FocusDispatcher; @@ -64,6 +65,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Container; import java.awt.Rectangle; +import java.util.Objects; import java.util.function.Function; /** @@ -376,7 +378,7 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends Contain if (focusComponent instanceof JComponent) { focusComponent = focusDispatcher.dispatchFocus((JComponent) focusComponent); } - SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); +// SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); } } @@ -385,11 +387,13 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends Contain SwingUtilities.invokeLater(() -> { if (getFocusModel() != null) { unblockFocus(); - ui.getHandler().grabFocusOnForm(); - if (finalFocusComponent != null) { - SwingUtilities.invokeLater(finalFocusComponent::requestFocusInWindow); + //FIXME Review this on Focus clean session (the blockFocus does not work!!!) + if (Objects.equals(getFocusModel().getFocusOwnerZone(), ContentZone.ZONE_NAME)) { + ui.getHandler().grabFocusOnForm(); + if (finalFocusComponent != null) { + SwingUtilities.invokeLater(finalFocusComponent::requestFocusInWindow); + } } - ; } }); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -194,7 +194,7 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont if (getColumnMeta(0).getType().equals(int.class)) { sorter.setComparator(0, Comparator.comparingInt(v -> (int) v)); } - int index=-1; + int index = -1; for (ContentTableMeta<C> meta : metas) { index++; Class<?> type = meta.getType(); @@ -205,6 +205,12 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont DecoratedSorter<?> decoratedSorter = decorator.definition().sorter(); Comparator<?> comparator = decoratedSorter.getComparator((DecoratorDefinition) decorator.definition(), decoratorService.getReferentialLocale().getLocale(), decoratorIndex); sorter.setComparator(index, comparator); + } else if (boolean.class.equals(type)) { + sorter.setComparator(index, Comparator.comparingInt(v -> (boolean) v ? 1 : 0)); + } else if (Boolean.class.equals(type)) { + sorter.setComparator(index, Comparator.nullsLast(Comparator.comparingInt(v -> (Boolean) v ? 1 : 0))); + } else if (Enum.class.isAssignableFrom(type)) { + sorter.setComparator(index, Comparator.comparing(Object::toString)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa74e3bab779552a56cc5bac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa74e3bab779552a56cc5bac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2907] 55 commits: Add new client configuration option showSensibleCriteriaInTripBulkChanges
by Tony CHEMIT (＠tchemit) 10 Sep '24

10 Sep '24

Tony CHEMIT pushed to branch feature/issue-2907 at ultreiaio / ird-observe Commits: de95fb1f by Tony Chemit at 2024-09-05T12:26:25+02:00 Add new client configuration option showSensibleCriteriaInTripBulkChanges - - - - - b7bc8cf9 by Tony Chemit at 2024-09-05T12:26:53+02:00 use new client configuration option showSensibleCriteriaInTripBulkChanges in BulkModify ui - - - - - 1995338f by Tony Chemit at 2024-09-05T12:26:58+02:00 Merge branch 'feature/issue-2816' into develop Fonction de changement de programme en masse - Closes #2816 - - - - - eab2fdac by Tony Chemit at 2024-09-05T12:48:01+02:00 Remove ObserveSwingSession (use directly SwingSession) - - - - - efb846a1 by Tony Chemit at 2024-09-05T12:48:28+02:00 Remove ObServeSwingSessionConfig - - - - - 0c970bb0 by Tony Chemit at 2024-09-05T12:48:59+02:00 do not use any longer ObserveSwingSessionHelper in ContentUIInitializer (everything is managed now by SwingSession) - - - - - c9a055b7 by Tony Chemit at 2024-09-05T12:49:04+02:00 Merge branch 'feature/issue-2834' into develop Suppression du système de préférences d'ui codé en dure - Closes #2834 - - - - - 093c30be by Tony Chemit at 2024-09-05T13:50:20+02:00 fix license header - - - - - 79bfcae5 by Tony Chemit at 2024-09-05T13:54:44+02:00 Hide species ids option (Will be re-add in #2931) - Closes #2929 - - - - - 0749d0a9 by Tony Chemit at 2024-09-05T13:54:56+02:00 Remove FloatingObjectPresetsManager and use now only a FloatingObjectPresetsStorage - - - - - 6aadd14d by Tony Chemit at 2024-09-05T13:54:56+02:00 Use now only one client configuration option and simplify dcp-presets directory layout - - - - - 88dde538 by Tony Chemit at 2024-09-05T13:54:56+02:00 Review FloatingObjectPresetsUI (remove tabs and rename FloatingObjectPresetsTabUI to FloatingObjectPresetsEditorUI) - - - - - f518f0e1 by Tony Chemit at 2024-09-05T13:55:03+02:00 Merge branch 'feature/issue-2826' into develop Permettre le renommage, la suppression, éventuellement l'édition des présélections de FOB - Closes #2826 - - - - - 7e07db53 by Tony Chemit at 2024-09-06T13:09:19+02:00 update decorator and pom - - - - - 42d1aa35 by Tony Chemit at 2024-09-06T13:09:19+02:00 override DecoratorSorted.getComparator - - - - - 36216614 by Tony Chemit at 2024-09-06T13:09:19+02:00 use Decorator comparator in RowSorter - - - - - b4144587 by Tony Chemit at 2024-09-06T13:10:02+02:00 Merge branch 'feature/issue_1203' into develop Utilisation des décorateurs des colonnes de type décorable pour fournir l'ordre lors d'un tri d'une telle colonne - Closes #1203 - - - - - 8c7782f6 by Tony Chemit at 2024-09-06T14:05:36+02:00 Update changelog for v.9.3.7 [skip CI] - - - - - eb20c1c9 by Tony Chemit at 2024-09-09T11:59:45+02:00 Move to maintain branch for 9.3.x - - - - - 37097d0e by Tony Chemit at 2024-09-09T12:45:09+02:00 update gitflow maintain branches - - - - - 3e35ad40 by Tony Chemit at 2024-09-09T15:26:12+02:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 1cb82ec5 by Tony Chemit at 2024-09-09T15:26:19+02:00 Fix some missing i18n keys - - - - - f7a62d35 by Tony Chemit at 2024-09-10T10:33:05+02:00 use correct commons-configuration2 - - - - - 744dd33f by Tony Chemit at 2024-09-10T10:33:13+02:00 Add FIXME to resolve - - - - - 00040693 by Tony Chemit at 2024-09-10T10:33:26+02:00 Improve validation comments - - - - - ba87a51f by Tony Chemit at 2024-09-10T10:33:26+02:00 Depreciate xwork field validators - - - - - ccbb3689 by Tony Chemit at 2024-09-10T10:33:26+02:00 use new validation and jaxx validation API - - - - - 2a1e654d by Tony Chemit at 2024-09-10T10:33:26+02:00 implements new field validator using new API - - - - - a102c9db by Tony Chemit at 2024-09-10T10:33:26+02:00 rewrite validation models - - - - - e06b0174 by Tony Chemit at 2024-09-10T10:33:26+02:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - 0a710fc9 by Tony Chemit at 2024-09-10T10:33:26+02:00 Test both validation implementations in services tck - - - - - fcfd81b6 by Tony Chemit at 2024-09-10T10:33:26+02:00 update pom - - - - - 1be378b9 by Tony Chemit at 2024-09-10T10:33:26+02:00 I18n does not parse any longer xml files - - - - - 726d7919 by Tony Chemit at 2024-09-10T10:33:27+02:00 Manage extra validators in client datasource editors - - - - - ec7ced77 by Tony Chemit at 2024-09-10T10:33:27+02:00 use new validation and jaxx validation API - - - - - 292a8147 by Tony Chemit at 2024-09-10T12:14:16+02:00 add a temporary configuration option to be able to change the validation default factory name - - - - - c4cdee6a by Tony Chemit at 2024-09-10T12:22:16+02:00 Merge branch 'feature/issue-2594' into develop-9.3.x Suppression de la technologie XWorks (utilisé pour la validation) - Closes #2594 - - - - - a0946e85 by Tony Chemit at 2024-09-10T12:27:59+02:00 compositionTabValid can not be bind to tableModels since there is some validation done outside of them... and must be always true on reading mode - - - - - 701115b2 by Tony Chemit at 2024-09-10T12:28:54+02:00 Make table not sortable - - - - - 258e73bc by Tony Chemit at 2024-09-10T12:29:17+02:00 Open ContentMessageTableModel.data property - - - - - 92610da6 by Tony Chemit at 2024-09-10T12:36:45+02:00 Fix i18n key name (replace Section.template by Section.sectionTemplate) - - - - - eb37d7d8 by Tony Chemit at 2024-09-10T12:38:01+02:00 clean SetDetailCompositionUIInitializer code - - - - - 3cc564d4 by Tony Chemit at 2024-09-10T12:40:16+02:00 Improve Reset action - - - - - 7e4acdcc by Tony Chemit at 2024-09-10T12:49:33+02:00 Improve validation flow to validate less things (before we revalidate all sections each time...) - - - - - 8727ebf7 by Tony Chemit at 2024-09-10T12:50:33+02:00 Improve open form performance - - - - - 287a6f2c by Tony Chemit at 2024-09-10T12:51:03+02:00 Fix where to call validation helper - - - - - 874e6ae2 by Tony Chemit at 2024-09-10T12:51:30+02:00 Limit when use rearrangeIds method - - - - - a9aa2e9f by Tony Chemit at 2024-09-10T13:50:55+02:00 Fix validators editors mapping (but still not working to display icons on validator ui) - - - - - baff3a02 by Tony Chemit at 2024-09-10T13:52:52+02:00 Merge branch 'feature/issue-2906' into develop-9.3.x LL observations/composition détaillée : amélioration de la réactivité du formulaire en mode édition - Closes #2906 - - - - - 4baf1681 by Tony Chemit at 2024-09-10T15:01:06+02:00 Fix jaxx id - - - - - aa74e3ba by Tony Chemit at 2024-09-10T15:14:09+02:00 update pom - - - - - dd41adaf by Tony Chemit at 2024-09-10T15:14:17+02:00 Fix decorator in table for location on branchline - - - - - 0ccbf51d by Tony Chemit at 2024-09-10T18:02:49+02:00 New design of form - - - - - 17364cc7 by Tony Chemit at 2024-09-10T18:03:47+02:00 New design of form - - - - - 3fe60734 by Tony Chemit at 2024-09-10T18:04:21+02:00 Little fixes for focus (To be continued) - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml → client/configuration/src/main/dcp-presets/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml → client/configuration/src/main/dcp-presets/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml → client/configuration/src/main/dcp-presets/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml → client/configuration/src/main/dcp-presets/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml → client/configuration/src/main/dcp-presets/05-standard-fad-endOfUse-preset.yml - client/configuration/src/main/dcp-presets/ps/common/README.TXT → client/configuration/src/main/dcp-presets/README.TXT - − client/configuration/src/main/dcp-presets/ps/logbook/README.TXT - − client/configuration/src/main/dcp-presets/ps/observation/README.TXT - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - 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/ObServeSwingSessionConfig.java - − client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/461046312c23c6cd4aefc0e2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/461046312c23c6cd4aefc0e2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] 2 commits: Fix jaxx id
by Tony CHEMIT (＠tchemit) 10 Sep '24

10 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 4baf1681 by Tony Chemit at 2024-09-10T15:01:06+02:00 Fix jaxx id - - - - - aa74e3ba by Tony Chemit at 2024-09-10T15:14:09+02:00 update pom - - - - - 2 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - pom.xml Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -87,7 +87,7 @@ <BeanValidator id='basketValidator' beanClass='fr.ird.observe.dto.data.ll.observation.BasketDto' errorTableModel='{getErrorTableModel()}' context='update'> <field name='branchline' component='basketsPane'/> - <field name='floatli@ne1Length' component='basketsPane'/> + <field name='floatline1Length' component='basketsPane'/> <field name='floatline2Length' component='basketsPane'/> </BeanValidator> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.37</version> + <version>2024.38</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/baff3a0239ebe74adc304863… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/baff3a0239ebe74adc304863… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] 29 commits: Move I18nReferentialDto.isLabelTranslated method to WithI18n
by Tony CHEMIT (＠tchemit) 10 Sep '24

10 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 3e35ad40 by Tony Chemit at 2024-09-09T15:26:12+02:00 Move I18nReferentialDto.isLabelTranslated method to WithI18n - - - - - 1cb82ec5 by Tony Chemit at 2024-09-09T15:26:19+02:00 Fix some missing i18n keys - - - - - f7a62d35 by Tony Chemit at 2024-09-10T10:33:05+02:00 use correct commons-configuration2 - - - - - 744dd33f by Tony Chemit at 2024-09-10T10:33:13+02:00 Add FIXME to resolve - - - - - 00040693 by Tony Chemit at 2024-09-10T10:33:26+02:00 Improve validation comments - - - - - ba87a51f by Tony Chemit at 2024-09-10T10:33:26+02:00 Depreciate xwork field validators - - - - - ccbb3689 by Tony Chemit at 2024-09-10T10:33:26+02:00 use new validation and jaxx validation API - - - - - 2a1e654d by Tony Chemit at 2024-09-10T10:33:26+02:00 implements new field validator using new API - - - - - a102c9db by Tony Chemit at 2024-09-10T10:33:26+02:00 rewrite validation models - - - - - e06b0174 by Tony Chemit at 2024-09-10T10:33:26+02:00 Fix some validation errors discovered with the new validation implementation^^ - - - - - 0a710fc9 by Tony Chemit at 2024-09-10T10:33:26+02:00 Test both validation implementations in services tck - - - - - fcfd81b6 by Tony Chemit at 2024-09-10T10:33:26+02:00 update pom - - - - - 1be378b9 by Tony Chemit at 2024-09-10T10:33:26+02:00 I18n does not parse any longer xml files - - - - - 726d7919 by Tony Chemit at 2024-09-10T10:33:27+02:00 Manage extra validators in client datasource editors - - - - - ec7ced77 by Tony Chemit at 2024-09-10T10:33:27+02:00 use new validation and jaxx validation API - - - - - 292a8147 by Tony Chemit at 2024-09-10T12:14:16+02:00 add a temporary configuration option to be able to change the validation default factory name - - - - - c4cdee6a by Tony Chemit at 2024-09-10T12:22:16+02:00 Merge branch 'feature/issue-2594' into develop-9.3.x Suppression de la technologie XWorks (utilisé pour la validation) - Closes #2594 - - - - - a0946e85 by Tony Chemit at 2024-09-10T12:27:59+02:00 compositionTabValid can not be bind to tableModels since there is some validation done outside of them... and must be always true on reading mode - - - - - 701115b2 by Tony Chemit at 2024-09-10T12:28:54+02:00 Make table not sortable - - - - - 258e73bc by Tony Chemit at 2024-09-10T12:29:17+02:00 Open ContentMessageTableModel.data property - - - - - 92610da6 by Tony Chemit at 2024-09-10T12:36:45+02:00 Fix i18n key name (replace Section.template by Section.sectionTemplate) - - - - - eb37d7d8 by Tony Chemit at 2024-09-10T12:38:01+02:00 clean SetDetailCompositionUIInitializer code - - - - - 3cc564d4 by Tony Chemit at 2024-09-10T12:40:16+02:00 Improve Reset action - - - - - 7e4acdcc by Tony Chemit at 2024-09-10T12:49:33+02:00 Improve validation flow to validate less things (before we revalidate all sections each time...) - - - - - 8727ebf7 by Tony Chemit at 2024-09-10T12:50:33+02:00 Improve open form performance - - - - - 287a6f2c by Tony Chemit at 2024-09-10T12:51:03+02:00 Fix where to call validation helper - - - - - 874e6ae2 by Tony Chemit at 2024-09-10T12:51:30+02:00 Limit when use rearrangeIds method - - - - - a9aa2e9f by Tony Chemit at 2024-09-10T13:50:55+02:00 Fix validators editors mapping (but still not working to display icons on validator ui) - - - - - baff3a02 by Tony Chemit at 2024-09-10T13:52:52+02:00 Merge branch 'feature/issue-2906' into develop-9.3.x LL observations/composition détaillée : amélioration de la réactivité du formulaire en mode édition - Closes #2906 - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableRenderer.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveSwingValidator.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SelectValidationScope.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ps/.mvn/i18n/parse-validation-messages → client/datasource/editor/ll-validation/.mvn/i18n/parse-java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37097d0e7ee8bade2e12501f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37097d0e7ee8bade2e12501f… You're receiving this email because of your account on gitlab.com.

1 0