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

[Git][ultreiaio/ird-observe][develop] 2 commits: Add more SwingSession states for some widgets - Closes ultreiaio/jaxx#849
by Tony CHEMIT (＠tchemit) 31 Aug '24

31 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 631e84a7 by Tony Chemit at 2024-08-31T10:30:23+02:00 Add more SwingSession states for some widgets - Closes ultreiaio/jaxx#849 - - - - - 6e294852 by Tony Chemit at 2024-08-31T13:25:04+02:00 Update jaxx version - Closes #2928 - - - - - 7 changed files: - − client/configuration/src/main/java/fr/ird/observe/client/CoordinatesEditorState.java - − client/configuration/src/main/java/fr/ird/observe/client/FilterableComboBoxState.java - − client/configuration/src/main/java/fr/ird/observe/client/ListHeaderState.java - − client/configuration/src/main/java/fr/ird/observe/client/NauticalLengthEditorState.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - − client/configuration/src/main/java/fr/ird/observe/client/TemperatureEditorState.java - pom.xml Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/CoordinatesEditorState.java deleted ===================================== @@ -1,83 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2024 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 org.nuiton.jaxx.runtime.swing.session.State; -import org.nuiton.jaxx.widgets.gis.CoordinateFormat; -import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; - -/** - * All states to persist on a {@link CoordinatesEditor}. - * - * Created at 30/08/2024. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.3.7 - * - * FIXME Move this back to JAXX - */ -public class CoordinatesEditorState implements State { - - protected CoordinateFormat format; - - public CoordinatesEditorState() { - } - - public CoordinatesEditorState(CoordinateFormat format) { - this.format = format; - } - - public CoordinateFormat getFormat() { - return format; - } - - public void setFormat(CoordinateFormat format) { - this.format = format; - } - - protected CoordinatesEditor checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof CoordinatesEditor)) { - throw new IllegalArgumentException("invalid component"); - } - return (CoordinatesEditor) o; - } - - @Override - public State getState(Object o) { - CoordinatesEditor ui = checkComponent(o); - return new CoordinatesEditorState(ui.getModel().getFormat()); - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof CoordinatesEditorState)) { - throw new IllegalArgumentException("invalid state"); - } - CoordinatesEditor ui = checkComponent(o); - CoordinatesEditorState typedState = (CoordinatesEditorState) state; - ui.getModel().setFormat(typedState.getFormat()); - } -} ===================================== client/configuration/src/main/java/fr/ird/observe/client/FilterableComboBoxState.java deleted ===================================== @@ -1,97 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2024 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.jaxx.widgets.combobox.FilterableComboBox; -import org.nuiton.jaxx.runtime.swing.session.State; - -/** - * All states to persist on a {@link FilterableComboBox}. - * - * Created at 30/08/2024. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.3.7 - * - * FIXME Move this back to JAXX - */ -public class FilterableComboBoxState implements State { - - protected int index = 0; - - protected boolean reverseSort = false; - - public FilterableComboBoxState() { - } - - public FilterableComboBoxState(int index, boolean reverseSort) { - this.index = index; - this.reverseSort = reverseSort; - } - - public int getIndex() { - return index; - } - - public void setIndex(int index) { - this.index = index; - } - - public boolean isReverseSort() { - return reverseSort; - } - - public void setReverseSort(boolean reverseSort) { - this.reverseSort = reverseSort; - } - - protected FilterableComboBox<?> checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof FilterableComboBox)) { - throw new IllegalArgumentException("invalid component"); - } - return (FilterableComboBox<?>) o; - } - - @Override - public State getState(Object o) { - FilterableComboBox<?> combo = checkComponent(o); - return new FilterableComboBoxState(combo.getModel().getIndex(), combo.getModel().getReverseSort()); - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof FilterableComboBoxState)) { - throw new IllegalArgumentException("invalid state"); - } - FilterableComboBox<?> ui = checkComponent(o); - FilterableComboBoxState typedState = (FilterableComboBoxState) state; - ui.getModel().setIndex(typedState.getIndex()); - ui.getModel().setReverseSort(typedState.isReverseSort()); - } - - -} - ===================================== client/configuration/src/main/java/fr/ird/observe/client/ListHeaderState.java deleted ===================================== @@ -1,99 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2024 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.jaxx.widgets.list.ListHeader; -import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; -import org.nuiton.jaxx.runtime.swing.session.State; - -/** - * All states to persist on a {@link ListHeader}. - * - * Created at 30/08/2024. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.3.7 - * - * FIXME Move this back to JAXX - */ -public class ListHeaderState implements State { - - protected int index = 0; - - protected boolean reverseSort = false; - - public ListHeaderState() { - } - - public ListHeaderState(int index, boolean reverseSort) { - this.index = index; - this.reverseSort = reverseSort; - } - - public int getIndex() { - return index; - } - - public void setIndex(int index) { - this.index = index; - } - - public boolean isReverseSort() { - return reverseSort; - } - - public void setReverseSort(boolean reverseSort) { - this.reverseSort = reverseSort; - } - - protected ListHeader<?> checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof ListHeader)) { - throw new IllegalArgumentException("invalid component"); - } - return (ListHeader<?>) o; - } - - @Override - public State getState(Object o) { - ListHeader<?> combo = checkComponent(o); - return new ListHeaderState(combo.getIndex(), combo.getReverseSort()); - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof ListHeaderState)) { - throw new IllegalArgumentException("invalid state"); - } - ListHeader<?> ui = checkComponent(o); - ListHeaderState typedState = (ListHeaderState) state; - ui.setIndex(typedState.getIndex()); - ui.setReverseSort(typedState.isReverseSort()); - //FIXME Move this back to JListHeader.setIndex method - JAXXButtonGroup indexes = ui.getIndexes(); - indexes.setSelectedButton(ui.getIndex()); - } - -} ===================================== client/configuration/src/main/java/fr/ird/observe/client/NauticalLengthEditorState.java deleted ===================================== @@ -1,83 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2024 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.jaxx.widgets.length.nautical.NauticalLengthEditor; -import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat; -import org.nuiton.jaxx.runtime.swing.session.State; - -/** - * All states to persist on a {@link NauticalLengthEditor}. - * - * Created at 30/08/2024. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.3.7 - * - * FIXME Move this back to JAXX - */ -public class NauticalLengthEditorState implements State { - - protected NauticalLengthFormat format; - - public NauticalLengthEditorState() { - } - - public NauticalLengthEditorState(NauticalLengthFormat format) { - this.format = format; - } - - public NauticalLengthFormat getFormat() { - return format; - } - - public void setFormat(NauticalLengthFormat format) { - this.format = format; - } - - protected NauticalLengthEditor checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof NauticalLengthEditor)) { - throw new IllegalArgumentException("invalid component"); - } - return (NauticalLengthEditor) o; - } - - @Override - public State getState(Object o) { - NauticalLengthEditor ui = checkComponent(o); - return new NauticalLengthEditorState(ui.getModel().getFormat()); - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof NauticalLengthEditorState)) { - throw new IllegalArgumentException("invalid state"); - } - NauticalLengthEditor ui = checkComponent(o); - NauticalLengthEditorState typedState = (NauticalLengthEditorState) state; - ui.getModel().setFormat(typedState.getFormat()); - } -} ===================================== client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java ===================================== @@ -23,15 +23,20 @@ package fr.ird.observe.client; */ import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import io.ultreia.java4all.jaxx.widgets.combobox.session.FilterableComboBoxState; import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; +import io.ultreia.java4all.jaxx.widgets.length.nautical.session.NauticalLengthEditorState; import io.ultreia.java4all.jaxx.widgets.list.DoubleList; import io.ultreia.java4all.jaxx.widgets.list.ListHeader; import io.ultreia.java4all.jaxx.widgets.list.session.DoubleListState; +import io.ultreia.java4all.jaxx.widgets.list.session.ListHeaderState; import io.ultreia.java4all.util.SortedProperties; import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.runtime.swing.session.SwingSession; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; +import org.nuiton.jaxx.widgets.gis.absolute.session.CoordinatesEditorState; import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; +import org.nuiton.jaxx.widgets.temperature.session.TemperatureEditorState; import java.io.BufferedReader; import java.io.File; ===================================== client/configuration/src/main/java/fr/ird/observe/client/TemperatureEditorState.java deleted ===================================== @@ -1,83 +0,0 @@ -package fr.ird.observe.client; - -/*- - * #%L - * ObServe Client :: Configuration - * %% - * Copyright (C) 2008 - 2024 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 org.nuiton.jaxx.runtime.swing.session.State; -import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; -import org.nuiton.jaxx.widgets.temperature.TemperatureFormat; - -/** - * All states to persist on a {@link TemperatureEditor}. - * - * Created at 30/08/2024. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.3.7 - * - * FIXME Move this back to JAXX - */ -public class TemperatureEditorState implements State { - - protected TemperatureFormat format; - - public TemperatureEditorState() { - } - - public TemperatureEditorState(TemperatureFormat format) { - this.format = format; - } - - public TemperatureFormat getFormat() { - return format; - } - - public void setFormat(TemperatureFormat format) { - this.format = format; - } - - protected TemperatureEditor checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof TemperatureEditor)) { - throw new IllegalArgumentException("invalid component"); - } - return (TemperatureEditor) o; - } - - @Override - public State getState(Object o) { - TemperatureEditor ui = checkComponent(o); - return new TemperatureEditorState(ui.getModel().getFormat()); - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof TemperatureEditorState)) { - throw new IllegalArgumentException("invalid state"); - } - TemperatureEditor ui = checkComponent(o); - TemperatureEditorState typedState = (TemperatureEditorState) state; - ui.getModel().setFormat(typedState.getFormat()); - } -} ===================================== pom.xml ===================================== @@ -113,7 +113,7 @@ <buildDate>${maven.build.timestamp}</buildDate>  <plugin.version.site>4.0.0-M13</plugin.version.site> - <lib.version.java4all.jaxx>3.0.25</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0.26</lib.version.java4all.jaxx> <lib.version.java4all.validation>1.0.3</lib.version.java4all.validation> <lib.version.java4all.i18n>4.0-beta-26</lib.version.java4all.i18n> <lib.version.ognl>3.1.29</lib.version.ognl> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df95fe00ec265cd24c6ef9fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df95fe00ec265cd24c6ef9fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Make sure form is never modified on opening in updating mode - See #2928
by Tony CHEMIT (＠tchemit) 30 Aug '24

