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 db1dff71aa55200fa2b8ee19b0f03058725394a5 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Thu May 5 16:41:45 2022 +0200 Post-merge cleaning. --- .../java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java | 3 +-- .../java/org/apache/sis/internal/storage/io/HyperRectangleReader.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java index f3a12df41c..9e67346848 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java +++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java @@ -586,8 +586,7 @@ public final class ColorModelFactory { * * @param cm the color model, or {@code null}. * @param bands the bands to select. Must neither be null nor empty. - * @return the subset color model, or {@link Optional#empty() empty} if input was null, or a subset cannot be - * deduced. + * @return the subset color model, or empty if input was null or if a subset cannot be deduced. */ public static Optional<ColorModel> createSubset(final ColorModel cm, final int[] bands) { assert (bands != null) && bands.length > 0 : bands; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java index 5eb18cc774..86701a7234 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java @@ -42,7 +42,7 @@ import org.apache.sis.storage.DataStoreContentException; * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.1 + * @version 1.2 * @since 0.7 * @module */