sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1711933 - /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/
Date Mon, 02 Nov 2015 10:24:15 GMT
Author: desruisseaux
Date: Mon Nov  2 10:24:15 2015
New Revision: 1711933

URL: http://svn.apache.org/viewvc?rev=1711933&view=rev
Log:
Fixed code formatting inconsistencies. This commit contains mostly changes in amount of spaces - there is no significant code change.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
    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/LambertConformalBelgium.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.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/MercatorSpherical.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.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/PolarStereographicC.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.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/internal/referencing/provider/TransverseMercator.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,9 +43,9 @@ public final class CoordinateFrameRotati
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1032")
-            .addName("Coordinate Frame Rotation (geocentric domain)")
-            .createGroupWithSameParameters(PositionVector7Param.PARAMETERS);
+                .addIdentifier("1032")
+                .addName("Coordinate Frame Rotation (geocentric domain)")
+                .createGroupWithSameParameters(PositionVector7Param.PARAMETERS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,9 +43,9 @@ public final class CoordinateFrameRotati
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("9607")
-            .addName("Coordinate Frame Rotation (geog2D domain)")
-            .createGroupWithSameParameters(PositionVector7Param2D.PARAMETERS);
+                .addIdentifier("9607")
+                .addName("Coordinate Frame Rotation (geog2D domain)")
+                .createGroupWithSameParameters(PositionVector7Param2D.PARAMETERS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,9 +43,9 @@ public final class CoordinateFrameRotati
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1038")
-            .addName("Coordinate Frame Rotation (geog3D domain)")
-            .createGroupWithSameParameters(PositionVector7Param3D.PARAMETERS);
+                .addIdentifier("1038")
+                .addName("Coordinate Frame Rotation (geog3D domain)")
+                .createGroupWithSameParameters(PositionVector7Param3D.PARAMETERS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -179,19 +179,19 @@ public final class Equirectangular exten
         // Do not declare the ESRI "Equidistant_Cylindrical" projection name below,
         // for avoiding confusion with EPSG "Equidistant Cylindrical" ellipsoidal projection.
         PARAMETERS = addIdentifierAndLegacy(builder, "1029", "9823")  // 9823 uses deprecated parameter names
-            .addName(                   "Equidistant Cylindrical (Spherical)")
-            .addName(                   "Plate Carrée")  // Not formally defined by EPSG, but cited in documentation.
-            .addName(Citations.OGC,     "Equirectangular")
-            .addName(Citations.ESRI,    "Plate_Carree")
-            .addName(Citations.GEOTIFF, "CT_Equirectangular")
-            .addName(Citations.PROJ4,   "eqc")
-            .addIdentifier(Citations.GEOTIFF, "17")
-            .createGroupForMapProjection(
-                    STANDARD_PARALLEL,
-                    LATITUDE_OF_ORIGIN,     // Not formally an Equirectangular parameter.
-                    LONGITUDE_OF_ORIGIN,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addName(                   "Equidistant Cylindrical (Spherical)")
+                .addName(                   "Plate Carrée")  // Not formally defined by EPSG, but cited in documentation.
+                .addName(Citations.OGC,     "Equirectangular")
+                .addName(Citations.ESRI,    "Plate_Carree")
+                .addName(Citations.GEOTIFF, "CT_Equirectangular")
+                .addName(Citations.PROJ4,   "eqc")
+                .addIdentifier(Citations.GEOTIFF, "17")
+                .createGroupForMapProjection(
+                        STANDARD_PARALLEL,
+                        LATITUDE_OF_ORIGIN,     // Not formally an Equirectangular parameter.
+                        LONGITUDE_OF_ORIGIN,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -60,9 +60,9 @@ public final class GeocentricToGeographi
     public static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addName(Citations.OGC, NAME)
-            .createGroupForMapProjection(GeocentricAffineBetweenGeographic.DIMENSION);
-            // Not really a map projection, but we leverage the same axis parameters.
+                .addName(Citations.OGC, NAME)
+                .createGroupForMapProjection(GeocentricAffineBetweenGeographic.DIMENSION);
+                // Not really a map projection, but we leverage the same axis parameters.
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,9 +43,9 @@ public final class GeocentricTranslation
     static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1031")
-            .addName("Geocentric translations (geocentric domain)")
-            .createGroup(TX, TY, TZ);
+                .addIdentifier("1031")
+                .addName("Geocentric translations (geocentric domain)")
+                .createGroup(TX, TY, TZ);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,13 +43,13 @@ public final class GeocentricTranslation
     static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("9603")
-            .addName("Geocentric translations (geog2D domain)")
-            .createGroup(SRC_SEMI_MAJOR,
-                         SRC_SEMI_MINOR,
-                         TGT_SEMI_MAJOR,
-                         TGT_SEMI_MINOR,
-                         TX, TY, TZ);
+                .addIdentifier("9603")
+                .addName("Geocentric translations (geog2D domain)")
+                .createGroup(SRC_SEMI_MAJOR,
+                             SRC_SEMI_MINOR,
+                             TGT_SEMI_MAJOR,
+                             TGT_SEMI_MINOR,
+                             TX, TY, TZ);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -43,9 +43,9 @@ public final class GeocentricTranslation
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1035")
-            .addName("Geocentric translations (geog3D domain)")
-            .createGroupWithSameParameters(GeocentricTranslation2D.PARAMETERS);
+                .addIdentifier("1035")
+                .addName("Geocentric translations (geog3D domain)")
+                .createGroupWithSameParameters(GeocentricTranslation2D.PARAMETERS);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -69,11 +69,11 @@ public final class GeographicToGeocentri
     public static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("9602")
-            .addName("Geographic/geocentric conversions")
-            .addName(Citations.OGC, NAME)
-            .createGroupForMapProjection(GeocentricAffineBetweenGeographic.DIMENSION);
-            // Not really a map projection, but we leverage the same axis parameters.
+                .addIdentifier("9602")
+                .addName("Geographic/geocentric conversions")
+                .addName(Citations.OGC, NAME)
+                .createGroupForMapProjection(GeocentricAffineBetweenGeographic.DIMENSION);
+                // Not really a map projection, but we leverage the same axis parameters.
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -75,17 +75,17 @@ public final class LambertConformal1SP e
                 .addNamesAndIdentifiers(Mercator1SP.LATITUDE_OF_ORIGIN));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName(                    "Lambert Conic Conformal (1SP)")
-            .addName(Citations.OGC,      "Lambert_Conformal_Conic_1SP")
-            .addName(Citations.GEOTIFF,  "CT_LambertConfConic_1SP")
-            .addIdentifier(Citations.GEOTIFF, "9")
-            .createGroupForMapProjection(
-                    LATITUDE_OF_ORIGIN,
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(IDENTIFIER)
+                .addName(                    "Lambert Conic Conformal (1SP)")
+                .addName(Citations.OGC,      "Lambert_Conformal_Conic_1SP")
+                .addName(Citations.GEOTIFF,  "CT_LambertConfConic_1SP")
+                .addIdentifier(Citations.GEOTIFF, "9")
+                .createGroupForMapProjection(
+                        LATITUDE_OF_ORIGIN,
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -152,25 +152,25 @@ public final class LambertConformal2SP e
                 .setRequired(false).setDeprecated(true));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName(                    "Lambert Conic Conformal (2SP)")
-            .addName(Citations.OGC,      "Lambert_Conformal_Conic_2SP")
-            .addName(Citations.ESRI,     "Lambert_Conformal_Conic")
-            .addName(Citations.NETCDF,   "LambertConformal")
-            .addName(Citations.GEOTIFF,  "CT_LambertConfConic_2SP")
-            .addName(Citations.GEOTIFF,  "CT_LambertConfConic")
-            .addName(Citations.PROJ4,    "lcc")
-            .addIdentifier(Citations.GEOTIFF,  "8")
-            .addIdentifier(Citations.MAP_INFO, "3")
-            .addIdentifier(Citations.S57,      "6")
-            .createGroupForMapProjection(
-                    LATITUDE_OF_FALSE_ORIGIN,
-                    LONGITUDE_OF_FALSE_ORIGIN,
-                    STANDARD_PARALLEL_1,
-                    STANDARD_PARALLEL_2,
-                    scaleFactor,           // Not formally a LambertConformal2SP parameter.
-                    EASTING_AT_FALSE_ORIGIN,
-                    NORTHING_AT_FALSE_ORIGIN);
+                .addIdentifier(IDENTIFIER)
+                .addName(                    "Lambert Conic Conformal (2SP)")
+                .addName(Citations.OGC,      "Lambert_Conformal_Conic_2SP")
+                .addName(Citations.ESRI,     "Lambert_Conformal_Conic")
+                .addName(Citations.NETCDF,   "LambertConformal")
+                .addName(Citations.GEOTIFF,  "CT_LambertConfConic_2SP")
+                .addName(Citations.GEOTIFF,  "CT_LambertConfConic")
+                .addName(Citations.PROJ4,    "lcc")
+                .addIdentifier(Citations.GEOTIFF,  "8")
+                .addIdentifier(Citations.MAP_INFO, "3")
+                .addIdentifier(Citations.S57,      "6")
+                .createGroupForMapProjection(
+                        LATITUDE_OF_FALSE_ORIGIN,
+                        LONGITUDE_OF_FALSE_ORIGIN,
+                        STANDARD_PARALLEL_1,
+                        STANDARD_PARALLEL_2,
+                        scaleFactor,           // Not formally a LambertConformal2SP parameter.
+                        EASTING_AT_FALSE_ORIGIN,
+                        NORTHING_AT_FALSE_ORIGIN);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -18,7 +18,6 @@ package org.apache.sis.internal.referenc
 
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 
@@ -50,22 +49,20 @@ public final class LambertConformalBelgi
      */
     static final ParameterDescriptorGroup PARAMETERS;
     static {
-        final ParameterBuilder builder = builder();
-
-        PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName(                    "Lambert Conic Conformal (2SP Belgium)")
-            .addName(Citations.OGC,      "Lambert_Conformal_Conic_2SP_Belgium")
-            .addName(Citations.ESRI,     "Lambert_Conformal_Conic_2SP_Belgium")
-            .addIdentifier(Citations.MAP_INFO, "19")
-            .addIdentifier(Citations.S57,       "6")
-            .createGroupForMapProjection(
-                    LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
-                    LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
-                    LambertConformal2SP.STANDARD_PARALLEL_1,
-                    LambertConformal2SP.STANDARD_PARALLEL_2,
-                    LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
-                    LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN);
+        PARAMETERS = builder()
+                .addIdentifier(IDENTIFIER)
+                .addName(                    "Lambert Conic Conformal (2SP Belgium)")
+                .addName(Citations.OGC,      "Lambert_Conformal_Conic_2SP_Belgium")
+                .addName(Citations.ESRI,     "Lambert_Conformal_Conic_2SP_Belgium")
+                .addIdentifier(Citations.MAP_INFO, "19")
+                .addIdentifier(Citations.S57,       "6")
+                .createGroupForMapProjection(
+                        LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
+                        LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
+                        LambertConformal2SP.STANDARD_PARALLEL_1,
+                        LambertConformal2SP.STANDARD_PARALLEL_2,
+                        LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
+                        LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -61,16 +61,16 @@ public final class LambertConformalMichi
                 .createStrictlyPositive(Double.NaN, Unit.ONE);
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName("Lambert Conic Conformal (2SP Michigan)")
-            .createGroupForMapProjection(
-                    LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
-                    LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
-                    LambertConformal2SP.STANDARD_PARALLEL_1,
-                    LambertConformal2SP.STANDARD_PARALLEL_2,
-                    LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
-                    LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN,
-                    SCALE_FACTOR);
+                .addIdentifier(IDENTIFIER)
+                .addName("Lambert Conic Conformal (2SP Michigan)")
+                .createGroupForMapProjection(
+                        LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
+                        LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
+                        LambertConformal2SP.STANDARD_PARALLEL_1,
+                        LambertConformal2SP.STANDARD_PARALLEL_2,
+                        LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
+                        LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN,
+                        SCALE_FACTOR);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -71,14 +71,14 @@ public final class LambertConformalWest
                 .setRemarks(Messages.formatInternational(Messages.Keys.MisnamedParameter_1, "False westing")));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName("Lambert Conic Conformal (West Orientated)")
-            .createGroupForMapProjection(
-                    LambertConformal1SP.LATITUDE_OF_ORIGIN,
-                    LambertConformal1SP.LONGITUDE_OF_ORIGIN,
-                    LambertConformal1SP.SCALE_FACTOR,
-                                        FALSE_WESTING,
-                    LambertConformal1SP.FALSE_NORTHING);
+                .addIdentifier(IDENTIFIER)
+                .addName("Lambert Conic Conformal (West Orientated)")
+                .createGroupForMapProjection(
+                        LambertConformal1SP.LATITUDE_OF_ORIGIN,
+                        LambertConformal1SP.LONGITUDE_OF_ORIGIN,
+                        LambertConformal1SP.SCALE_FACTOR,
+                                            FALSE_WESTING,
+                        LambertConformal1SP.FALSE_NORTHING);
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -85,20 +85,20 @@ public final class Mercator1SP extends A
                 .addName(Citations.PROJ4,   "k"));
 
         PARAMETERS = builder
-            .addIdentifier(              "9804")                        // The ellipsoidal case
-            .addName(                    "Mercator (variant A)")        // Starting from EPSG version 7.6
-            .addName(                    "Mercator (1SP)")              // Prior to EPSG version 7.6
-            .addName(Citations.OGC,      "Mercator_1SP")
-            .addName(Citations.GEOTIFF,  "CT_Mercator")
-            .addName(Citations.PROJ4,    "merc")
-            .addIdentifier(Citations.GEOTIFF,   "7")
-            .addIdentifier(Citations.MAP_INFO, "10")    // MapInfo names this projection "Mercator".
-            .createGroupForMapProjection(
-                    LATITUDE_OF_ORIGIN,
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(              "9804")                        // The ellipsoidal case
+                .addName(                    "Mercator (variant A)")        // Starting from EPSG version 7.6
+                .addName(                    "Mercator (1SP)")              // Prior to EPSG version 7.6
+                .addName(Citations.OGC,      "Mercator_1SP")
+                .addName(Citations.GEOTIFF,  "CT_Mercator")
+                .addName(Citations.PROJ4,    "merc")
+                .addIdentifier(Citations.GEOTIFF,   "7")
+                .addIdentifier(Citations.MAP_INFO, "10")    // MapInfo names this projection "Mercator".
+                .createGroupForMapProjection(
+                        LATITUDE_OF_ORIGIN,
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -94,22 +94,22 @@ public final class Mercator2SP extends A
                 .setRemarks(remarks).setDeprecated(true));
 
         PARAMETERS = builder
-            .addIdentifier(             "9805")
-            .addName(                   "Mercator (variant B)")     // Starting from EPSG version 7.6
-            .addName(                   "Mercator (2SP)")           // Prior to EPSG version 7.6
-            .addName(Citations.OGC,     "Mercator_2SP")
-            .addName(Citations.ESRI,    "Mercator")
-            .addName(Citations.NETCDF,  "Mercator")
-            .addName(sameNameAs(Citations.PROJ4, Mercator1SP.PARAMETERS))
-            .addIdentifier(Citations.MAP_INFO, "26")    // MapInfo names this projection "Regional Mercator".
-            .addIdentifier(Citations.S57,       "8")
-            .createGroupForMapProjection(
-                    STANDARD_PARALLEL,
-                    latitudeOfOrigin,       // Not formally a Mercator2SP parameter.
-                    Mercator1SP.LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,           // Not formally a Mercator2SP parameter.
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(             "9805")
+                .addName(                   "Mercator (variant B)")     // Starting from EPSG version 7.6
+                .addName(                   "Mercator (2SP)")           // Prior to EPSG version 7.6
+                .addName(Citations.OGC,     "Mercator_2SP")
+                .addName(Citations.ESRI,    "Mercator")
+                .addName(Citations.NETCDF,  "Mercator")
+                .addName(sameNameAs(Citations.PROJ4, Mercator1SP.PARAMETERS))
+                .addIdentifier(Citations.MAP_INFO, "26")    // MapInfo names this projection "Regional Mercator".
+                .addIdentifier(Citations.S57,       "8")
+                .createGroupForMapProjection(
+                        STANDARD_PARALLEL,
+                        latitudeOfOrigin,       // Not formally a Mercator2SP parameter.
+                        Mercator1SP.LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,           // Not formally a Mercator2SP parameter.
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -65,13 +65,13 @@ public final class MercatorSpherical ext
                 .setRequired(false));
 
         PARAMETERS = addNameAndLegacy(addIdentifierAndLegacy(builder, IDENTIFIER, "9841"),
-            "Mercator (Spherical)", "Mercator (1SP) (Spherical)")   // "Mercator (Spherical)" starting from EPSG version 7.6
-            .createGroupForMapProjection(
-                    Mercator1SP.LATITUDE_OF_ORIGIN,
-                    Mercator1SP.LONGITUDE_OF_ORIGIN,
-                    scaleFactor,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                "Mercator (Spherical)", "Mercator (1SP) (Spherical)")   // "Mercator (Spherical)" starting from EPSG version 7.6
+                .createGroupForMapProjection(
+                        Mercator1SP.LATITUDE_OF_ORIGIN,
+                        Mercator1SP.LONGITUDE_OF_ORIGIN,
+                        scaleFactor,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -19,7 +19,6 @@ package org.apache.sis.internal.referenc
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.apache.sis.internal.util.Constants;
-import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 
@@ -64,14 +63,13 @@ public final class MillerCylindrical ext
      */
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
-        final ParameterBuilder builder = builder().setCodeSpace(Citations.OGC, Constants.OGC);
-        PARAMETERS = builder
-            .addName      ("Miller_Cylindrical")
-            .addName      (Citations.GEOTIFF,  "CT_MillerCylindrical")
-            .addIdentifier(Citations.GEOTIFF,  "20")
-            .addName      (Citations.PROJ4,    "mill")
-            .addIdentifier(Citations.MAP_INFO, "11")
-            .createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
+        PARAMETERS = builder().setCodeSpace(Citations.OGC, Constants.OGC)
+                .addName      ("Miller_Cylindrical")
+                .addName      (Citations.GEOTIFF,  "CT_MillerCylindrical")
+                .addIdentifier(Citations.GEOTIFF,  "20")
+                .addName      (Citations.PROJ4,    "mill")
+                .addIdentifier(Citations.MAP_INFO, "11")
+                .createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -21,7 +21,6 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.ParameterNotFoundException;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
@@ -61,25 +60,24 @@ public final class ObliqueStereographic
      */
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
-        final ParameterBuilder builder = builder();
-        PARAMETERS = builder
-            .addIdentifier(             "9809")
-            .addName(                   "Oblique Stereographic")
-            .addName(Citations.OGC,     "Oblique_Stereographic")
-            .addName(Citations.ESRI,    "Double_Stereographic")
-            .addName(Citations.GEOTIFF, "CT_ObliqueStereographic")
-            .addName(Citations.S57,     "Oblique stereographic")
-            .addName(Citations.S57,     "OST")
-            .addName(Citations.PROJ4,   "sterea")
-            .addName(                   "Roussilhe")
-            .addIdentifier(Citations.GEOTIFF, "16")
-            .addIdentifier(Citations.S57,     "14")
-            .createGroupForMapProjection(
-                    LATITUDE_OF_ORIGIN,
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+        PARAMETERS = builder()
+                .addIdentifier(             "9809")
+                .addName(                   "Oblique Stereographic")
+                .addName(Citations.OGC,     "Oblique_Stereographic")
+                .addName(Citations.ESRI,    "Double_Stereographic")
+                .addName(Citations.GEOTIFF, "CT_ObliqueStereographic")
+                .addName(Citations.S57,     "Oblique stereographic")
+                .addName(Citations.S57,     "OST")
+                .addName(Citations.PROJ4,   "sterea")
+                .addName(                   "Roussilhe")
+                .addIdentifier(Citations.GEOTIFF, "16")
+                .addIdentifier(Citations.S57,     "14")
+                .createGroupForMapProjection(
+                        LATITUDE_OF_ORIGIN,
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -74,18 +74,18 @@ public final class PolarStereographicA e
                 .rename(Citations.GEOTIFF, "StraightVertPoleLong"));
 
         PARAMETERS = builder
-            .addIdentifier(             IDENTIFIER)
-            .addName(                   NAME)
-            .addName(Citations.OGC,     "Polar_Stereographic")
-            .addName(Citations.GEOTIFF, "CT_PolarStereographic")
-            .addName(Citations.PROJ4,   "stere")
-            .addIdentifier(Citations.GEOTIFF, "15")
-            .createGroupForMapProjection(
-                    LATITUDE_OF_ORIGIN,     // Can be only ±90°
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(             IDENTIFIER)
+                .addName(                   NAME)
+                .addName(Citations.OGC,     "Polar_Stereographic")
+                .addName(Citations.GEOTIFF, "CT_PolarStereographic")
+                .addName(Citations.PROJ4,   "stere")
+                .addIdentifier(Citations.GEOTIFF, "15")
+                .createGroupForMapProjection(
+                        LATITUDE_OF_ORIGIN,     // Can be only ±90°
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -90,17 +90,17 @@ public final class PolarStereographicB e
                 .setRemarks(notFormalParameter("Polar Stereographic (variant A)")).setDeprecated(true));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName("Polar Stereographic (variant B)")
-            .addName(Citations.S57,  "Polar stereographic")
-            .addName(Citations.S57,  "PST")
-            .addIdentifier(Citations.S57, "11")
-            .createGroupForMapProjection(
-                    STANDARD_PARALLEL,
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,       // Not formally a parameter of this projection.
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(IDENTIFIER)
+                .addName("Polar Stereographic (variant B)")
+                .addName(Citations.S57,  "Polar stereographic")
+                .addName(Citations.S57,  "PST")
+                .addIdentifier(Citations.S57, "11")
+                .createGroupForMapProjection(
+                        STANDARD_PARALLEL,
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,       // Not formally a parameter of this projection.
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -60,14 +60,14 @@ public final class PolarStereographicC e
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier(IDENTIFIER)
-            .addName("Polar Stereographic (variant C)")
-            .createGroupForMapProjection(
-                    PolarStereographicB.STANDARD_PARALLEL,
-                    PolarStereographicB.LONGITUDE_OF_ORIGIN,
-                    PolarStereographicB.SCALE_FACTOR,       // Not formally a parameter of this projection.
-                    EASTING_AT_FALSE_ORIGIN,
-                    NORTHING_AT_FALSE_ORIGIN);
+                .addIdentifier(IDENTIFIER)
+                .addName("Polar Stereographic (variant C)")
+                .createGroupForMapProjection(
+                        PolarStereographicB.STANDARD_PARALLEL,
+                        PolarStereographicB.LONGITUDE_OF_ORIGIN,
+                        PolarStereographicB.SCALE_FACTOR,       // Not formally a parameter of this projection.
+                        EASTING_AT_FALSE_ORIGIN,
+                        NORTHING_AT_FALSE_ORIGIN);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -59,8 +59,8 @@ public final class PolarStereographicNor
                        0, Latitude.MAX_VALUE, Latitude.MAX_VALUE, NonSI.DEGREE_ANGLE);
 
         PARAMETERS = builder
-            .addName(Citations.ESRI, "Stereographic_North_Pole")
-            .createGroupForMapProjection(parameters);
+                .addName(Citations.ESRI, "Stereographic_North_Pole")
+                .createGroupForMapProjection(parameters);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -79,8 +79,8 @@ public final class PolarStereographicSou
         };
 
         PARAMETERS = builder
-            .addName(Citations.ESRI, "Stereographic_South_Pole")
-            .createGroupForMapProjection(parameters);
+                .addName(Citations.ESRI, "Stereographic_South_Pole")
+                .createGroupForMapProjection(parameters);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -41,10 +41,10 @@ public final class PositionVector7Param
     static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1033")
-            .addName("Position Vector transformation (geocentric domain)")
-            .addName("Helmert transformation")
-            .createGroup(TX, TY, TZ, RX, RY, RZ, DS);
+                .addIdentifier("1033")
+                .addName("Position Vector transformation (geocentric domain)")
+                .addName("Helmert transformation")
+                .createGroup(TX, TY, TZ, RX, RY, RZ, DS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -41,13 +41,13 @@ public final class PositionVector7Param2
     static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("9606")
-            .addName("Position Vector transformation (geog2D domain)")
-            .createGroup(SRC_SEMI_MAJOR,
-                         SRC_SEMI_MINOR,
-                         TGT_SEMI_MAJOR,
-                         TGT_SEMI_MINOR,
-                         TX, TY, TZ, RX, RY, RZ, DS);
+                .addIdentifier("9606")
+                .addName("Position Vector transformation (geog2D domain)")
+                .createGroup(SRC_SEMI_MAJOR,
+                             SRC_SEMI_MINOR,
+                             TGT_SEMI_MAJOR,
+                             TGT_SEMI_MINOR,
+                             TX, TY, TZ, RX, RY, RZ, DS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -41,9 +41,9 @@ public final class PositionVector7Param3
     static final ParameterDescriptorGroup PARAMETERS;
     static {
         PARAMETERS = builder()
-            .addIdentifier("1037")
-            .addName("Position Vector transformation (geog3D domain)")
-            .createGroupWithSameParameters(PositionVector7Param2D.PARAMETERS);
+                .addIdentifier("1037")
+                .addName("Position Vector transformation (geog3D domain)")
+                .createGroupWithSameParameters(PositionVector7Param2D.PARAMETERS);
         /*
          * NOTE: we omit the "Bursa-Wolf" alias because it is ambiguous, since it can apply
          * to both "Coordinate Frame Rotation" and "Position Vector 7-param. transformation"

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -18,7 +18,6 @@ package org.apache.sis.internal.referenc
 
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.parameter.ParameterBuilder;
 
 
 /**
@@ -48,11 +47,10 @@ public final class PseudoMercator extend
      */
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
-        final ParameterBuilder builder = builder();
-        PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName("Popular Visualisation Pseudo Mercator")
-            .createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
+        PARAMETERS = builder()
+                .addIdentifier(IDENTIFIER)
+                .addName("Popular Visualisation Pseudo Mercator")
+                .createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
     }
 
     /**

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=1711933&r1=1711932&r2=1711933&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] Mon Nov  2 10:24:15 2015
@@ -90,14 +90,14 @@ public class RegionalMercator extends Ab
                 .rename(Citations.GEOTIFF, "FalseOriginNorthing"));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName("Mercator (variant C)")
-            .createGroupForMapProjection(
-                    Mercator2SP.STANDARD_PARALLEL,
-                    Mercator1SP.LONGITUDE_OF_ORIGIN,    // Really "natural origin", not "false origin".
-                    LATITUDE_OF_FALSE_ORIGIN,
-                    EASTING_AT_FALSE_ORIGIN,
-                    NORTHING_AT_FALSE_ORIGIN);
+                .addIdentifier(IDENTIFIER)
+                .addName("Mercator (variant C)")
+                .createGroupForMapProjection(
+                        Mercator2SP.STANDARD_PARALLEL,
+                        Mercator1SP.LONGITUDE_OF_ORIGIN,    // Really "natural origin", not "false origin".
+                        LATITUDE_OF_FALSE_ORIGIN,
+                        EASTING_AT_FALSE_ORIGIN,
+                        NORTHING_AT_FALSE_ORIGIN);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -79,28 +79,28 @@ public final class TransverseMercator ex
                 .rename(Citations.NETCDF, "scale_factor_at_central_meridian"));
 
         PARAMETERS = builder
-            .addIdentifier(              "9807")
-            .addName(                    "Transverse Mercator")
-            .addName(                    "Gauss-Kruger")
-            .addName(                    "Gauss-Boaga")
-            .addName(                    "TM")
-            .addName(Citations.OGC,      "Transverse_Mercator")
-            .addName(Citations.ESRI,     "Transverse_Mercator")
-            .addName(Citations.ESRI,     "Gauss_Kruger")
-            .addName(Citations.NETCDF,   "TransverseMercator")
-            .addName(Citations.GEOTIFF,  "CT_TransverseMercator")
-            .addName(Citations.S57,      "Transverse Mercator")
-            .addName(Citations.S57,      "TME")
-            .addName(Citations.PROJ4,    "tmerc")
-            .addIdentifier(Citations.GEOTIFF,  "1")
-            .addIdentifier(Citations.MAP_INFO, "8")
-            .addIdentifier(Citations.S57,     "13")
-            .createGroupForMapProjection(
-                    LATITUDE_OF_ORIGIN,
-                    LONGITUDE_OF_ORIGIN,
-                    SCALE_FACTOR,
-                    FALSE_EASTING,
-                    FALSE_NORTHING);
+                .addIdentifier(              "9807")
+                .addName(                    "Transverse Mercator")
+                .addName(                    "Gauss-Kruger")
+                .addName(                    "Gauss-Boaga")
+                .addName(                    "TM")
+                .addName(Citations.OGC,      "Transverse_Mercator")
+                .addName(Citations.ESRI,     "Transverse_Mercator")
+                .addName(Citations.ESRI,     "Gauss_Kruger")
+                .addName(Citations.NETCDF,   "TransverseMercator")
+                .addName(Citations.GEOTIFF,  "CT_TransverseMercator")
+                .addName(Citations.S57,      "Transverse Mercator")
+                .addName(Citations.S57,      "TME")
+                .addName(Citations.PROJ4,    "tmerc")
+                .addIdentifier(Citations.GEOTIFF,  "1")
+                .addIdentifier(Citations.MAP_INFO, "8")
+                .addIdentifier(Citations.S57,     "13")
+                .createGroupForMapProjection(
+                        LATITUDE_OF_ORIGIN,
+                        LONGITUDE_OF_ORIGIN,
+                        SCALE_FACTOR,
+                        FALSE_EASTING,
+                        FALSE_NORTHING);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java?rev=1711933&r1=1711932&r2=1711933&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java [UTF-8] Mon Nov  2 10:24:15 2015
@@ -62,17 +62,17 @@ public final class TransverseMercatorSou
                 .setRemarks(Messages.formatInternational(Messages.Keys.MisnamedParameter_1, "False southing")));
 
         PARAMETERS = builder
-            .addIdentifier(IDENTIFIER)
-            .addName(                    "Transverse Mercator (South Orientated)")
-            .addName(Citations.OGC,      "Transverse_Mercator_South_Orientated")
-            .addName(Citations.GEOTIFF,  "CT_TransvMercator_SouthOriented")
-            .addIdentifier(Citations.GEOTIFF,  "27")
-            .createGroupForMapProjection(
-                    TransverseMercator.LATITUDE_OF_ORIGIN,
-                    TransverseMercator.LONGITUDE_OF_ORIGIN,
-                    TransverseMercator.SCALE_FACTOR,
-                    LambertConformalWest.FALSE_WESTING,
-                    falseSouthing);
+                .addIdentifier(IDENTIFIER)
+                .addName(                    "Transverse Mercator (South Orientated)")
+                .addName(Citations.OGC,      "Transverse_Mercator_South_Orientated")
+                .addName(Citations.GEOTIFF,  "CT_TransvMercator_SouthOriented")
+                .addIdentifier(Citations.GEOTIFF,  "27")
+                .createGroupForMapProjection(
+                        TransverseMercator.LATITUDE_OF_ORIGIN,
+                        TransverseMercator.LONGITUDE_OF_ORIGIN,
+                        TransverseMercator.SCALE_FACTOR,
+                        LambertConformalWest.FALSE_WESTING,
+                        falseSouthing);
     }
 
     /**



Mime
View raw message