sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1773003 - in /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis: internal/referencing/provider/ referencing/
Date Wed, 07 Dec 2016 02:23:07 GMT
Author: desruisseaux
Date: Wed Dec  7 02:23:07 2016
New Revision: 1773003

URL: http://svn.apache.org/viewvc?rev=1773003&view=rev
Log:
Renamed 'replaceIdentifiers' as 'reidentify'. According https://en.wiktionary.org/wiki/reidentify,
that word exists.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -112,8 +112,8 @@ public final class LambertConformal2SP e
                 .rename(Citations.EPSG, "Longitude of false origin")
                 .rename(Citations.NETCDF, "longitude_of_central_meridian")
                 .rename(Citations.GEOTIFF, "FalseOriginLong")
-                .replaceIdentifiers(Citations.EPSG, "8822")
-                .replaceIdentifiers(Citations.GEOTIFF, "3084"));
+                .reidentify(Citations.EPSG, "8822")
+                .reidentify(Citations.GEOTIFF, "3084"));
         /*
          * EPSG:    Latitude of 1st standard parallel
          * OGC:     standard_parallel_1

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -69,12 +69,12 @@ public final class Mercator1SP extends A
     static {
         final ParameterBuilder builder = builder();
         LATITUDE_OF_ORIGIN = createZeroConstant(builder.addNamesAndIdentifiers(Equirectangular.LATITUDE_OF_ORIGIN)
-                .replaceIdentifiers(Citations.GEOTIFF, "3081")
+                .reidentify(Citations.GEOTIFF, "3081")
                 .rename(Citations.GEOTIFF, "NatOriginLat")
                 .setRemarks(Equirectangular.LATITUDE_OF_ORIGIN.getRemarks()));
 
         LONGITUDE_OF_ORIGIN = createLongitude(builder.addNamesAndIdentifiers(Equirectangular.LONGITUDE_OF_ORIGIN)
-                .replaceIdentifiers(Citations.GEOTIFF, "3080")
+                .reidentify(Citations.GEOTIFF, "3080")
                 .rename(Citations.GEOTIFF, "NatOriginLong"));
 
         SCALE_FACTOR = createScale(builder

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -90,8 +90,8 @@ public final class Mercator2SP extends A
          */
         SCALE_FACTOR = createScale(builder
                 .addNamesAndIdentifiers(Mercator1SP.SCALE_FACTOR)
-                .replaceIdentifiers(Citations.EPSG,    (String[]) null)
-                .replaceIdentifiers(Citations.GEOTIFF, (String[]) null)
+                .reidentify(Citations.EPSG,    (String[]) null)
+                .reidentify(Citations.GEOTIFF, (String[]) null)
                 .rename(Citations.EPSG,    (String[]) null)
                 .rename(Citations.NETCDF,  (String[]) null)  // "scale_factor_at_projection_origin"
is too specific.
                 .rename(Citations.GEOTIFF, (String[]) null)  // "ScaleAtNatOrigin" is too
specific.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -77,7 +77,7 @@ public final class PolarStereographicA e
         final ParameterBuilder builder = builder();
         LONGITUDE_OF_ORIGIN = createLongitude(builder
                 .addNamesAndIdentifiers(ObliqueStereographic.LONGITUDE_OF_ORIGIN)
-                .replaceIdentifiers(Citations.GEOTIFF, "3095")
+                .reidentify(Citations.GEOTIFF, "3095")
                 .rename(Citations.GEOTIFF, "StraightVertPoleLong"));
 
         PARAMETERS = builder

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -78,7 +78,7 @@ public final class PolarStereographicB e
         LONGITUDE_OF_ORIGIN = createLongitude(builder
                 .addNamesAndIdentifiers(PolarStereographicA.LONGITUDE_OF_ORIGIN)
                 .rename(Citations.EPSG, "Longitude of origin")
-                .replaceIdentifiers(Citations.EPSG, "8833"));
+                .reidentify(Citations.EPSG, "8833"));
 
         STANDARD_PARALLEL = createMandatoryLatitude(builder
                 .addIdentifier("8832").addName("Latitude of standard parallel")

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -78,22 +78,22 @@ public class RegionalMercator extends Ab
                 .addNamesAndIdentifiers(Mercator1SP.LATITUDE_OF_ORIGIN)
                 .rename(Citations.EPSG, "Latitude of false origin")
                 .rename(Citations.GEOTIFF, "FalseOriginLat")
-                .replaceIdentifiers(Citations.EPSG, "8821")
-                .replaceIdentifiers(Citations.GEOTIFF, "3085"), false);
+                .reidentify(Citations.EPSG, "8821")
+                .reidentify(Citations.GEOTIFF, "3085"), false);
 
         EASTING_AT_FALSE_ORIGIN = createShift(builder
                 .addNamesAndIdentifiers(FALSE_EASTING)
                 .rename(Citations.EPSG, "Easting at false origin")
                 .rename(Citations.GEOTIFF, "FalseOriginEasting")
-                .replaceIdentifiers(Citations.EPSG, "8826")
-                .replaceIdentifiers(Citations.GEOTIFF, "3086"));
+                .reidentify(Citations.EPSG, "8826")
+                .reidentify(Citations.GEOTIFF, "3086"));
 
         NORTHING_AT_FALSE_ORIGIN = createShift(builder
                 .addNamesAndIdentifiers(FALSE_NORTHING)
                 .rename(Citations.EPSG, "Northing at false origin")
                 .rename(Citations.GEOTIFF, "FalseOriginNorthing")
-                .replaceIdentifiers(Citations.EPSG, "8827")
-                .replaceIdentifiers(Citations.GEOTIFF, "3087"));
+                .reidentify(Citations.EPSG, "8827")
+                .reidentify(Citations.GEOTIFF, "3087"));
 
         PARAMETERS = builder
                 .addIdentifier(IDENTIFIER)

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1773003&r1=1773002&r2=1773003&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] Wed Dec  7 02:23:07 2016
@@ -848,7 +848,7 @@ public abstract class Builder<B extends
      *
      * @since 0.8
      */
-    public B replaceIdentifiers(final Citation authority, final String... replacements) {
+    public B reidentify(final Citation authority, final String... replacements) {
         ensureNonNull("authority", authority);
         final int length = (replacements != null) ? replacements.length : 0;
         int next = 0;



Mime
View raw message