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

[Git][ultreiaio/ird-observe][develop] 2 commits: Remove migration (no more required) - See #2821
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0c451074 by Tony Chemit at 2024-01-24T08:37:54+01:00 Remove migration (no more required) - See #2821 - - - - - 22b32e4f by Tony Chemit at 2024-01-24T08:50:21+01:00 Disable (and clear value) on country field if vessel is filled (and enable back country if vessel is not filled) - See #2821 - - - - - 9 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/TransmittingBuoyListener.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - − core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2821-common.sql Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIAdapter.java ===================================== @@ -151,8 +151,8 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec } }); states.getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> states.updateMaterials(getTable().getTreeTableModel(), (ObjectOperationReference) e.getNewValue())); - states.setFirstBuoyOwnershipListener(new DcpUIModelStates.TransmittingBuoyOwnershipListener<>(getTransmittingBuoy1(), getVessel1(), getCountry1())); - states.setSecondBuoyOwnershipListener(new DcpUIModelStates.TransmittingBuoyOwnershipListener<>(getTransmittingBuoy2(), getVessel2(), getCountry2())); + states.setFirstBuoyListener(new TransmittingBuoyListener<>(getTransmittingBuoy1(), getVessel1(), getCountry1())); + states.setSecondBuoyListener(new TransmittingBuoyListener<>(getTransmittingBuoy2(), getVessel2(), getCountry2())); } default void installExtraActions() { @@ -173,8 +173,8 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec } getValidatorBuoy1().setBean(null); getValidatorBuoy2().setBean(null); - states.removeFirstBuoyOwnershipListener(getTransmittingBuoy1()); - states.removeSecondBuoyOwnershipListener(getTransmittingBuoy2()); + states.removeFirstBuoyListener(); + states.removeSecondBuoyListener(); } default void changeTypeTransmittingBuoyOperation(ItemEvent event, DcpUIModelStates<?, ?> states) { @@ -188,10 +188,10 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec FloatingObjectAware bean = states.getBean(); if (bean.getFirstBuoy() != null) { getValidatorBuoy1().setBean(getTransmittingBuoy1()); - states.addFirstBuoyOwnershipListener(getTransmittingBuoy1()); + states.addFirstBuoyListener(); if (bean.getSecondBuoy() != null) { getValidatorBuoy2().setBean(getTransmittingBuoy2()); - states.addSecondBuoyOwnershipListener(getTransmittingBuoy2()); + states.addSecondBuoyListener(); } } states.setModified(states.isCreatingMode()); @@ -225,8 +225,8 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec if (states.isEditing()) { getValidatorBuoy1().setBean(null); getValidatorBuoy2().setBean(null); - states.removeFirstBuoyOwnershipListener(getTransmittingBuoy1()); - states.removeSecondBuoyOwnershipListener(getTransmittingBuoy2()); + states.removeFirstBuoyListener(); + states.removeSecondBuoyListener(); } String[] transmittingBuoyOperationCodes = typeOperation.getTransmittingBuoyOperationCodes(); @@ -247,7 +247,7 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec editorPanel.add(getTransmittingBuoy1EditorPanel()); if (states.isEditing()) { getValidatorBuoy1().setBean(getTransmittingBuoy1()); - states.addFirstBuoyOwnershipListener(getTransmittingBuoy1()); + states.addFirstBuoyListener(); } focusOwner = getTransmittingBuoyType1(); break; @@ -265,8 +265,8 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec if (states.isEditing()) { getValidatorBuoy1().setBean(getTransmittingBuoy1()); getValidatorBuoy2().setBean(getTransmittingBuoy2()); - states.addFirstBuoyOwnershipListener(getTransmittingBuoy1()); - states.addSecondBuoyOwnershipListener(getTransmittingBuoy2()); + states.addFirstBuoyListener(); + states.addSecondBuoyListener(); } focusOwner = getTransmittingBuoyType1(); break; ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIModelStates.java ===================================== @@ -37,8 +37,6 @@ import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetsManager; import fr.ird.observe.dto.data.ps.logbook.TransmittingBuoyDto; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.common.CountryReference; -import fr.ird.observe.dto.referential.common.VesselReference; import fr.ird.observe.dto.referential.ps.common.ObjectMaterialDto; import fr.ird.observe.dto.referential.ps.common.ObjectMaterialReference; import fr.ird.observe.dto.referential.ps.common.ObjectOperationReference; @@ -46,12 +44,9 @@ import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationReferen import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference; import io.ultreia.java4all.bean.JavaBean; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; -import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.Date; import java.util.LinkedHashMap; @@ -101,13 +96,13 @@ public interface DcpUIModelStates<D extends DataDto & FloatingObjectAware, P ext Optional<ToolkitIdModifications> consolidate(); - TransmittingBuoyOwnershipListener<?> getFirstBuoyOwnershipListener(); + TransmittingBuoyListener<?> getFirstBuoyListener(); - void setFirstBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> firstBuoyOwnershipListener); + void setFirstBuoyListener(TransmittingBuoyListener<?> firstBuoyListener); - TransmittingBuoyOwnershipListener<?> getSecondBuoyOwnershipListener(); + TransmittingBuoyListener<?> getSecondBuoyListener(); - void setSecondBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> secondBuoyOwnershipListener); + void setSecondBuoyListener(TransmittingBuoyListener<?> secondBuoyListener); default void recomputeComputedValues() { Optional<ToolkitIdModifications> result = consolidate(); @@ -323,11 +318,11 @@ public interface DcpUIModelStates<D extends DataDto & FloatingObjectAware, P ext Optional.ofNullable(bean.getFirstBuoy()).ifPresent(b -> { b.copy(ui1); - getFirstBuoyOwnershipListener().apply(); + getFirstBuoyListener().apply(); }); Optional.ofNullable(bean.getSecondBuoy()).ifPresent(b -> { b.copy(ui2); - getSecondBuoyOwnershipListener().apply(); + getSecondBuoyListener().apply(); }); getBean().setCanValidateMaterials(true); } @@ -338,78 +333,20 @@ public interface DcpUIModelStates<D extends DataDto & FloatingObjectAware, P ext boolean isCreatingMode(); - default void addFirstBuoyOwnershipListener(TransmittingBuoyAware buoy) { - TransmittingBuoyOwnershipListener<?> listener = getFirstBuoyOwnershipListener(); - buoy.removePropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); - buoy.addPropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); - listener.apply(); + default void addFirstBuoyListener() { + getFirstBuoyListener().install(); } - default void removeFirstBuoyOwnershipListener(TransmittingBuoyAware buoy) { - PropertyChangeListener listener = getFirstBuoyOwnershipListener(); - buoy.removePropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); + default void removeFirstBuoyListener() { + getFirstBuoyListener().uninstall(); } - default void addSecondBuoyOwnershipListener(TransmittingBuoyAware buoy) { - TransmittingBuoyOwnershipListener<?> listener = getSecondBuoyOwnershipListener(); - buoy.removePropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); - buoy.addPropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); - listener.apply(); + default void addSecondBuoyListener() { + getSecondBuoyListener().install(); } - default void removeSecondBuoyOwnershipListener(TransmittingBuoyAware buoy) { - PropertyChangeListener listener = getSecondBuoyOwnershipListener(); - buoy.removePropertyChangeListener(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, listener); + default void removeSecondBuoyListener() { + getSecondBuoyListener().uninstall(); } - class TransmittingBuoyOwnershipListener<T extends TransmittingBuoyAware> implements PropertyChangeListener { - - private final T buoy; - private final FilterableComboBox<VesselReference> vessel; - private final FilterableComboBox<CountryReference> country; - - public TransmittingBuoyOwnershipListener(T buoy, FilterableComboBox<VesselReference> vessel, FilterableComboBox<CountryReference> country) { - this.buoy = buoy; - this.vessel = vessel; - this.country = country; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - TransmittingBuoyOwnershipReference buoyOwnership = (TransmittingBuoyOwnershipReference) evt.getNewValue(); - apply(buoyOwnership); - } - - public void apply() { - apply(buoy.getTransmittingBuoyOwnership()); - } - - private void apply(TransmittingBuoyOwnershipReference buoyOwnership) { - boolean enableVessel = true; - boolean enableCountry = true; - if (buoyOwnership != null) { - switch (buoyOwnership.getId()) { - case ProtectedIdsPs.PS_COMMON_TRANSMITTING_BUOY_OWNERSHIP_THIS_SHIP_ID: - enableVessel = false; - enableCountry = false; - break; - case ProtectedIdsPs.PS_COMMON_TRANSMITTING_BUOY_OWNERSHIP_UNKNOWN_ID: - enableVessel = false; - break; - } - } - if (enableVessel) { - vessel.setEnabled(true); - } else { - buoy.setVessel(null); - vessel.setEnabled(false); - } - if (enableCountry) { - country.setEnabled(true); - } else { - buoy.setCountry(null); - country.setEnabled(false); - } - } - } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/TransmittingBuoyListener.java ===================================== @@ -0,0 +1,127 @@ +package fr.ird.observe.client.datasource.editor.ps.data.dcp; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * 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 fr.ird.observe.dto.ProtectedIdsPs; +import fr.ird.observe.dto.data.ps.TransmittingBuoyAware; +import fr.ird.observe.dto.data.ps.logbook.TransmittingBuoyDto; +import fr.ird.observe.dto.referential.common.CountryReference; +import fr.ird.observe.dto.referential.common.VesselReference; +import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference; +import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +/** + * Created at 24/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class TransmittingBuoyListener<T extends TransmittingBuoyAware> implements PropertyChangeListener { + + private final T buoy; + private final FilterableComboBox<VesselReference> vessel; + private final FilterableComboBox<CountryReference> country; + + /** + * Flag to avoid re-entrant code + */ + private boolean adjusting; + + public TransmittingBuoyListener(T buoy, FilterableComboBox<VesselReference> vessel, FilterableComboBox<CountryReference> country) { + this.buoy = buoy; + this.vessel = vessel; + this.country = country; + } + + public void install() { + buoy.removePropertyChangeListener(this); + buoy.addPropertyChangeListener(this); + apply(); + } + + public void uninstall() { + buoy.removePropertyChangeListener(this); + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (adjusting) { + return; + } + adjusting = true; + + try { + switch (evt.getPropertyName()) { + case TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP: + TransmittingBuoyOwnershipReference buoyOwnership = (TransmittingBuoyOwnershipReference) evt.getNewValue(); + apply(buoyOwnership, buoy.getVessel()); + break; + case TransmittingBuoyDto.PROPERTY_VESSEL: + VesselReference vessel = (VesselReference) evt.getNewValue(); + apply(buoy.getTransmittingBuoyOwnership(), vessel); + break; + + } + } finally { + adjusting = false; + } + } + + public void apply() { + apply(buoy.getTransmittingBuoyOwnership(), buoy.getVessel()); + } + + private void apply(TransmittingBuoyOwnershipReference buoyOwnership, VesselReference vesselReference) { + boolean enableVessel = true; + boolean enableCountry = true; + if (buoyOwnership != null) { + switch (buoyOwnership.getId()) { + case ProtectedIdsPs.PS_COMMON_TRANSMITTING_BUOY_OWNERSHIP_THIS_SHIP_ID: + enableVessel = false; + enableCountry = false; + break; + case ProtectedIdsPs.PS_COMMON_TRANSMITTING_BUOY_OWNERSHIP_UNKNOWN_ID: + enableVessel = false; + break; + } + } + if (enableVessel) { + vessel.setEnabled(true); + if (vesselReference != null) { + enableCountry = false; + } + } else { + buoy.setVessel(null); + vessel.setEnabled(false); + } + if (enableCountry) { + country.setEnabled(true); + } else { + buoy.setCountry(null); + country.setEnabled(false); + } + } +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx ===================================== @@ -219,18 +219,18 @@ </row> <row> <cell anchor='west'> - <JLabel id='country1Label'/> + <JLabel id='vessel1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='country1' genericType='CountryReference'/> + <FilterableComboBox id='vessel1' genericType='VesselReference'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='vessel1Label'/> + <JLabel id='country1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel1' genericType='VesselReference'/> + <FilterableComboBox id='country1' genericType='CountryReference'/> </cell> </row> <row> @@ -276,18 +276,18 @@ </row> <row> <cell anchor='west'> - <JLabel id='country2Label'/> + <JLabel id='vessel2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='country2' genericType='CountryReference'/> + <FilterableComboBox id='vessel2' genericType='VesselReference'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='vessel2Label'/> + <JLabel id='country2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel2' genericType='VesselReference'/> + <FilterableComboBox id='country2' genericType='CountryReference'/> </cell> </row> <row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ps.data.logbook; */ import fr.ird.observe.client.datasource.editor.ps.data.dcp.DcpUIModelStates; +import fr.ird.observe.client.datasource.editor.ps.data.dcp.TransmittingBuoyListener; import fr.ird.observe.consolidation.data.ps.dcp.SimplifiedObjectTypeSpecializedRules; import fr.ird.observe.consolidation.data.ps.logbook.FloatingObjectConsolidateEngine; import fr.ird.observe.consolidation.data.ps.logbook.FloatingObjectConsolidateRequest; @@ -66,8 +67,8 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS private boolean arriving; private boolean leaving; private FloatingObjectConsolidateEngine consolidateEngine; - private TransmittingBuoyOwnershipListener<?> firstBuoyOwnershipListener; - private TransmittingBuoyOwnershipListener<?> secondBuoyOwnershipListener; + private TransmittingBuoyListener<?> firstBuoyListener; + private TransmittingBuoyListener<?> secondBuoyListener; public FloatingObjectUIModelStates(GeneratedFloatingObjectUIModel model) { super(model); @@ -81,23 +82,23 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS } @Override - public TransmittingBuoyOwnershipListener<?> getFirstBuoyOwnershipListener() { - return firstBuoyOwnershipListener; + public TransmittingBuoyListener<?> getFirstBuoyListener() { + return firstBuoyListener; } @Override - public void setFirstBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> firstBuoyOwnershipListener) { - this.firstBuoyOwnershipListener = firstBuoyOwnershipListener; + public void setFirstBuoyListener(TransmittingBuoyListener<?> firstBuoyListener) { + this.firstBuoyListener = firstBuoyListener; } @Override - public TransmittingBuoyOwnershipListener<?> getSecondBuoyOwnershipListener() { - return secondBuoyOwnershipListener; + public TransmittingBuoyListener<?> getSecondBuoyListener() { + return secondBuoyListener; } @Override - public void setSecondBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> secondBuoyOwnershipListener) { - this.secondBuoyOwnershipListener = secondBuoyOwnershipListener; + public void setSecondBuoyListener(TransmittingBuoyListener<?> secondBuoyListener) { + this.secondBuoyListener = secondBuoyListener; } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx ===================================== @@ -220,18 +220,18 @@ </row> <row> <cell anchor='west'> - <JLabel id='country1Label'/> + <JLabel id='vessel1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='country1' genericType='CountryReference'/> + <FilterableComboBox id='vessel1' genericType='VesselReference'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='vessel1Label'/> + <JLabel id='country1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel1' genericType='VesselReference' beanScope="transmittingBuoy1"/> + <FilterableComboBox id='country1' genericType='CountryReference'/> </cell> </row> <row> @@ -277,18 +277,18 @@ </row> <row> <cell anchor='west'> - <JLabel id='country2Label'/> + <JLabel id='vessel2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='country2' genericType='CountryReference'/> + <FilterableComboBox id='vessel2' genericType='VesselReference'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='vessel2Label'/> + <JLabel id='country2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel2' genericType='VesselReference'/> + <FilterableComboBox id='country2' genericType='CountryReference'/> </cell> </row> <row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation; */ import fr.ird.observe.client.datasource.editor.ps.data.dcp.DcpUIModelStates; +import fr.ird.observe.client.datasource.editor.ps.data.dcp.TransmittingBuoyListener; import fr.ird.observe.consolidation.data.ps.dcp.SimplifiedObjectTypeSpecializedRules; import fr.ird.observe.consolidation.data.ps.observation.FloatingObjectConsolidateEngine; import fr.ird.observe.consolidation.data.ps.observation.FloatingObjectConsolidateRequest; @@ -70,8 +71,8 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS private boolean arriving; private boolean leaving; private FloatingObjectConsolidateEngine consolidateEngine; - private TransmittingBuoyOwnershipListener<?> firstBuoyOwnershipListener; - private TransmittingBuoyOwnershipListener<?> secondBuoyOwnershipListener; + private TransmittingBuoyListener<?> firstBuoyListener; + private TransmittingBuoyListener<?> secondBuoyListener; public FloatingObjectUIModelStates(GeneratedFloatingObjectUIModel model) { super(model); @@ -85,23 +86,23 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS } @Override - public TransmittingBuoyOwnershipListener<?> getFirstBuoyOwnershipListener() { - return firstBuoyOwnershipListener; + public TransmittingBuoyListener<?> getFirstBuoyListener() { + return firstBuoyListener; } @Override - public void setFirstBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> firstBuoyOwnershipListener) { - this.firstBuoyOwnershipListener = firstBuoyOwnershipListener; + public void setFirstBuoyListener(TransmittingBuoyListener<?> firstBuoyListener) { + this.firstBuoyListener = firstBuoyListener; } @Override - public TransmittingBuoyOwnershipListener<?> getSecondBuoyOwnershipListener() { - return secondBuoyOwnershipListener; + public TransmittingBuoyListener<?> getSecondBuoyListener() { + return secondBuoyListener; } @Override - public void setSecondBuoyOwnershipListener(TransmittingBuoyOwnershipListener<?> secondBuoyOwnershipListener) { - this.secondBuoyOwnershipListener = secondBuoyOwnershipListener; + public void setSecondBuoyListener(TransmittingBuoyListener<?> secondBuoyListener) { + this.secondBuoyListener = secondBuoyListener; } @Override ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -49,8 +49,6 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 executor.addScript("01", "issue-2044"); - // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2821 - executor.addScript("02", "issue-2821"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2821-common.sql deleted ===================================== @@ -1,23 +0,0 @@ ---- --- #%L --- ObServe Core :: Persistence :: Migration --- %% --- 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% ---- -UPDATE ps_observation.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL; -UPDATE ps_logbook.TransmittingBuoy SET country = NULL WHERE vessel IS NOT NULL; \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d872026f4cc90aeec9f61332… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d872026f4cc90aeec9f61332… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-7.x
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-5.x
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-9.0.x
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2830-old
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

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

