This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 65ad59bebef069c8bc698afe48a277b15bdba8e1 Merge: 280e84ecf9 6b9580bd91 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Oct 1 11:45:19 2025 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/console/IdentifierCommand.java | 7 +- .../sql/internal/shared/LocalDataSource.java | 2 +- .../sis/referencing/crs/AbstractDerivedCRS.java | 13 ++- .../factory/AuthorityFactoryIdentifier.java | 37 ++++++-- .../factory/IdentifiedObjectFinder.java | 2 +- .../factory/MultiAuthoritiesFactory.java | 2 +- .../referencing/factory/sql/EPSGCodeFinder.java | 6 +- .../referencing/factory/sql/EPSGDataAccess.java | 16 +++- .../report/CoordinateReferenceSystems.java | 13 +-- .../apache/sis/setup/OptionalInstallations.java | 18 ++-- .../main/org/apache/sis/gui/setup/FXFinder.java | 6 +- .../main/org/apache/sis/gui/setup/Wizard.java | 99 +++++++++++++++------- .../main/org/apache/sis/gui/setup/WizardPage.java | 4 +- .../sis/resources/embedded/EmbeddedResources.java | 6 +- .../resources/embedded/EmbeddedResourcesTest.java | 6 +- .../apache/sis/resources/embedded/Generator.java | 6 +- .../factory/sql/epsg/DataScriptUpdater.java | 3 + parent/sis.css | 6 -- 18 files changed, 164 insertions(+), 88 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index e9ae703da4,414b1f751c..1fd69b1b69 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java @@@ -251,10 -230,15 +251,15 @@@ abstract class AbstractDerivedCRS<C ext if (Semaphores.queryAndSet(Semaphores.CONVERSION_AND_CRS)) { return true; } else try { - return Utilities.deepEquals( - strict ? conversionFromBase : getConversionFromBase(), - strict ? ((AbstractDerivedCRS) object).conversionFromBase - : ((GeneralDerivedCRS) object).getConversionFromBase(), mode); + final Conversion op1, op2; + if (strict) { + op1 = conversionFromBase; + op2 = ((AbstractDerivedCRS) object).conversionFromBase; + } else { + op1 = getConversionFromBase(); - op2 = ((DerivedCRS) object).getConversionFromBase(); ++ op2 = ((GeneralDerivedCRS) object).getConversionFromBase(); + } + return Utilities.deepEquals(op1, op2, mode); } finally { Semaphores.clear(Semaphores.CONVERSION_AND_CRS); }