30 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 585e7e3c by Tony Chemit at 2024-08-30T13:13:46+02:00 Make sure form is never modified on opening in updating mode - See #2928 - - - - - 338b09b9 by Tony Chemit at 2024-08-30T13:13:46+02:00 Never alter modified state when changing format (this code is actually not working, but will soon...) - See #2928 - - - - - fb1673ec by Tony Chemit at 2024-08-30T13:14:02+02:00 Le changement de format des éditeurs de température ou de longueur altère l'état «modifié» du formulaire - Closes #2927 - - - - - 7e46fe94 by Tony Chemit at 2024-08-30T13:14:02+02:00 Add TemperatureEditorState state - - - - - f6dc862f by Tony Chemit at 2024-08-30T13:14:02+02:00 Add NauticalLengthEditorState state - - - - - b0b52a85 by Tony Chemit at 2024-08-30T13:14:02+02:00 Add CoordinatesEditorState state - - - - - bd320372 by Tony Chemit at 2024-08-30T13:14:02+02:00 use new states in ObserveSwingSession - - - - - df95fe00 by Tony Chemit at 2024-08-30T13:14:10+02:00 Merge branch 'feature/issue-2901' into develop Permettre à l’utilisateur de sauvegarder les unités choisies (longueur, température et coordonnées) - Closes #2901 - - - - - 8 changed files: - + client/configuration/src/main/java/fr/ird/observe/client/CoordinatesEditorState.java - + client/configuration/src/main/java/fr/ird/observe/client/NauticalLengthEditorState.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - + client/configuration/src/main/java/fr/ird/observe/client/TemperatureEditorState.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.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/open/ContentOpen.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/CoordinatesEditorState.java ===================================== @@ -0,0 +1,83 @@ +package fr.ird.observe.client; + +/*- + * #%L + * ObServe Client :: Configuration + * %% + * Copyright (C) 2008 - 2024 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 org.nuiton.jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.gis.CoordinateFormat; +import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; + +/** + * All states to persist on a {@link CoordinatesEditor}. + * + * Created at 30/08/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + * + * FIXME Move this back to JAXX + */ +public class CoordinatesEditorState implements State { + + protected CoordinateFormat format; + + public CoordinatesEditorState() { + } + + public CoordinatesEditorState(CoordinateFormat format) { + this.format = format; + } + + public CoordinateFormat getFormat() { + return format; + } + + public void setFormat(CoordinateFormat format) { + this.format = format; + } + + protected CoordinatesEditor checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof CoordinatesEditor)) { + throw new IllegalArgumentException("invalid component"); + } + return (CoordinatesEditor) o; + } + + @Override + public State getState(Object o) { + CoordinatesEditor ui = checkComponent(o); + return new CoordinatesEditorState(ui.getModel().getFormat()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof CoordinatesEditorState)) { + throw new IllegalArgumentException("invalid state"); + } + CoordinatesEditor ui = checkComponent(o); + CoordinatesEditorState typedState = (CoordinatesEditorState) state; + ui.getModel().setFormat(typedState.getFormat()); + } +} ===================================== client/configuration/src/main/java/fr/ird/observe/client/NauticalLengthEditorState.java ===================================== @@ -0,0 +1,83 @@ +package fr.ird.observe.client; + +/*- + * #%L + * ObServe Client :: Configuration + * %% + * Copyright (C) 2008 - 2024 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.jaxx.widgets.length.nautical.NauticalLengthEditor; +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat; +import org.nuiton.jaxx.runtime.swing.session.State; + +/** + * All states to persist on a {@link NauticalLengthEditor}. + * + * Created at 30/08/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + * + * FIXME Move this back to JAXX + */ +public class NauticalLengthEditorState implements State { + + protected NauticalLengthFormat format; + + public NauticalLengthEditorState() { + } + + public NauticalLengthEditorState(NauticalLengthFormat format) { + this.format = format; + } + + public NauticalLengthFormat getFormat() { + return format; + } + + public void setFormat(NauticalLengthFormat format) { + this.format = format; + } + + protected NauticalLengthEditor checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof NauticalLengthEditor)) { + throw new IllegalArgumentException("invalid component"); + } + return (NauticalLengthEditor) o; + } + + @Override + public State getState(Object o) { + NauticalLengthEditor ui = checkComponent(o); + return new NauticalLengthEditorState(ui.getModel().getFormat()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof NauticalLengthEditorState)) { + throw new IllegalArgumentException("invalid state"); + } + NauticalLengthEditor ui = checkComponent(o); + NauticalLengthEditorState typedState = (NauticalLengthEditorState) state; + ui.getModel().setFormat(typedState.getFormat()); + } +} ===================================== client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client; */ import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; import io.ultreia.java4all.jaxx.widgets.list.DoubleList; import io.ultreia.java4all.jaxx.widgets.list.ListHeader; import io.ultreia.java4all.jaxx.widgets.list.session.DoubleListState; import io.ultreia.java4all.util.SortedProperties; import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.runtime.swing.session.SwingSession; +import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; +import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; import java.io.BufferedReader; import java.io.File; @@ -54,7 +57,10 @@ public class ObserveSwingSession extends SwingSession { public ObserveSwingSession(File file, boolean autoSave, File preferencesFile) { super(file, autoSave, Map.of(FilterableComboBox.class, new FilterableComboBoxState(), DoubleList.class, new DoubleListState(), - ListHeader.class, new ListHeaderState() + ListHeader.class, new ListHeaderState(), + TemperatureEditor.class, new TemperatureEditorState(), + NauticalLengthEditor.class, new NauticalLengthEditorState(), + CoordinatesEditor.class, new CoordinatesEditorState() )); this.preferencesFile = preferencesFile; this.preferences = new SortedProperties(); ===================================== client/configuration/src/main/java/fr/ird/observe/client/TemperatureEditorState.java ===================================== @@ -0,0 +1,83 @@ +package fr.ird.observe.client; + +/*- + * #%L + * ObServe Client :: Configuration + * %% + * Copyright (C) 2008 - 2024 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 org.nuiton.jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; +import org.nuiton.jaxx.widgets.temperature.TemperatureFormat; + +/** + * All states to persist on a {@link TemperatureEditor}. + * + * Created at 30/08/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + * + * FIXME Move this back to JAXX + */ +public class TemperatureEditorState implements State { + + protected TemperatureFormat format; + + public TemperatureEditorState() { + } + + public TemperatureEditorState(TemperatureFormat format) { + this.format = format; + } + + public TemperatureFormat getFormat() { + return format; + } + + public void setFormat(TemperatureFormat format) { + this.format = format; + } + + protected TemperatureEditor checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof TemperatureEditor)) { + throw new IllegalArgumentException("invalid component"); + } + return (TemperatureEditor) o; + } + + @Override + public State getState(Object o) { + TemperatureEditor ui = checkComponent(o); + return new TemperatureEditorState(ui.getModel().getFormat()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof TemperatureEditorState)) { + throw new IllegalArgumentException("invalid state"); + } + TemperatureEditor ui = checkComponent(o); + TemperatureEditorState typedState = (TemperatureEditorState) state; + ui.getModel().setFormat(typedState.getFormat()); + } +} ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -23,13 +23,11 @@ package fr.ird.observe.client.util.init; */ import fr.ird.observe.client.datasource.validation.ContentMessageTableRenderer; -import fr.ird.observe.client.datasource.validation.ObserveSwingValidator; import fr.ird.observe.client.datasource.validation.ObserveValidatorMessageMouseListener; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditorConfig; -import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditorModel; import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat; import io.ultreia.java4all.jaxx.widgets.list.DoubleList; import io.ultreia.java4all.jaxx.widgets.list.ListHeader; @@ -197,7 +195,7 @@ public class UIInitHelper { editor.init(); } - public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton, TemperatureFormat defaultFormat) { + public static void init(JAXXObject ui, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton, TemperatureFormat defaultFormat) { NumberEditor numberEditor = editor.getEditor(); numberEditor.setShowReset(true); numberEditor.setAutoPopup(autoPopupNumberEditor); @@ -207,14 +205,9 @@ public class UIInitHelper { Objects.requireNonNull(label, "can't find label for temperature editor " + editor); editor.setConfig(new TemperatureEditorConfig(defaultFormat, label.getText(), propertyName)); editor.init(label); - editor.getModel().addPropertyChangeListener("format", e -> { - if (validator.getBean() != null) { - validator.doValidate(); - } - }); } - public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, NauticalLengthEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton,NauticalLengthFormat defaultFormat) { + public static void init(JAXXObject ui, NauticalLengthEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton, NauticalLengthFormat defaultFormat) { NumberEditor numberEditor = editor.getEditor(); numberEditor.setShowReset(true); numberEditor.setAutoPopup(autoPopupNumberEditor); @@ -224,11 +217,7 @@ public class UIInitHelper { Objects.requireNonNull(label, "can't find label for nautical length editor " + editor); editor.setConfig(new NauticalLengthEditorConfig(defaultFormat, label.getText(), propertyName)); editor.init(label); - editor.getModel().addPropertyChangeListener(NauticalLengthEditorModel.PROPERTY_FORMAT, e -> { - if (validator.getBean() != null) { - validator.doValidate(); - } - }); + } public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -257,6 +257,11 @@ public abstract class ContentUIHandler implements ObserveSe } public void onEndOpenUI() { + //FIXME We should remove this code when issue #2928 is fixed + ContentUIModelStates states = ui.getModel().getStates(); + if (!states.isReadingMode()) { + states.setModified(states.isCreatingMode()); + } } public void startEditUI() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -44,6 +44,7 @@ import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditor; +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthEditorModel; import io.ultreia.java4all.jaxx.widgets.list.DoubleList; import io.ultreia.java4all.jaxx.widgets.list.ListHeader; import org.jdesktop.swingx.JXTable; @@ -234,20 +235,41 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(TemperatureEditor editor) { initializerContext.checkFirstPass(); - ObserveSwingValidator<?> validator = null; + ObserveSwingValidator<?> validator; if (ui instanceof EditableContentUI) { validator = ((EditableContentUI<?>) ui).getValidator(); + } else { + validator = null; + } + UIInitHelper.init(ui, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton(), getClientConfig().getTemperatureFormat()); + if (validator != null) { + editor.getModel().addPropertyChangeListener("format"/*FIXME make TemperatureEditorModel.PROPERTY_FORMAT public*/, e -> onFormatChanged(validator)); } - UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton(), getClientConfig().getTemperatureFormat()); } protected void init(NauticalLengthEditor editor) { initializerContext.checkFirstPass(); - ObserveSwingValidator<?> validator = null; + ObserveSwingValidator<?> validator; if (ui instanceof EditableContentUI) { validator = ((EditableContentUI<?>) ui).getValidator(); + } else { + validator = null; + } + UIInitHelper.init(ui, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton(), getClientConfig().getNauticalLengthFormat()); + if (validator != null) { + editor.getModel().addPropertyChangeListener(NauticalLengthEditorModel.PROPERTY_FORMAT, e -> onFormatChanged(validator)); + } + } + + private void onFormatChanged(ObserveSwingValidator<?> validator) { + if (validator.getBean() != null) { + ContentUIModelStates states = ui.getModel().getStates(); + boolean modified = states.isModified(); + validator.doValidate(); + if (!modified) { + states.setModified(false); + } } - UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton(), getClientConfig().getNauticalLengthFormat()); } protected void init(JToolBar editor) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -655,10 +655,14 @@ public class ContentOpen { private synchronized void onCoordinateFormatChanged(CoordinateFormat newValue) { if (!coordinateFormatChangedIsChanging) { coordinateFormatChangedIsChanging = true; + boolean modified = ui.getModel().getStates().isModified(); try { coordinateEditors.forEach(e -> e.setFormat(newValue)); } finally { coordinateFormatChangedIsChanging = false; + if (!modified) { + ui.getModel().getStates().setModified(false); + } } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8d17f01ceffa8a653baeb1e9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8d17f01ceffa8a653baeb1e9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Add FilterableComboBoxState state
by Tony CHEMIT (＠tchemit) 30 Aug '24

