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 031330cce06447feaf9ddace63e2906fdd180668
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Jan 19 14:53:51 2022 +0100
Adopt "colinear" as a valid spelling. While "collinear" seems more widely
used,
"colinear" is the spelling used by Java2D and is used in current SIS public
API.
---
.../main/java/org/apache/sis/internal/referencing/AxisDirections.java | 2 +-
ide-project/NetBeans/nbproject/genfiles.properties | 2 +-
ide-project/NetBeans/nbproject/project.xml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
index 2102cd0..b162bdf 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
@@ -558,7 +558,7 @@ next: for (int i=0; i <= limit; i++) {
/**
* Returns the indices of {@code cs} axes presumed covariant with {@code
subCS} axes.
- * The mapping is based on axis directions only, with collinear axes
mapped in priority.
+ * The mapping is based on axis directions only, with colinear axes mapped
in priority.
* If some axes can not be mapped using collinearity criterion, then
directions from poles
* (e.g. <cite>"South along 90°E"</cite>) are arbitrarily handled as if
they were covariant
* with East and North directions, in that order.
diff --git a/ide-project/NetBeans/nbproject/genfiles.properties
b/ide-project/NetBeans/nbproject/genfiles.properties
index 72e6bc5..fde32dd 100644
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=f92ba43e
+nbproject/build-impl.xml.data.CRC32=f706d4ab
nbproject/build-impl.xml.script.CRC32=6b1e829a
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48
diff --git a/ide-project/NetBeans/nbproject/project.xml
b/ide-project/NetBeans/nbproject/project.xml
index e45ea3e..e247d6f 100644
--- a/ide-project/NetBeans/nbproject/project.xml
+++ b/ide-project/NetBeans/nbproject/project.xml
@@ -86,6 +86,7 @@
<word>classname</word>
<word>classnames</word>
<word>classpath</word>
+ <word>colinear</word>
<word>collinearity</word>
<word>complexify</word>
<word>covariant</word>
