This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit cdc04d4c1bce94e9ccc7e24ce484415095b57006
Merge: 4610eab 77720b8
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed May 1 13:25:34 2019 +0200
Merge branch 'geoapi-3.1' excluding the use of `GridEnvelope` interface
(because not present in GeoAPI 3.0).
.../main/java/org/apache/sis/metadata/PropertyInformation.java | 3 ++-
.../java/org/apache/sis/coverage/grid/GridCoordinatesView.java | 4 ++--
.../src/main/java/org/apache/sis/coverage/grid/GridExtent.java | 10 +---------
3 files changed, 5 insertions(+), 12 deletions(-)
diff --cc
core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
index 3e68c4e,1e9dadd..92027c0
---
a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
+++
b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridCoordinatesView.java
@@@ -24,16 -26,12 +24,16 @@@ import org.apache.sis.util.ArgumentChec
* A view over the low or high grid envelope coordinates.
* This is not a general-purpose grid coordinates since it assumes a {@link
GridExtent} coordinates layout.
*
+ * <div class="note"><b>Upcoming API generalization:</b>
+ * this class may implement the {@code GridCoordinates} interface in a future
Apache SIS version.
- * This is pending <a
href="https://github.com/opengeospatial/geoapi/issues/36";>GeoAPI
update</a>.</div>
++ * This is pending GeoAPI update.</div>
+ *
* @author Martin Desruisseaux (Geomatys)
* @version 1.0
* @since 1.0
* @module
*/
- final class GridCoordinatesView /* implements GridCoordinates */ {
-final class GridCoordinatesView implements GridCoordinates {
++final class GridCoordinatesView {
/**
* A reference to the coordinate array of the enclosing grid envelope.
*/
diff --cc
core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index 0de2a04,8cbd609..8bd469b
--- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@@ -66,10 -72,6 +66,10 @@@ import org.apache.sis.util.iso.Types
* <p>{@code GridExtent} instances are immutable and thread-safe.
* The same instance can be shared by different {@link GridGeometry}
instances.</p>
*
+ * <div class="note"><b>Upcoming API generalization:</b>
+ * this class may implement the {@code GridEnvelope} interface in a future
Apache SIS version.
- * This is pending <a
href="https://github.com/opengeospatial/geoapi/issues/36";>GeoAPI
update</a>.</div>
++ * This is pending GeoAPI update.</div>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 1.0
* @since 1.0
@@@ -491,11 -531,9 +491,8 @@@ public class GridExtent implements Seri
* The sequence contains a minimum value for each dimension of the grid
coverage.
*
* @return the valid minimum grid coordinates, inclusive.
- *
- * @todo Pending resolution of <a
href="https://github.com/opengeospatial/geoapi/issues/36";>GeoAPI update</a>
- * before to become public API, in order to use the interface in
return type.
*/
- @Override
- public GridCoordinates getLow() {
+ GridCoordinatesView getLow() {
return new GridCoordinatesView(coordinates, 0);
}
@@@ -504,11 -542,9 +501,8 @@@
* The sequence contains a maximum value for each dimension of the grid
coverage.
*
* @return the valid maximum grid coordinates, <strong>inclusive</strong>.
- *
- * @todo Pending resolution of <a
href="https://github.com/opengeospatial/geoapi/issues/36";>GeoAPI update</a>
- * before to become public API, in order to use the interface in
return type.
*/
- @Override
- public GridCoordinates getHigh() {
+ GridCoordinatesView getHigh() {
return new GridCoordinatesView(coordinates, getDimension());
}
@@@ -520,9 -556,10 +514,8 @@@
* @throws IndexOutOfBoundsException if the given index is negative or is
equals or greater
* than the {@linkplain #getDimension() grid dimension}.
*
-- * @see #getLow()
* @see #getHigh(int)
*/
- @Override
public long getLow(final int index) {
ArgumentChecks.ensureValidIndex(getDimension(), index);
return coordinates[index];
@@@ -536,9 -573,10 +529,8 @@@
* @throws IndexOutOfBoundsException if the given index is negative or is
equals or greater
* than the {@linkplain #getDimension() grid dimension}.
*
-- * @see #getHigh()
* @see #getLow(int)
*/
- @Override
public long getHigh(final int index) {
final int dimension = getDimension();
ArgumentChecks.ensureValidIndex(dimension, index);
