[sis] 01/02: Propagate the dependency upgrade to NetBeans project configuration. Minor reformating for consistency with code base.

[desruisseaux]

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 515340fa0001c030fcc7218268c0419f84ddf3e9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Jan 27 14:52:09 2022 +0100

    Propagate the dependency upgrade to NetBeans project configuration.
    Minor reformating for consistency with code base.
---
 .../main/java/org/apache/sis/coverage/BandedCoverage.java    | 12 +++++-------
 .../main/java/org/apache/sis/coverage/grid/GridCoverage.java |  7 +++++--
 ide-project/NetBeans/nbproject/project.properties            |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
index 0c9d1e2..df5cec0 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/BandedCoverage.java
@@ -79,17 +79,15 @@ public abstract class BandedCoverage {
      * <ul>
      *   <li>
      *     Functional dataset: in case of a computed resource, the coverage 
could be potentially valid
-     *     in an infinite extent (repeating pattern, random numbers for tests, 
etc.).
-     *   </li>
-     *   <li>
+     *     in an infinite extent (repeating pattern, random numbers for tests, 
<i>etc.</i>).
+     *   </li><li>
      *     Computational cost: if obtaining the overall envelope is too costly,
      *     an implementation might decide to leave the result empty instead of 
returning a too approximate envelope.
      *     For example, if a coverage aggregates a lot of data (by dynamically 
choosing data in a catalog upon evaluation),
      *     it might rather not compute envelope union for the entire catalog.
-     *   </li>
-     *   <li>
-     *       hen the function does not have a clear boundary for its domain of 
validity,
-     *       for example because the sample values accuracy decreases 
progressively with distance.
+     *   </li><li>
+     *     When the function does not have a clear boundary for its domain of 
validity,
+     *     for example because the sample values accuracy decreases 
progressively with distance.
      *   </li>
      * </ul>
      *
diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index f3095de..8232a77 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@ -154,8 +154,11 @@ public abstract class GridCoverage extends BandedCoverage {
      */
     @Override
     public Optional<Envelope> getEnvelope() {
-        if (gridGeometry.isDefined(GridGeometry.ENVELOPE)) return 
Optional.of(gridGeometry.getEnvelope());
-        else return Optional.empty();
+        if (gridGeometry.isDefined(GridGeometry.ENVELOPE)) {
+            return Optional.of(gridGeometry.getEnvelope());
+        } else {
+            return Optional.empty();
+        }
     }
 
     /**
diff --git a/ide-project/NetBeans/nbproject/project.properties 
b/ide-project/NetBeans/nbproject/project.properties
index 6f24af6..0a7f666 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -124,7 +124,7 @@ junit.version        = 4.13.2
 hamcrest.version     = 1.3
 derby.version        = 10.14.2.0
 hsqldb.version       = 2.6.1
-h2.version           = 2.0.204
+h2.version           = 2.1.210
 postgresql.version   = 42.3.1
 
 #