30 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6a093710 by Tony Chemit at 2024-08-30T11:34:21+02:00 Add FilterableComboBoxState state - - - - - 21265de1 by Tony Chemit at 2024-08-30T11:34:28+02:00 Add ListHeaderState state - - - - - c1d72929 by Tony Chemit at 2024-08-30T11:35:12+02:00 use new states in ObserveSwingSession - - - - - 8d17f01c by Tony Chemit at 2024-08-30T11:48:45+02:00 Merge branch 'feature/issue-2834' into develop Sauvegarde des préférences utilisateur sur le classement des listes : gestion dans l'UI - Closes #2834 - - - - - 3 changed files: - + client/configuration/src/main/java/fr/ird/observe/client/FilterableComboBoxState.java - + client/configuration/src/main/java/fr/ird/observe/client/ListHeaderState.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/FilterableComboBoxState.java ===================================== @@ -0,0 +1,97 @@ +package fr.ird.observe.client; + +/*- + * #%L + * ObServe Client :: Configuration + * %% + * Copyright (C) 2008 - 2024 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.jaxx.widgets.combobox.FilterableComboBox; +import org.nuiton.jaxx.runtime.swing.session.State; + +/** + * All states to persist on a {@link FilterableComboBox}. + * + * Created at 30/08/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + * + * FIXME Move this back to JAXX + */ +public class FilterableComboBoxState implements State { + + protected int index = 0; + + protected boolean reverseSort = false; + + public FilterableComboBoxState() { + } + + public FilterableComboBoxState(int index, boolean reverseSort) { + this.index = index; + this.reverseSort = reverseSort; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public boolean isReverseSort() { + return reverseSort; + } + + public void setReverseSort(boolean reverseSort) { + this.reverseSort = reverseSort; + } + + protected FilterableComboBox<?> checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof FilterableComboBox)) { + throw new IllegalArgumentException("invalid component"); + } + return (FilterableComboBox<?>) o; + } + + @Override + public State getState(Object o) { + FilterableComboBox<?> combo = checkComponent(o); + return new FilterableComboBoxState(combo.getModel().getIndex(), combo.getModel().getReverseSort()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof FilterableComboBoxState)) { + throw new IllegalArgumentException("invalid state"); + } + FilterableComboBox<?> ui = checkComponent(o); + FilterableComboBoxState typedState = (FilterableComboBoxState) state; + ui.getModel().setIndex(typedState.getIndex()); + ui.getModel().setReverseSort(typedState.isReverseSort()); + } + + +} + ===================================== client/configuration/src/main/java/fr/ird/observe/client/ListHeaderState.java ===================================== @@ -0,0 +1,99 @@ +package fr.ird.observe.client; + +/*- + * #%L + * ObServe Client :: Configuration + * %% + * Copyright (C) 2008 - 2024 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.jaxx.widgets.list.ListHeader; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.swing.session.State; + +/** + * All states to persist on a {@link ListHeader}. + * + * Created at 30/08/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.7 + * + * FIXME Move this back to JAXX + */ +public class ListHeaderState implements State { + + protected int index = 0; + + protected boolean reverseSort = false; + + public ListHeaderState() { + } + + public ListHeaderState(int index, boolean reverseSort) { + this.index = index; + this.reverseSort = reverseSort; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public boolean isReverseSort() { + return reverseSort; + } + + public void setReverseSort(boolean reverseSort) { + this.reverseSort = reverseSort; + } + + protected ListHeader<?> checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof ListHeader)) { + throw new IllegalArgumentException("invalid component"); + } + return (ListHeader<?>) o; + } + + @Override + public State getState(Object o) { + ListHeader<?> combo = checkComponent(o); + return new ListHeaderState(combo.getIndex(), combo.getReverseSort()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof ListHeaderState)) { + throw new IllegalArgumentException("invalid state"); + } + ListHeader<?> ui = checkComponent(o); + ListHeaderState typedState = (ListHeaderState) state; + ui.setIndex(typedState.getIndex()); + ui.setReverseSort(typedState.isReverseSort()); + //FIXME Move this back to JListHeader.setIndex method + JAXXButtonGroup indexes = ui.getIndexes(); + indexes.setSelectedButton(ui.getIndex()); + } + +} ===================================== client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java ===================================== @@ -22,6 +22,10 @@ package fr.ird.observe.client; * #L% */ +import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import io.ultreia.java4all.jaxx.widgets.list.DoubleList; +import io.ultreia.java4all.jaxx.widgets.list.ListHeader; +import io.ultreia.java4all.jaxx.widgets.list.session.DoubleListState; import io.ultreia.java4all.util.SortedProperties; import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.runtime.swing.session.SwingSession; @@ -46,8 +50,12 @@ public class ObserveSwingSession extends SwingSession { private final File preferencesFile; private final Properties preferences; + public ObserveSwingSession(File file, boolean autoSave, File preferencesFile) { - super(file, autoSave); + super(file, autoSave, Map.of(FilterableComboBox.class, new FilterableComboBoxState(), + DoubleList.class, new DoubleListState(), + ListHeader.class, new ListHeaderState() + )); this.preferencesFile = preferencesFile; this.preferences = new SortedProperties(); loadPreferences(preferencesFile); @@ -68,8 +76,8 @@ public class ObserveSwingSession extends SwingSession { return preferences; } - private void loadPreferences(File preferencesFile) { - if(preferencesFile.exists()) { + private void loadPreferences(File preferencesFile) { + if (preferencesFile.exists()) { try (BufferedReader reader = Files.newBufferedReader(preferencesFile.toPath(), StandardCharsets.UTF_8)) { preferences.load(reader); } catch (IOException e) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b1408eb4a1930e47d445b203… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b1408eb4a1930e47d445b203… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Introduce WithIndex and ContainerChildWithIndexDto API
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f0d6b167 by Tony Chemit at 2024-08-29T16:05:48+02:00 Introduce WithIndex and ContainerChildWithIndexDto API - - - - - 6b65e1ec by Tony Chemit at 2024-08-29T16:05:48+02:00 use ContainerChildWithIndexDto in ObServe model - - - - - 16de6a08 by Tony Chemit at 2024-08-29T16:05:48+02:00 Be able to do actions on JXTableHeader (for the sort actions on reading form) - - - - - ebd1998a by Tony Chemit at 2024-08-29T16:05:48+02:00 Improve JXTableUtil to display index column with a specific renderer - - - - - 5688aded by Tony Chemit at 2024-08-29T16:06:54+02:00 Review ContentTableUI API to use WithIndex objects, review also move actions - - - - - 161fab9d by Tony Chemit at 2024-08-29T16:07:01+02:00 Adapt forms using WithIndex objects - - - - - b1408eb4 by Tony Chemit at 2024-08-29T16:07:54+02:00 Merge branch 'feature/issue-1203' into develop Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes - Closes #1203 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - 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/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.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/ContentTableUITableModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveAbstractAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveBottom.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveTop.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUITableModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b34346edd609c825bf687206… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b34346edd609c825bf687206… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration de la conservation du paramétrage des UI - Closes #2926
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b34346ed by Tony Chemit at 2024-08-29T16:05:04+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 2 changed files: - 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/ContentUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -88,6 +88,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit contentAdjusting = true; try { log.info(String.format("Content ui changed from: %s to %s", previousContentUI == null ? null : previousContentUI.getModel().getPrefix(), contentUI == null ? null : contentUI.getModel().getPrefix())); + swingSessionHelper.save(); if (previousContentUI != null) { log.info(String.format("[%s] Will destroy previous content ui", previousContentUI.getClass().getSimpleName())); previousContentUI.destroy(); @@ -131,7 +132,6 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit log.info(String.format("%sWill open ui", contentUI.getModel().getPrefix())); contentUI.open(); swingSessionHelper.addComponent(contentUI, true); - swingSessionHelper.save(); contentUI.onOpened(); updateContentSize(); log.info(String.format("%s opened", contentUI.getModel().getPrefix())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -149,6 +149,9 @@ public abstract class ContentUIHandler implements ObserveSe throw new IllegalStateException("Can't init twice " + this); } init = true; + // always set the class name as name of the top component, otherwise when saving via SwingSession we can not + // distinguish the UI from another one + ui.setName(ui.getClass().getName()); this.contentOpen = Objects.requireNonNull(createContentOpen(ui)); ContentUIModel model = ui.getModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b34346edd609c825bf6872065… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b34346edd609c825bf6872065… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration de la conservation du paramétrage des UI - Closes #2926
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3fcd8bd7 by Tony Chemit at 2024-08-29T16:04:13+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 2 changed files: - 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/ContentUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -88,6 +88,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit contentAdjusting = true; try { log.info(String.format("Content ui changed from: %s to %s", previousContentUI == null ? null : previousContentUI.getModel().getPrefix(), contentUI == null ? null : contentUI.getModel().getPrefix())); + swingSessionHelper.save(); if (previousContentUI != null) { log.info(String.format("[%s] Will destroy previous content ui", previousContentUI.getClass().getSimpleName())); previousContentUI.destroy(); @@ -131,7 +132,6 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit log.info(String.format("%sWill open ui", contentUI.getModel().getPrefix())); contentUI.open(); swingSessionHelper.addComponent(contentUI, true); - swingSessionHelper.save(); contentUI.onOpened(); updateContentSize(); log.info(String.format("%s opened", contentUI.getModel().getPrefix())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -149,6 +149,9 @@ public abstract class ContentUIHandler implements ObserveSe throw new IllegalStateException("Can't init twice " + this); } init = true; + // always set the class name as name of the top component, otherwise when saving via SwingSession we can not + // distinguish the UI from another one + ui.setName(ui.getClass().getName()); this.contentOpen = Objects.requireNonNull(createContentOpen(ui)); ContentUIModel model = ui.getModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e952… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e952… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Introduce WithIndex and ContainerChildWithIndexDto API
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48a90958 by Tony Chemit at 2024-08-29T15:08:53+02:00 Introduce WithIndex and ContainerChildWithIndexDto API - - - - - 39be7c5a by Tony Chemit at 2024-08-29T15:09:59+02:00 use ContainerChildWithIndexDto in ObServe model - - - - - e6b025bc by Tony Chemit at 2024-08-29T15:15:58+02:00 Be able to do actions on JXTableHeader (for the sort actions on reading form) - - - - - fed04bbf by Tony Chemit at 2024-08-29T15:16:35+02:00 Improve JXTableUtil to display index column with a specific renderer - - - - - fcff9d3e by Tony Chemit at 2024-08-29T15:18:12+02:00 Review ContentTableUI API to use WithIndex objects, review also move actions - - - - - f9aa51b5 by Tony Chemit at 2024-08-29T15:20:02+02:00 Adapt forms using WithIndex objects - - - - - de6b582a by Tony Chemit at 2024-08-29T15:33:32+02:00 Merge branch 'feature/issue-1203' into develop Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes - Closes #1203 - - - - - 3f40b543 by Tony Chemit at 2024-08-29T15:36:23+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - 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/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.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/ContentTableUITableModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveAbstractAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveBottom.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveTop.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/91cd555577fe6f886628e47b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/91cd555577fe6f886628e47b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-1203
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

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

1 0

[Git][ultreiaio/ird-observe][feature/issue-1203] 6 commits: Introduce WithIndex and ContainerChildWithIndexDto API
by Tony CHEMIT (＠tchemit) 29 Aug '24

29 Aug '24

Tony CHEMIT pushed to branch feature/issue-1203 at ultreiaio / ird-observe Commits: 48a90958 by Tony Chemit at 2024-08-29T15:08:53+02:00 Introduce WithIndex and ContainerChildWithIndexDto API - - - - - 39be7c5a by Tony Chemit at 2024-08-29T15:09:59+02:00 use ContainerChildWithIndexDto in ObServe model - - - - - e6b025bc by Tony Chemit at 2024-08-29T15:15:58+02:00 Be able to do actions on JXTableHeader (for the sort actions on reading form) - - - - - fed04bbf by Tony Chemit at 2024-08-29T15:16:35+02:00 Improve JXTableUtil to display index column with a specific renderer - - - - - fcff9d3e by Tony Chemit at 2024-08-29T15:18:12+02:00 Review ContentTableUI API to use WithIndex objects, review also move actions - - - - - f9aa51b5 by Tony Chemit at 2024-08-29T15:20:02+02:00 Adapt forms using WithIndex objects - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - 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/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.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/ContentTableUITableModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveAbstractAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveBottom.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveTop.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fd80a3fdfb0fe8383c598cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fd80a3fdfb0fe8383c598cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une...
by Tony CHEMIT (＠tchemit) 28 Aug '24

28 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 885880af by Tony Chemit at 2024-08-28T18:17:52+02:00 Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une ligne fraîchement crée dans le tableau des données d'échantillons - Closes #2925 - - - - - 91cd5555 by Tony Chemit at 2024-08-28T18:17:52+02:00 Sanitize SaveTableEntry code and when create property goes back to false - - - - - 3 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveTableEntry.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -537,12 +537,12 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont // mettre a jour la ligne C rowBean = getValueAt(editingRow); load(tableEditBean, rowBean); - fireTableRowsUpdated(editingRow, editingRow); if (create) { - // la ligne n'est plus en mode creation + // We are no more in create mode setCreate(false); } + fireTableRowsUpdated(editingRow, editingRow); // plus de modification sur le bean d'édition getValidator().setChanged(false); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveTableEntry.java ===================================== @@ -86,14 +86,11 @@ public class SaveTableEntry extends ContentTableUIActionSupport<ContentTableUI<? // as a side effect on cleaning table edit bean to save, it could now be no more valid return; } - if (contentUI.getTableModel().isCreate()) { - // save new entry - contentUI.getTableModel().updateRowFromEditBean(); + boolean create = contentUI.getTableModel().isCreate(); + contentUI.getTableModel().updateRowFromEditBean(); + if (create) { // now save action (no more add action) updateSaveAction(false); - } else { - // save existing entry - contentUI.getTableModel().updateRowFromEditBean(); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java ===================================== @@ -189,13 +189,11 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { Optional<SizeMeasureTypeReference> sizeMeasureType = Optional.empty(); Optional<WeightMeasureTypeReference> weightMeasureType = Optional.empty(); if (notPersisted) { - boolean unsetSpecies = true; + boolean unsetSpecies = false; if (newRow) { // use default mode AcquisitionMode acquisitionMode = sampleModel.getStates().getDefaultAcquisitionMode(); if (previousRowBean != null) { - //use previous row (species won't be empty) - unsetSpecies = false; // get previous species species = previousRowBean.getSpecies(); @@ -205,8 +203,14 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { sizeMeasureType = Optional.ofNullable(previousRowBean.getSizeMeasureType()); // get previous weight measure type weightMeasureType = Optional.ofNullable(previousRowBean.getWeightMeasureType()); + } else { + unsetSpecies = true; } updateAcquisitionMode0(acquisitionMode); + } else { + + sizeMeasureType = Optional.ofNullable(tableEditBean.getSizeMeasureType()); + weightMeasureType = Optional.ofNullable(tableEditBean.getWeightMeasureType()); } // get default size measure type View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c3004b6ef284d1eccef98c8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c3004b6ef284d1eccef98c8… You're receiving this email because of your account on gitlab.com.

1 0