1 0

[Git][ultreiaio/ird-observe][develop-9.4.x] 31 commits: [model] Rename Set to FishingSet
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

Tony CHEMIT pushed to branch develop-9.4.x at ultreiaio / ird-observe Commits: bed1cb6e by Tony Chemit at 2024-01-23T09:43:45+01:00 [model] Rename Set to FishingSet - - - - - 579800fe by Tony Chemit at 2024-01-23T09:43:50+01:00 [model] Update fixtures - - - - - 51ccc68a by Tony Chemit at 2024-01-23T09:43:56+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - b2f6173b by Tony Chemit at 2024-01-23T09:44:01+01:00 [core-api] Update dto - - - - - 5754e6a9 by Tony Chemit at 2024-01-23T09:44:07+01:00 [core-api] Update decorators - - - - - 938c4cd1 by Tony Chemit at 2024-01-23T09:44:10+01:00 [core-api] Update validators - - - - - ee25681e by Tony Chemit at 2024-01-23T09:44:14+01:00 [core-api] Update tree mapping - - - - - 592b42c7 by Tony Chemit at 2024-01-23T09:44:18+01:00 [core-api] Update validation - - - - - 67cc7925 by Tony Chemit at 2024-01-23T09:44:21+01:00 [core-api] Update services - - - - - 8342a02f by Tony Chemit at 2024-01-23T09:57:43+01:00 [core-persistence] Update entities - - - - - 4c63da4a by Tony Chemit at 2024-01-23T09:57:43+01:00 [core-persistence] Update decorators - - - - - 93ef3103 by Tony Chemit at 2024-01-23T10:05:05+01:00 [core-persistence] Add migration - - - - - 9a84d159 by Tony Chemit at 2024-01-23T10:05:15+01:00 [core-persistence] Update report definitions - - - - - 929d9089 by Tony Chemit at 2024-01-23T10:05:19+01:00 [core-persistence] Update consolidation conde - - - - - 021b5c35 by Tony Chemit at 2024-01-23T10:05:28+01:00 [core-persistence] Update resources - - - - - f9bac718 by Tony Chemit at 2024-01-23T10:05:32+01:00 [core-persistence] Update tests - - - - - f104545a by Tony Chemit at 2024-01-23T10:05:35+01:00 [core-services] Update i18n - - - - - eaba4002 by Tony Chemit at 2024-01-23T10:05:39+01:00 [core-services] Update TripServiceLocal - - - - - 298bd023 by Tony Chemit at 2024-01-23T10:27:48+01:00 [core-services] Update tests fixtures - - - - - 566c7835 by Tony Chemit at 2024-01-23T10:27:48+01:00 [server] Update mapping - - - - - 566fa80e by Tony Chemit at 2024-01-23T10:27:48+01:00 [server] Update public API documentation - - - - - 8eda7aeb by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] Update default swing Preferences - - - - - 93dc3712 by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] Update data source editor SPI - - - - - f5b79d1b by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] Update ps module - - - - - 3d7d6506 by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] Update ll module - - - - - 364fdd9e by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] clean DataSourceEditor.jaxx file - - - - - 72c22ccd by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] update pg scripts - - - - - 7cb4a972 by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] update i18n - - - - - 651cb26e by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] update consolidation action - - - - - 4df91270 by Tony Chemit at 2024-01-23T10:27:48+01:00 [client] update runner tests - - - - - c48405fe by Tony Chemit at 2024-01-24T07:57:07+01:00 Merge branch 'feature/issue-2829' into develop-9.4.x Renommer les entités Set en FishingSet - Closes #2829 - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.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/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/98adf7c33149badf89326682… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/98adf7c33149badf89326682… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2829
by Tony CHEMIT (＠tchemit) Jan. 24, 2024

Jan. 24, 2024

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

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2829
by Tony CHEMIT (＠tchemit) Jan. 23, 2024

Jan. 23, 2024

Tony CHEMIT pushed new branch feature/issue-2829 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2829 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.4.x] 2 commits: Move to version 9.4.0-SNAPSHOT
by Tony CHEMIT (＠tchemit) Jan. 23, 2024

Jan. 23, 2024

Tony CHEMIT pushed to branch develop-9.4.x at ultreiaio / ird-observe Commits: c8d05fb1 by Tony Chemit at 2024-01-23T09:41:11+01:00 Move to version 9.4.0-SNAPSHOT - - - - - 98adf7c3 by Tony Chemit at 2024-01-23T09:41:11+01:00 Move to persistence model 9.4 - - - - - 28 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - + core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - + core/persistence/migration/src/main/migration-v9.4.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63f83bfe1ffe79e202350084… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63f83bfe1ffe79e202350084… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch master-9.4.x
by Tony CHEMIT (＠tchemit) Jan. 23, 2024

Jan. 23, 2024

Tony CHEMIT pushed new branch master-9.4.x at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/master-9.4.x You're receiving this email because of your account on gitlab.com.

1 0