This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit e0588cac363557d30ee941554a6ea291b76f4b14 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Fri Nov 24 12:42:42 2023 +0100 Minor cleaning (documentation, removal of a deprecated method). --- .../main/org/apache/sis/filter/ComparisonFilter.java | 2 +- .../sis/referencing/factory/CommonAuthorityFactory.java | 4 ++-- .../apache/sis/storage/aggregate/CoverageAggregator.java | 13 +++---------- .../main/org/apache/sis/storage/aggregate/package-info.java | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ComparisonFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ComparisonFilter.java index f3a5dbcbff..a3cf1cf7d3 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ComparisonFilter.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/ComparisonFilter.java @@ -50,7 +50,7 @@ import org.opengis.filter.BetweenComparisonOperator; /** * Comparison operators between two values. Values are converted to the same type before comparison, using a widening * conversion (for example from {@link Integer} to {@link Double}). If values cannot be compared because they cannot - * be converted to a common type, or because a value is null or NaN, then the comparison result if {@code false}. + * be converted to a common type, or because a value is null or NaN, then the comparison result is {@code false}. * A consequence of this rule is that the conditions {@literal A < B} and {@literal A ≥ B} may be false at the same time. * * <p>If one operand is a collection, all collection elements may be compared to the other value. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java index 3b0874918e..fdf4182bd9 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java @@ -687,8 +687,8 @@ public class CommonAuthorityFactory extends GeodeticAuthorityFactory implements * @return an exception initialized with an error message built from the specified information. */ private static NoSuchAuthorityCodeException noSuchAuthorityCode(String localCode, String code, Exception cause) { - return (NoSuchAuthorityCodeException) new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.NoSuchAuthorityCode_3, + return new NoSuchAuthorityCodeException(Resources.format(Resources.Keys.NoSuchAuthorityCode_3, Constants.OGC, CoordinateReferenceSystem.class, localCode), - Constants.OGC, localCode, code).initCause(cause); + Constants.OGC, localCode, code, cause); } } diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java index 36d63397e3..f2895a55ec 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java @@ -101,9 +101,10 @@ import org.apache.sis.util.collection.BackingStoreException; * and no more addition are in progress. * * @author Martin Desruisseaux (Geomatys) - * @version 1.4 + * @version 1.5 * @since 1.3 */ +@SuppressWarnings("exports") // There is no public method using `GroupBySample`. public final class CoverageAggregator extends Group<GroupBySample> { /** * The listeners of the parent resource (typically a {@link DataStore}), or {@code null} if none. @@ -327,7 +328,7 @@ public final class CoverageAggregator extends Group<GroupBySample> { * @since 1.4 */ public void addRangeAggregate(final GridCoverageResource... sources) throws DataStoreException { - addRangeAggregate(sources, (int[][]) null); + addRangeAggregate(sources, null); } /** @@ -467,12 +468,4 @@ public final class CoverageAggregator extends Group<GroupBySample> { } return result; } - - /** - * @deprecated Replaced by {@link #build(GenericName)}. - */ - @Deprecated - public Resource build() { - return build(null); - } } diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java index 6ae0ad3b18..0089c3a22c 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java @@ -22,7 +22,7 @@ * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.4 + * @version 1.5 * @since 1.3 */ package org.apache.sis.storage.aggregate;