sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/02: Remove references to Geotk in comments.
Date Fri, 21 Dec 2018 15:18:24 GMT
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 67d85bd5cd2b7fb5539bae8faf78dd29e89a727b
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Dec 20 16:43:19 2018 +0100

    Remove references to Geotk in comments.
---
 .../main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java   | 3 +--
 .../src/main/java/org/apache/sis/metadata/PropertyAccessor.java   | 8 +++-----
 .../org/apache/sis/referencing/datum/DefaultGeodeticDatum.java    | 2 +-
 .../java/org/apache/sis/referencing/factory/sql/EPSGFactory.java  | 4 ++--
 .../apache/sis/referencing/operation/AbstractSingleOperation.java | 2 +-
 .../referencing/operation/transform/SpecializableTransform1D.txt  | 6 +++---
 .../referencing/operation/transform/MathTransformTestCase.java    | 4 ++--
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
index d0e92af..d05d0d3 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/PT_FreeText.java
@@ -48,8 +48,7 @@ import org.apache.sis.util.ArraysExt;
  *
  * If there is more than one locale, the whole {@code <lan:textGroup>} block is repeated
for each
  * locale, instead than repeating {@code <lan:LocalisedCharacterString>} inside the
same group as
- * we could expect. However at unmarshalling time, both forms are accepted. See GEOTK-152
for more
- * information.
+ * we could expect. However at unmarshalling time, both forms are accepted.
  *
  * <p>The {@code <gco:CharacterString>} element is inherited from the {@link
GO_CharacterString}
  * parent class.</p>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
index e3cbd58..8314aef 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
@@ -441,11 +441,9 @@ class PropertyAccessor {
                     }
                 }
                 /*
-                 * At this point, we are ready to accept the method. Before doing so,
-                 * check if the method override an other method defined in a parent
-                 * class with a covariant return type. The JVM considers such cases
-                 * as two different methods, while from a Java developer point of
-                 * view this is the same method (GEOTK-205).
+                 * At this point, we are ready to accept the method. Before doing so, check
if the method override
+                 * an other method defined in a parent class with a covariant return type.
The JVM considers such
+                 * cases as two different methods, while from a Java developer point of view
this is the same method.
                  */
                 final Integer pi = indices.put(name, count);
                 if (pi != null) {
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index 0c05248..de4b679 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -441,7 +441,7 @@ public class DefaultGeodeticDatum extends AbstractDatum implements GeodeticDatum
             }
         }
         /*
-         * In a previous version (Geotk), we were used to search for a transformation path
through a common datum:
+         * In a previous version, we were used to search for a transformation path through
a common datum:
          *
          *     source   →   [common datum]   →   target
          *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
index a00c9b8..fb79be5 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
@@ -371,8 +371,8 @@ public class EPSGFactory extends ConcurrentAuthorityFactory<EPSGDataAccess>
impl
      * <p><b>Legal constraint:</b>
      * the EPSG dataset can not be distributed with Apache SIS at this time for licensing
reasons.
      * Users need to either install the dataset manually (for example with the help of this
method),
-     * or add on the classpath a non-Apache bundle like {@code geotk-epsg.jar}.
-     * See <a href="https://issues.apache.org/jira/browse/LEGAL-183">LEGAL-183</a>
for more information.</p>
+     * or add on the classpath to a separated bundle like {@code org.apache.sis:non-free:sis-epsg.jar}.
+     * See <a href="http://sis.apache.org/epsg.html">How to use EPSG geodetic dataset</a>
for more information.</p>
      *
      * @param  connection  connection to the database where to create the EPSG schema.
      * @throws UnavailableFactoryException if installation failed. The exception will have
a
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
index 86b3a85..7dbac4a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
@@ -375,7 +375,7 @@ class AbstractSingleOperation extends AbstractCoordinateOperation implements
Sin
          * difficult. For example Mercator1SP and Mercator2SP providers are two different
ways to describe the same
          * projection. The SQL-backed EPSG factory uses yet an other implementation.
          *
-         * NOTE: A previous Geotk implementation made this final check:
+         * NOTE: A previous implementation made this final check:
          *
          *     return nameMatches(this.method, that.method);
          *
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
index ab3d0e5..34dfd98 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
@@ -1,3 +1,3 @@
-There is no SpecializableTransform1D implementation yet because
-a more specific implementation will be needed for grid Coverage.
-It may look like the SampleDimension class in Geotk.
+There is no SpecializableTransform1D implementation yet because a
+more specific implementation is needed for Grid Coverage anyway.
+See the SampleDimension class in sis-raster module.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index 637c4f9..ed6cc93 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@ -240,8 +240,8 @@ public abstract strictfp class MathTransformTestCase extends TransformTestCase
{
          * In addition to the GeoAPI "verifyTransform" check, check also for consistency
of various variant
          * of MathTransform.transform(…) methods.  In GeoAPI, 'verifyTransform' and 'verifyConsistency'
are
          * two independent steps because not all developers may want to perform both verifications
together.
-         * But in Apache SIS, we want to verify consistency for all math transforms. A previous
Geotk version
-         * had a bug with the Google projection which was unnoticed because of lack of this
consistency check.
+         * But in Apache SIS, we want to verify consistency for all math transforms. A previous
version had
+         * a bug with the Google projection which was unnoticed because of lack of this consistency
check.
          */
         final float[] asFloats = Numerics.copyAsFloats(coordinates);
         final float[] result   = verifyConsistency(asFloats);


Mime
View raw message