sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1773274 [5/9] - in /sis/trunk: ./ application/sis-console/src/main/artifact/ application/sis-openoffice/src/main/unopkg/ core/sis-build-helper/src/main/javadoc/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/ma...
Date Thu, 08 Dec 2016 17:42:52 GMT
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -97,8 +97,8 @@ class ConcatenatedTransform extends Abst
      * To create a concatenated transform, use the {@link #create(MathTransform, MathTransform)}
      * factory method instead.
      *
-     * @param transform1 The first math transform.
-     * @param transform2 The second math transform.
+     * @param  transform1  the first math transform.
+     * @param  transform2  the second math transform.
      */
     @SuppressWarnings("OverridableMethodCallDuringObjectConstruction")
     protected ConcatenatedTransform(final MathTransform transform1,
@@ -146,10 +146,10 @@ class ConcatenatedTransform extends Abst
      * The "non-direct" versions use an intermediate buffer when performing transformations; they are slower
      * and consume more memory. They are used only as a fallback when a "direct" version can not be created.</div>
      *
-     * @param tr1 The first math transform.
-     * @param tr2 The second math transform.
-     * @param factory The factory which is (indirectly) invoking this method, or {@code null} if none.
-     * @return The concatenated transform.
+     * @param  tr1      the first math transform.
+     * @param  tr2      the second math transform.
+     * @param  factory  the factory which is (indirectly) invoking this method, or {@code null} if none.
+     * @return the concatenated transform.
      *
      * @see MathTransforms#concatenate(MathTransform, MathTransform)
      */
@@ -185,7 +185,7 @@ class ConcatenatedTransform extends Abst
          *       already computed. The map would be local to a "create" method execution.
          */
         int stepCount = getStepCount(tr1) + getStepCount(tr2);
-        boolean tryAgain = true; // Really 'true' because we want at least 2 iterations.
+        boolean tryAgain = true;                                // Really 'true' because we want at least 2 iterations.
         for (int k=0; ; k++) {
             MathTransform c1 = tr1;
             MathTransform c2 = tr2;
@@ -259,7 +259,7 @@ class ConcatenatedTransform extends Abst
      * into a single one. If no optimized cases has been found, returns {@code null}. In the later
      * case, the caller will need to create a more heavy {@link ConcatenatedTransform} instance.
      *
-     * @param factory The factory which is (indirectly) invoking this method, or {@code null} if none.
+     * @param  factory  the factory which is (indirectly) invoking this method, or {@code null} if none.
      */
     private static MathTransform createOptimized(final MathTransform tr1, final MathTransform tr2,
             final MathTransformFactory factory) throws FactoryException
@@ -397,7 +397,7 @@ class ConcatenatedTransform extends Abst
      * Nested concatenated transforms (if any) are explored recursively in order to
      * get the count of single (non-nested) transforms.
      *
-     * @return The number of single transform steps.
+     * @return the number of single transform steps.
      */
     private int getStepCount() {
         return getStepCount(transform1) + getStepCount(transform2);
@@ -422,7 +422,7 @@ class ConcatenatedTransform extends Abst
      * Returns all concatenated transforms. The returned list contains only <cite>single</cite> transforms,
      * i.e. all nested concatenated transforms (if any) have been flattened.
      *
-     * @return All single math transforms performed by this concatenated transform.
+     * @return all single math transforms performed by this concatenated transform.
      *
      * @see MathTransforms#getSteps(MathTransform)
      */
@@ -491,7 +491,7 @@ class ConcatenatedTransform extends Abst
     /**
      * Adds all concatenated transforms in the given list.
      *
-     * @param transforms The list where to add concatenated transforms.
+     * @param  transforms  the list where to add concatenated transforms.
      */
     private void getSteps(final List<? super MathTransform> transforms) {
         if (transform1 instanceof ConcatenatedTransform) {
@@ -525,7 +525,7 @@ class ConcatenatedTransform extends Abst
      * {@code GeneralDerivedCRS} specify the axis swapping and unit conversions.
      * This special case is internal to SIS implementation and should be unknown to users.</p>
      *
-     * @return The parameterizable transform step, or {@code null} if none.
+     * @return the parameterizable transform step, or {@code null} if none.
      */
     private Parameterized getParameterised() {
         Parameterized param = null;
@@ -582,7 +582,7 @@ class ConcatenatedTransform extends Abst
     /**
      * Transforms the specified {@code ptSrc} and stores the result in {@code ptDst}.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public DirectPosition transform(final DirectPosition ptSrc, final DirectPosition ptDst)
@@ -599,7 +599,7 @@ class ConcatenatedTransform extends Abst
      * Transforms a single coordinate in a list of ordinal values,
      * and optionally returns the derivative at that location.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public Matrix transform(final double[] srcPts, final int srcOff,
@@ -635,7 +635,7 @@ class ConcatenatedTransform extends Abst
      * {@link #transform2}. The transformations are performed without intermediate buffer
      * if it can be avoided.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public void transform(final double[] srcPts, int srcOff,
@@ -718,7 +718,7 @@ class ConcatenatedTransform extends Abst
      * {@link #transform2}. An intermediate buffer of type {@code double[]} for intermediate
      * results is used for reducing rounding errors.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public void transform(final float[] srcPts, int srcOff,
@@ -780,7 +780,7 @@ class ConcatenatedTransform extends Abst
      * {@link #transform2}. An intermediate buffer of type {@code double[]} for intermediate
      * results is used for reducing rounding errors.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public void transform(final double[] srcPts, int srcOff,
@@ -822,7 +822,7 @@ class ConcatenatedTransform extends Abst
      * {@link #transform2}. The transformations are performed without intermediate buffer
      * if it can be avoided.
      *
-     * @throws TransformException If {@link #transform1} or {@link #transform2} failed.
+     * @throws TransformException if {@link #transform1} or {@link #transform2} failed.
      */
     @Override
     public void transform(final float [] srcPts, int srcOff,
@@ -882,8 +882,8 @@ class ConcatenatedTransform extends Abst
     /**
      * Gets the derivative of this transform at a point.
      *
-     * @param  point The coordinate point where to evaluate the derivative.
-     * @return The derivative at the specified point (never {@code null}).
+     * @param  point  the coordinate point where to evaluate the derivative.
+     * @return the derivative at the specified point (never {@code null}).
      * @throws TransformException if the derivative can't be evaluated at the specified point.
      */
     @Override
@@ -964,7 +964,7 @@ class ConcatenatedTransform extends Abst
         for (final Object step : transforms) {
             formatter.newLine();
             if (step instanceof FormattableObject) {
-                formatter.append((FormattableObject) step); // May not implement MathTransform.
+                formatter.append((FormattableObject) step);         // May not implement MathTransform.
             } else if (step instanceof MathTransform) {
                 formatter.append((MathTransform) step);
             } else {

Propchange: sis/trunk/core/sis-referencing/src/main/javadoc/overview.html
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  8 17:42:51 2016
@@ -1 +1 @@
-text/html
+text/html;charset=UTF-8

Modified: sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql [UTF-8] Thu Dec  8 17:42:51 2016
@@ -19,19 +19,6 @@ UPDATE epsg_coordoperationparamvalue SET
 
 
 
----
---- Extensions to EPSG dataset 8.9 for helping Apache SIS to find some coordinate operation paths.
----
----     NTF Paris (EPSG:4807)  →  NTF (EPSG:4275)  →  RGF93 (EPSG:4171)
----
-INSERT INTO epsg_coordoperation VALUES (48094, 'NTF (Paris) to RGF93 (1)', 'concatenated operation',
- 4807, 4171, NULL, 1, 3694, '?', 1, NULL, NULL, NULL, NULL, NULL, 'Apache SIS', '2016-04-22', NULL, FALSE, FALSE);
-INSERT INTO epsg_coordoperationpath VALUES
- (48094, 1763, 1),
- (48094, 1053, 2);
-
-
-
 --
 -- Additional indexes for the EPSG database. Those indexes are not declared
 -- in the SQL scripts distributed by EPSG. They are not required for proper

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -130,8 +130,8 @@ public final strictfp class ParameterFor
                 "│ Latitude of natural origin¹    │ Double │ Mandatory  │  [-80 … 84]°  │        40.0°  │\n" +
                 "│ Longitude of natural origin    │ Double │ Mandatory  │ [-180 … 180]° │       -60.0°  │\n" +
                 "│ Scale factor at natural origin │ Double │ Mandatory  │    (0 … ∞)    │         1.0   │\n" +
-                "│ False easting                  │ Double │ Optional   │   (-∞ … ∞) m  │      5000.0 m │\n" +
-                "│ False northing                 │ Double │ Optional   │   (-∞ … ∞) m  │     10000.0 m │\n" +
+                "│ False easting                  │ Double │ Optional   │   (−∞ … ∞) m  │      5000.0 m │\n" +
+                "│ False northing                 │ Double │ Optional   │   (−∞ … ∞) m  │     10000.0 m │\n" +
                 "└────────────────────────────────┴────────┴────────────┴───────────────┴───────────────┘\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
     }
@@ -162,7 +162,7 @@ public final strictfp class ParameterFor
                 "│ Latitude of natural origin¹    │ Double │  [-80 … 84]°  │  20.0°   │\n" +
                 "│ Longitude of natural origin    │ Double │ [-180 … 180]° │ -60.0°   │\n" +
                 "│ Scale factor at natural origin │ Double │    (0 … ∞)    │ 0.997    │\n" +
-                "│ False northing                 │ Double │   (-∞ … ∞) m  │  20.0 km │\n" +
+                "│ False northing                 │ Double │   (−∞ … ∞) m  │  20.0 km │\n" +
                 "└────────────────────────────────┴────────┴───────────────┴──────────┘\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
     }
@@ -184,7 +184,7 @@ public final strictfp class ParameterFor
                 "│ Latitude of natural origin¹    │ Double │  [-80 … 84]°        │    20°   │\n" +
                 "│ Longitude of natural origin    │ Double │ [-180 … 180]°       │   -60°   │\n" +
                 "│ Scale factor at natural origin │ Double │    (0 … ∞)          │ 0,997    │\n" +
-                "│ False northing                 │ Double │   (-∞ … ∞) m        │    20 km │\n" +
+                "│ False northing                 │ Double │   (−∞ … ∞) m        │    20 km │\n" +
                 "└────────────────────────────────┴────────┴─────────────────────┴──────────┘\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
     }
@@ -217,10 +217,10 @@ public final strictfp class ParameterFor
                 "║ EPSG: Scale factor at natural origin (8805) │ Double │ Mandatory  │    (0 … ∞)    │         1.0   ║\n" +
                 "║ OGC:  scale_factor                          │        │            │               │               ║\n" +
                 "╟─────────────────────────────────────────────┼────────┼────────────┼───────────────┼───────────────╢\n" +
-                "║ EPSG: False easting (8806)                  │ Double │ Optional   │   (-∞ … ∞) m  │      5000.0 m ║\n" +
+                "║ EPSG: False easting (8806)                  │ Double │ Optional   │   (−∞ … ∞) m  │      5000.0 m ║\n" +
                 "║ OGC:  false_easting                         │        │            │               │               ║\n" +
                 "╟─────────────────────────────────────────────┼────────┼────────────┼───────────────┼───────────────╢\n" +
-                "║ EPSG: False northing (8807)                 │ Double │ Optional   │   (-∞ … ∞) m  │     10000.0 m ║\n" +
+                "║ EPSG: False northing (8807)                 │ Double │ Optional   │   (−∞ … ∞) m  │     10000.0 m ║\n" +
                 "║ OGC:  false_northing                        │        │            │               │               ║\n" +
                 "╚═════════════════════════════════════════════╧════════╧════════════╧═══════════════╧═══════════════╝\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
@@ -252,7 +252,7 @@ public final strictfp class ParameterFor
                 "║ EPSG: Scale factor at natural origin (8805) │ Double │ Mandatory  │    (0 … ∞)    │ 0.997    ║\n" +
                 "║ OGC:  scale_factor                          │        │            │               │          ║\n" +
                 "╟─────────────────────────────────────────────┼────────┼────────────┼───────────────┼──────────╢\n" +
-                "║ EPSG: False northing (8807)                 │ Double │ Optional   │   (-∞ … ∞) m  │  20.0 km ║\n" +
+                "║ EPSG: False northing (8807)                 │ Double │ Optional   │   (−∞ … ∞) m  │  20.0 km ║\n" +
                 "║ OGC:  false_northing                        │        │            │               │          ║\n" +
                 "╚═════════════════════════════════════════════╧════════╧════════════╧═══════════════╧══════════╝\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
@@ -326,7 +326,7 @@ public final strictfp class ParameterFor
                 "│ latitude_of_origin¹ │ Double │  [-80 … 84]°  │  20.0°   │\n" +
                 "│ central_meridian    │ Double │ [-180 … 180]° │ -60.0°   │\n" +
                 "│ scale_factor        │ Double │    (0 … ∞)    │ 0.997    │\n" +
-                "│ false_northing      │ Double │   (-∞ … ∞) m  │  20.0 km │\n" +
+                "│ false_northing      │ Double │   (−∞ … ∞) m  │  20.0 km │\n" +
                 "└─────────────────────┴────────┴───────────────┴──────────┘\n" +
                 "¹ This parameter is shown for completeness, but should never have a value different than 0 for this projection.\n", text);
     }

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -25,10 +25,10 @@ import org.opengis.referencing.crs.Verti
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.crs.GeocentricCRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.datum.Datum;
 import org.opengis.referencing.datum.Ellipsoid;
 import org.opengis.referencing.datum.PrimeMeridian;
+import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
 
@@ -180,7 +180,7 @@ public final strictfp class EPSGFactoryF
     /**
      * Sets the EPSG factory to the given instance and clears the cache of all {@link CommonCRS} enumeration values.
      */
-    private static void setEPSGFactory(final CRSAuthorityFactory factory) {
+    private static void setEPSGFactory(final GeodeticAuthorityFactory factory) {
         AuthorityFactories.EPSG(factory);
         for (final CommonCRS          crs : CommonCRS         .values()) crs.clear();
         for (final CommonCRS.Vertical crs : CommonCRS.Vertical.values()) crs.clear();
@@ -195,7 +195,7 @@ public final strictfp class EPSGFactoryF
     @Test
     @DependsOnMethod({"testGetAuthorityCodes", "testCreateCRS"})
     public void compareAllCodes() throws FactoryException {
-        final CRSAuthorityFactory EPSG = (CRSAuthorityFactory) AuthorityFactories.EPSG();
+        final GeodeticAuthorityFactory EPSG = AuthorityFactories.EPSG();
         try {
             setEPSGFactory(EPSGFactoryFallback.INSTANCE);
             final ArrayList<String> codes = new ArrayList<>(EPSGFactoryFallback.INSTANCE.getAuthorityCodes(CoordinateReferenceSystem.class));

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -293,8 +293,8 @@ public final strictfp class GeodeticObje
      *     <td>{@link Units#METRE}</td>
      *     <td>{@link Units#METRE}</td></tr>
      * <tr><td>Axes range</td>
-     *     <td>[-∞ … ∞]</td>
-     *     <td>[-∞ … ∞]</td></tr>
+     *     <td>[−∞ … ∞]</td>
+     *     <td>[−∞ … ∞]</td></tr>
      * <tr><td>Axes range meaning</td>
      *     <td>{@code null}</td>
      *     <td>{@code null}</td>

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -236,7 +236,7 @@ public final strictfp class DefaultProje
 
     /**
      * Tests WKT formatting in "internal" mode.
-     * This mode is similar to WKT 2 but shall include the axes of the base CRS.
+     * This mode is similar to WKT 2 but shall include the axes of the base CRS and more parameter identifiers.
      *
      * @throws FactoryException if the CRS creation failed.
      */
@@ -258,11 +258,11 @@ public final strictfp class DefaultProje
                 "      Unit[“grad”, 0.015707963267948967, Id[“EPSG”, 9105]]],\n" +
                 "  Conversion[“Lambert zone II”,\n" +
                 "    Method[“Lambert Conic Conformal (1SP)”, Id[“EPSG”, 9801], Id[“GeoTIFF”, 9]],\n" +
-                "    Parameter[“Latitude of natural origin”, 52.0, Id[“EPSG”, 8801]],\n" +
-                "    Parameter[“Longitude of natural origin”, 0.0, Id[“EPSG”, 8802]],\n" +
-                "    Parameter[“Scale factor at natural origin”, 0.99987742, Id[“EPSG”, 8805]],\n" +
-                "    Parameter[“False easting”, 600000.0, Id[“EPSG”, 8806]],\n" +
-                "    Parameter[“False northing”, 2200000.0, Id[“EPSG”, 8807]]],\n" +
+                "    Parameter[“Latitude of natural origin”, 52.0, Id[“EPSG”, 8801], Id[“GeoTIFF”, 3081]],\n" +
+                "    Parameter[“Longitude of natural origin”, 0.0, Id[“EPSG”, 8802], Id[“GeoTIFF”, 3080]],\n" +
+                "    Parameter[“Scale factor at natural origin”, 0.99987742, Id[“EPSG”, 8805], Id[“GeoTIFF”, 3092]],\n" +
+                "    Parameter[“False easting”, 600000.0, Id[“EPSG”, 8806], Id[“GeoTIFF”, 3082]],\n" +
+                "    Parameter[“False northing”, 2200000.0, Id[“EPSG”, 8807], Id[“GeoTIFF”, 3083]]],\n" +
                 "  CS[Cartesian, 2],\n" +
                 "    Axis[“Easting (E)”, east],\n" +
                 "    Axis[“Northing (N)”, north],\n" +

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -22,6 +22,7 @@ import org.opengis.test.Validators;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.apache.sis.referencing.GeodeticObjectVerifier;
+import org.apache.sis.internal.util.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.test.XMLTestCase;
 import org.apache.sis.test.DependsOn;
@@ -215,9 +216,9 @@ public final strictfp class DefaultCarte
         final CoordinateSystemAxis N = cs.getAxis(1);
         assertEquals("name",    "Easting, northing (E,N)", cs.getName().getCode());
         assertEquals("remarks", "Used in ProjectedCRS.", cs.getRemarks().toString());
-        assertEpsgIdentifierEquals("4400", getSingleton(cs.getIdentifiers()));
-        assertEpsgIdentifierEquals("1",    getSingleton(E.getIdentifiers()));
-        assertEpsgIdentifierEquals("2",    getSingleton(N.getIdentifiers()));
+        assertEpsgIdentifierEquals(String.valueOf(Constants.EPSG_PROJECTED_CS), getSingleton(cs.getIdentifiers()));
+        assertEpsgIdentifierEquals("1", getSingleton(E.getIdentifiers()));
+        assertEpsgIdentifierEquals("2", getSingleton(N.getIdentifiers()));
         assertAxisEquals("Easting",  "E", AxisDirection.EAST,  Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Units.METRE, null, E);
         assertAxisEquals("Northing", "N", AxisDirection.NORTH, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Units.METRE, null, N);
         /*

Copied: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java (from r1773268, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java)
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java?p2=sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java&p1=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java&r1=1773268&r2=1773274&rev=1773274&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2001.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -24,33 +24,13 @@ import org.apache.sis.internal.system.Lo
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.referencing.factory.sql.EPSGFactory;
 
-// Test imports
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.junit.runners.MethodSorters;
-
 import static org.opengis.test.Assert.*;
 
 
 /**
- * Tests {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess#createUnit(String)}.
- * This is part of <cite>Geospatial Integrity of Geoscience Software</cite> (GIGS) tests implemented in GeoAPI.
- *
- * <div class="note"><b>Note:</b>
- * this test is defined in this package instead than in the {@code sql} sub-package because of the need to access
- * package-private methods in {@link ConcurrentAuthorityFactory}, and for keeping all GIGS tests together.</div>
- *
- * @author  Martin Desruisseaux (Geomatys)
- * @since   0.7
- * @version 0.8
- * @module
+ * Manages connection to the temporary database used by some Apache SIS tests.
  */
-@RunWith(JUnit4.class)
-@FixMethodOrder(MethodSorters.JVM)      // Intentionally want some randomness
-public final strictfp class GIGS2001 extends org.opengis.test.referencing.gigs.GIGS2001 {
+public final strictfp class GIGS2001 {
     /**
      * The factory instance to use for the tests, or {@code null} if not available.
      * This field is set by {@link #createFactory()} and cleared by {@link #close()}.
@@ -65,8 +45,7 @@ public final strictfp class GIGS2001 ext
     /**
      * Creates a new test using the default authority factory.
      */
-    public GIGS2001() {
-        super(factory);
+    private GIGS2001() {
     }
 
     /**
@@ -75,7 +54,6 @@ public final strictfp class GIGS2001 ext
      *
      * @throws FactoryException if an error occurred while creating the factory.
      */
-    @BeforeClass
     @SuppressWarnings("null")
     public static void createFactory() throws FactoryException {
         if (!isUnavailable) {
@@ -114,7 +92,6 @@ public final strictfp class GIGS2001 ext
      *
      * @throws FactoryException if an error occurred while closing the connections.
      */
-    @AfterClass
     public static void close() throws FactoryException {
         final EPSGFactory af = factory;
         if (af != null) {

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGDataFormatter.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -115,7 +115,7 @@ import java.nio.charset.StandardCharsets
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final class EPSGDataFormatter extends ScriptRunner {
@@ -190,7 +190,7 @@ public final class EPSGDataFormatter ext
     /**
      * Creates a new instance.
      *
-     * @param  c A dummy connection. Will be used for fetching metadata.
+     * @param  c  a dummy connection. Will be used for fetching metadata.
      * @throws SQLException if an error occurred while fetching metadata.
      */
     private EPSGDataFormatter(final Connection c) throws SQLException {
@@ -223,7 +223,7 @@ public final class EPSGDataFormatter ext
     /**
      * Returns {@code true} if the given line should be omitted from the script.
      *
-     * @param  line The line, without trailing {@code ';'}.
+     * @param  line  the line, without trailing {@code ';'}.
      * @return {@code true} if the line should be omitted.
      */
     private static boolean omit(final String line) {
@@ -234,9 +234,9 @@ public final class EPSGDataFormatter ext
     /**
      * Compacts the given file.
      *
-     * @param  inputFile    The input file where to read the SQL statements to compact.
-     * @param  outputFile   The output file where to write the compacted SQL statements.
-     * @param  encoding     The character encoding for both input and output files.
+     * @param  inputFile    the input file where to read the SQL statements to compact.
+     * @param  outputFile   the output file where to write the compacted SQL statements.
+     * @param  encoding     the character encoding for both input and output files.
      * @throws IOException  if an I/O operation failed.
      * @throws SQLException should never happen.
      */
@@ -276,11 +276,23 @@ public final class EPSGDataFormatter ext
     }
 
     /**
+     * Makes sure that {@link #execute(StringBuilder)} is invoked for every line. Whether the SQL statement
+     * is supported or not is irrelevant for this method since we do not know yet what will be the database
+     * engine; we just copy the SQL statements in a file without executing them.
+     *
+     * @return {@code true}.
+     */
+    @Override
+    protected boolean isSupported(final CharSequence sql) {
+        return true;
+    }
+
+    /**
      * "Executes" the given SQL statement. In the context of this {@code EPSGDataWriter} class,
      * executing a SQL statement means compacting it and writing it to the output file.
      *
-     * @param  sql The SQL statement to compact.
-     * @return The number of rows added.
+     * @param  sql  the SQL statement to compact.
+     * @return the number of rows added.
      * @throws IOException if an I/O operation failed.
      * @throws SQLException if a syntax error happens.
      */
@@ -536,7 +548,7 @@ public final class EPSGDataFormatter ext
      * <p><b>Note:</b> current version does not use codepoint API
      * on the assumption that it is not needed for EPSG's SQL files.</p>
      *
-     * @param buffer The string in which to perform the removal.
+     * @param  buffer  the string in which to perform the removal.
      */
     static void removeLF(final StringBuilder buffer) {
         int i = buffer.length();

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Locale;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Collections;
 import javax.measure.Unit;
@@ -47,7 +46,6 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.Projection;
 import org.opengis.util.FactoryException;
-import org.apache.sis.util.logging.Logging;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.cs.AxesConvention;
@@ -55,9 +53,7 @@ import org.apache.sis.referencing.crs.De
 import org.apache.sis.referencing.datum.BursaWolfParameters;
 import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
 import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
-import org.apache.sis.referencing.factory.GeodeticObjectFactory;
 import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
-import org.apache.sis.referencing.factory.UnavailableFactoryException;
 
 // Test imports
 import org.junit.Rule;
@@ -70,6 +66,7 @@ import org.apache.sis.test.TestCase;
 import org.apache.sis.test.LoggingWatcher;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.factory.GIGS2001;
 
 import static org.junit.Assume.assumeNotNull;
 import static org.apache.sis.test.ReferencingAssert.*;
@@ -92,28 +89,13 @@ import static org.apache.sis.test.Refere
 })
 public final strictfp class EPSGFactoryTest extends TestCase {
     /**
-     * The factory instance to use for the tests, or {@code null} if not available.
-     */
-    private static EPSGFactory factory;
-
-    /**
      * Creates the factory to use for all tests in this class.
      *
      * @throws FactoryException if an error occurred while creating the factory.
      */
     @BeforeClass
     public static void createFactory() throws FactoryException {
-        final GeodeticObjectFactory f = new GeodeticObjectFactory();
-        final Map<String,Object> properties = new HashMap<>(6);
-        assertNull(properties.put("datumFactory", f));
-        assertNull(properties.put("csFactory", f));
-        assertNull(properties.put("crsFactory", f));
-        try {
-            factory = new EPSGFactory(properties);
-        } catch (UnavailableFactoryException e) {
-            Logging.getLogger(Loggers.CRS_FACTORY).warning(e.toString());
-            // Leave INSTANCE to null. This will have the effect of skipping tests.
-        }
+        GIGS2001.createFactory();
     }
 
     /**
@@ -123,10 +105,7 @@ public final strictfp class EPSGFactoryT
      */
     @AfterClass
     public static void close() throws FactoryException {
-        if (factory != null) {
-            factory.close();
-            factory = null;
-        }
+        GIGS2001.close();
     }
 
     /**
@@ -160,6 +139,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testWGS84() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final GeographicCRS crs = factory.createGeographicCRS("EPSG:4326");
         assertEpsgNameAndIdentifierEqual("WGS 84", 4326, crs);
@@ -181,6 +161,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testWGS84")
     public void testGeographic2D() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final GeographicCRS crs = factory.createGeographicCRS("4274");
         assertEpsgNameAndIdentifierEqual("Datum 73", 4274, crs);
@@ -201,6 +182,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testGeographic2D")
     public void testGeographic3D() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final GeographicCRS crs = factory.createGeographicCRS("EPSG::4993");
         assertEpsgNameAndIdentifierEqual("Lao 1997", 4993, crs);
@@ -218,6 +200,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testGeocentric() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final GeocentricCRS crs = factory.createGeocentricCRS("epsg:4915");
         assertEpsgNameAndIdentifierEqual("ITRF93", 4915, crs);
@@ -236,6 +219,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testGeographic2D")
     public void testProjected() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS("2027");
         assertEpsgNameAndIdentifierEqual("NAD27(76) / UTM zone 15N", 2027, crs);
@@ -273,6 +257,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testProjected")
     public void testProjectedNorthEast() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS(" EPSG : 2442 ");
         assertEpsgNameAndIdentifierEqual("Beijing 1954 / 3-degree Gauss-Kruger CM 135E", 2442, crs);
@@ -305,6 +290,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testProjected")
     public void testProjectedWithSharedConversion() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS("32210");
         assertEpsgNameAndIdentifierEqual("WGS 72 / UTM zone 10N", 32210, crs);
@@ -343,6 +329,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testCreateByName")
     public void testProjectedByName() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS("NTF (Paris) / Lambert zone I");
         assertEpsgNameAndIdentifierEqual("NTF (Paris) / Lambert zone I", 27571, crs);
@@ -370,6 +357,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @Ignore("“Lambert Azimuthal Equal Area (Spherical)” projection is not yet implemented.")
     public void testProjectedOnPole() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS("3408");
         assertEpsgNameAndIdentifierEqual("NSIDC EASE-Grid North", 3408, crs);
@@ -389,6 +377,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testGoogleProjection() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final ProjectedCRS crs = factory.createProjectedCRS("3857");
         assertEpsgNameAndIdentifierEqual("WGS 84 / Pseudo-Mercator", 3857, crs);
@@ -407,6 +396,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testEngineering() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final EngineeringCRS crs = factory.createEngineeringCRS("EPSG:5801");
         assertEpsgNameAndIdentifierEqual("Barcelona Grid B1", 5801, crs);
@@ -422,6 +412,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testVertical() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final VerticalCRS crs = factory.createVerticalCRS("EPSG:5735");
         assertEpsgNameAndIdentifierEqual("Black Sea height", 5735, crs);
@@ -439,6 +430,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod({"testGeographic2D", "testVertical"})
     public void testCompound() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final CompoundCRS crs = factory.createCompoundCRS("EPSG:7400");
         assertEpsgNameAndIdentifierEqual("NTF (Paris) + NGF IGN69 height", 7400, crs);
@@ -468,6 +460,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testDeprecatedCoordinateSystems() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         for (final Map.Entry<Integer,Integer> entry : EPSGDataAccess.deprecatedCS().entrySet()) {
             final CoordinateSystem expected = factory.createEllipsoidalCS(entry.getValue().toString());
@@ -510,6 +503,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod({"testGeographic2D", "testDeprecatedCoordinateSystems"})
     public void testDeprecatedGeographic() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
 
         final GeographicCRS crs = factory.createGeographicCRS("63266405");
@@ -531,6 +525,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod({"testDeprecatedGeographic", "testDeprecatedCoordinateSystems"})
     public void testDeprecatedProjected() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
 
         final ProjectedCRS crs = factory.createProjectedCRS("3786");
@@ -563,6 +558,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testCreateByName() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         assertSame   (factory.createUnit("9002"), factory.createUnit("foot"));
         assertNotSame(factory.createUnit("9001"), factory.createUnit("foot"));
@@ -594,6 +590,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testAuthorityCodes() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         /*
          * Most basic objects.
@@ -760,6 +757,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testDescriptionText() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
 
         assertEquals("World Geodetic System 1984", factory.getDescriptionText( "6326").toString(Locale.US));
@@ -777,6 +775,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testProjectedWithSharedConversion")
     public void testConversion() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         /*
          * Fetch directly the "UTM zone 10N" operation. Because this operation was not obtained in
@@ -833,6 +832,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testSimpleTransformation() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final CoordinateOperation operation = factory.createCoordinateOperation("1764");
         assertEpsgNameAndIdentifierEqual("NTF (Paris) to NTF (2)", 1764, operation);
@@ -850,6 +850,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testSimpleTransformation")
     public void testTransformation() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final CoordinateOperation operation = factory.createCoordinateOperation("1609");
         assertEpsgNameAndIdentifierEqual("BD72 to WGS 84 (1)", 1609, operation);
@@ -866,6 +867,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testTransformation")
     public void testCreateFromCoordinateReferenceSystemCodes() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         /*
          * ED50 (4230)  to  WGS 84 (4326)  using
@@ -939,6 +941,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testWGS84")
     public void testFindGeographic() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final IdentifiedObjectFinder finder = factory.newIdentifiedObjectFinder();
         final DefaultGeographicCRS crs = (DefaultGeographicCRS) CRS.fromWKT(
@@ -986,6 +989,7 @@ public final strictfp class EPSGFactoryT
     @Test
     @DependsOnMethod("testFindGeographic")
     public void testFindProjected() throws FactoryException {
+        final EPSGFactory factory = GIGS2001.factory;
         assumeNotNull(factory);
         final IdentifiedObjectFinder finder = factory.newIdentifiedObjectFinder();
         /*

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -60,7 +60,7 @@ import static org.junit.Assume.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn(EPSGFactoryTest.class)
@@ -142,14 +142,9 @@ public final strictfp class EPSGInstalle
      * Tests the creation of an EPSG database on HSQLDB.
      * This test is skipped if the SQL scripts are not found.
      *
-     * <p>This test is skipped by default because HSQLDB changes the {@code java.util.logging} configuration,
-     * which causes failures in all Apache SIS tests that verify the logging messages after execution of this
-     * test. This impact this {@code EPSGInstallerTest} class, but also other test classes.</p>
-     *
      * @throws Exception if an error occurred while creating the database.
      */
     @Test
-    @Ignore("Skipped for protecting java.util.logging configuration against changes.")
     public void testCreationOnHSQLDB() throws Exception {
         final InstallationScriptProvider scripts = getScripts();            // Needs to be invoked first.
         final DataSource ds = (DataSource) Class.forName("org.hsqldb.jdbc.JDBCDataSource").newInstance();
@@ -165,6 +160,30 @@ public final strictfp class EPSGInstalle
         loggings.assertNoUnexpectedLog();
     }
 
+    /**
+     * Tests the creation of an EPSG database on PostgreSQL. This test is disabled by default.
+     * To run this test, the tester needs to launch on {@code "localhost"} a PostgreSQL server
+     * having an empty database named {@code "SpatialMetadataTest"}. After the test completion,
+     * one can verify the {@code "EPSG"} schema created by the test, then delete that schema for future test executions
+     * (this test does <strong>not</strong> delete by itself the schema that it created).
+     *
+     * @throws Exception if an error occurred while creating the database.
+     *
+     * @since 0.8
+     */
+    @Test
+    @Ignore("This test need to be run manually on a machine having a local PostgreSQL database.")
+    public void testCreationOnPostgreSQL() throws Exception {
+        final InstallationScriptProvider scripts = getScripts();            // Needs to be invoked first.
+        final DataSource ds = (DataSource) Class.forName("org.postgresql.ds.PGSimpleDataSource").newInstance();
+        final Class<?> dsc = ds.getClass();
+        dsc.getMethod("setServerName",   String.class).invoke(ds, "localhost");
+        dsc.getMethod("setDatabaseName", String.class).invoke(ds, "SpatialMetadataTest");
+        createAndTest(ds, scripts);
+        loggings.assertNextLogContains("EPSG", "jdbc:postgresql://localhost/SpatialMetadataTest");
+        loggings.assertNoUnexpectedLog();
+    }
+
     /**
      * Requests the "WGS84" and the "WGS72 / UTM zone 15N" coordinate reference systems from the EPSG database
      * at the given {@code DataSource}. Those requests should trig the creation of the EPSG database.

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -59,7 +59,7 @@ public final strictfp class DefaultTrans
     private static DefaultGeocentricCRS createCRS(final String name, final GeodeticDatum datum) {
         Map<String,?> properties = IdentifiedObjects.getProperties(datum, DefaultGeocentricCRS.IDENTIFIERS_KEY);
         if (name != null) {
-            final Map<String,Object> copy = new HashMap<>(properties);
+            final Map<String,Object> copy = new HashMap<String,Object>(properties);
             copy.put(DefaultGeocentricCRS.NAME_KEY, name);
             properties = copy;
         }

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -68,8 +68,8 @@ public final strictfp class ConformalPro
         assertEquals("Inverse 0 m",      0, PI/2 - 2*atan(exp(0)),            TOLERANCE);
         assertEquals("Forward 90°S",     NEGATIVE_INFINITY, log(tan(0)),      TOLERANCE);
         assertEquals("Forward (90+ε)°S", NaN,  log(tan(-nextUp(0))),          TOLERANCE);
-        assertEquals("Inverse -∞",       PI/2, atan(exp(-NEGATIVE_INFINITY)), TOLERANCE);
-        assertEquals("Inverse -∞ appr.", PI/2, atan(exp(LN_INFINITY + 1)),    TOLERANCE);
+        assertEquals("Inverse −∞",       PI/2, atan(exp(-NEGATIVE_INFINITY)), TOLERANCE);
+        assertEquals("Inverse −∞ appr.", PI/2, atan(exp(LN_INFINITY + 1)),    TOLERANCE);
         /*
          * tan(PI/2) do not produces positive infinity as we would expect, because there is no
          * exact representation of PI in base 2.  Experiments show that we get some high value
@@ -247,8 +247,8 @@ public final strictfp class ConformalPro
         assertEquals("φ( 0)  =  90°",  PI/2,   φ(0),                 tolerance);
         assertEquals("φ(-ε)  →  90°",  PI/2,   φ(-MIN_VALUE),        tolerance);
         assertEquals("φ(-1)  = 180°",  PI,     φ(-1),                tolerance);
-        assertEquals("φ(-∞)  = 270°",  PI*1.5, φ(-MAX_VALUE),        tolerance);
-        assertEquals("φ(-∞)  = 270°",  PI*1.5, φ(NEGATIVE_INFINITY), tolerance);
+        assertEquals("φ(−∞)  = 270°",  PI*1.5, φ(-MAX_VALUE),        tolerance);
+        assertEquals("φ(−∞)  = 270°",  PI*1.5, φ(NEGATIVE_INFINITY), tolerance);
         /*
          * Using t(φ) as a reference.
          */

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -71,11 +71,16 @@ public final strictfp class Equirectangu
                 "PARAM_MT[“Equirectangular”,\n" +
                 "  PARAMETER[“semi_major”, 6371007.0],\n" +
                 "  PARAMETER[“semi_minor”, 6371007.0]]");
-
+        /*
+         * MathTransforms are not defined in WKT 2, so the following WKTs do not exist in standards.
+         * Since the semi-major and semi-minor parameters do not have EPSG codes, the ID[…] elements
+         * below show whatever identifier come first for each parameter (currently GeoTIFF identifiers,
+         * but the authority may change in any future SIS version).
+         */
         ReferencingAssert.assertWktEquals(Convention.WKT2,
                 "PARAM_MT[“Equidistant Cylindrical (Spherical)”,\n" +
-                "  PARAMETER[“semi_major”, 6371007.0, LENGTHUNIT[“metre”, 1]],\n" +
-                "  PARAMETER[“semi_minor”, 6371007.0, LENGTHUNIT[“metre”, 1]]]", transform);
+                "  PARAMETER[“semi_major”, 6371007.0, LENGTHUNIT[“metre”, 1], ID[“GeoTIFF”, 2057]],\n" +
+                "  PARAMETER[“semi_minor”, 6371007.0, LENGTHUNIT[“metre”, 1], ID[“GeoTIFF”, 2058]]]", transform);
 
         ReferencingAssert.assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" +

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -139,7 +139,7 @@ public final strictfp class LambertConic
         assertEquals ("Inverse +1",     0, inverseTransform(+1),   NORMALIZED_TOLERANCE);
         assertEquals ("Inverse -1",     0, inverseTransform(-1),   NORMALIZED_TOLERANCE);
         assertEquals ("Inverse +∞", +PI/2, inverseTransform(INF),  NORMALIZED_TOLERANCE);
-        assertEquals ("Inverse -∞", +PI/2, inverseTransform(-INF), NORMALIZED_TOLERANCE);
+        assertEquals ("Inverse −∞", +PI/2, inverseTransform(-INF), NORMALIZED_TOLERANCE);
 
         // Like the north case, but with sign inversed.
         createNormalizedProjection(((LambertConicConformal) transform).eccentricity != 0, -40);
@@ -158,7 +158,7 @@ public final strictfp class LambertConic
         assertEquals ("Not a number", NaN, inverseTransform(NaN),  NORMALIZED_TOLERANCE);
         assertEquals ("Inverse 0",  -PI/2, inverseTransform( 0),   NORMALIZED_TOLERANCE);
         assertEquals ("Inverse +∞", +PI/2, inverseTransform(INF),  NORMALIZED_TOLERANCE);
-        assertEquals ("Inverse -∞", +PI/2, inverseTransform(-INF), NORMALIZED_TOLERANCE);
+        assertEquals ("Inverse −∞", +PI/2, inverseTransform(-INF), NORMALIZED_TOLERANCE);
     }
 
     /**

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -152,8 +152,8 @@ public final strictfp class MercatorTest
         assertEquals ("Inverse 0 m",      0,     inverseTransform(0),                  tolerance);
         assertEquals ("Inverse +∞",       +PI/2, inverseTransform(POSITIVE_INFINITY),  tolerance);
         assertEquals ("Inverse +∞ appr.", +PI/2, inverseTransform(LN_INFINITY + 1),    tolerance);
-        assertEquals ("Inverse -∞",       -PI/2, inverseTransform(NEGATIVE_INFINITY),  tolerance);
-        assertEquals ("Inverse -∞ appr.", -PI/2, inverseTransform(-(LN_INFINITY + 1)), tolerance);
+        assertEquals ("Inverse −∞",       -PI/2, inverseTransform(NEGATIVE_INFINITY),  tolerance);
+        assertEquals ("Inverse −∞ appr.", -PI/2, inverseTransform(-(LN_INFINITY + 1)), tolerance);
     }
 
     /**

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -111,7 +111,7 @@ public abstract strictfp class MathTrans
      * Returns a name for the current math transform. This method is used only for reporting errors.
      * This information is not reliable for the actual tests as the names may not be stable.
      *
-     * @return A name for the current math transform.
+     * @return a name for the current math transform.
      */
     @Debug
     private String getName() {
@@ -163,8 +163,8 @@ public abstract strictfp class MathTrans
      *
      * <p>This method verifies also the consistency of {@code MathTransform.transform(…)} method variants.</p>
      *
-     * @param  coordinates The coordinate points to transform.
-     * @param  expected The expect result of the transformation, or
+     * @param  coordinates  the coordinate points to transform.
+     * @param  expected     the expect result of the transformation, or
      *         {@code null} if {@code coordinates} is expected to be null.
      * @throws TransformException if the transformation failed.
      */
@@ -218,9 +218,9 @@ public abstract strictfp class MathTrans
      * This method does not {@linkplain #validate() validate} the transform; it is caller responsibility
      * to validate if desired.
      *
-     * @param  domain The domain of the numbers to be generated.
-     * @param  randomSeed The seed for the random number generator, or 0 for choosing a random seed.
-     * @throws TransformException If a conversion, transformation or derivative failed.
+     * @param  domain      the domain of the numbers to be generated.
+     * @param  randomSeed  the seed for the random number generator, or 0 for choosing a random seed.
+     * @throws TransformException if a conversion, transformation or derivative failed.
      *
      * @since 0.6
      */
@@ -247,9 +247,9 @@ public abstract strictfp class MathTrans
     /**
      * Generates random numbers that can be used for the current transform.
      *
-     * @param  domain  The domain of the numbers to be generated.
-     * @param  propNaN Approximative percentage of NaN values as a fraction between 0 and 1, or 0 if none.
-     * @return Random  coordinates in the given domain.
+     * @param  domain   the domain of the numbers to be generated.
+     * @param  propNaN  approximative percentage of NaN values as a fraction between 0 and 1, or 0 if none.
+     * @return random coordinates in the given domain.
      */
     final double[] generateRandomCoordinates(final CoordinateDomain domain, final float propNaN) {
         assertNotNull("The 'transform' field shall be assigned a value.", transform);
@@ -268,11 +268,11 @@ public abstract strictfp class MathTrans
      * This method can check the descriptor separately, for easier isolation of mismatch in case of failure.
      *
      * @param descriptor
-     *          The expected parameter descriptor, or {@code null} for bypassing this check.
+     *          the expected parameter descriptor, or {@code null} for bypassing this check.
      *          The descriptor is required to be strictly the same instance, since Apache SIS
      *          implementation returns constant values.
      * @param values
-     *          The expected parameter values, or {@code null} for bypassing this check.
+     *          the expected parameter values, or {@code null} for bypassing this check.
      *          Floating points values are compared in the units of the expected value,
      *          tolerating a difference up to the {@linkplain #tolerance(double) tolerance threshold}.
      */
@@ -291,8 +291,9 @@ public abstract strictfp class MathTrans
 
     /**
      * Asserts that the current {@linkplain #transform transform} produces the given WKT.
+     * This method uses the WKT 1 format, since {@code MathTransform}s are not defined in WKT 2.
      *
-     * @param expected The expected WKT.
+     * @param  expected  the expected WKT.
      *
      * @see #printInternalWKT()
      */
@@ -303,8 +304,9 @@ public abstract strictfp class MathTrans
 
     /**
      * Asserts that the current {@linkplain #transform transform} produces a WKT matching the given regular expression.
+     * This method uses the WKT 1 format, since {@code MathTransform}s are not defined in WKT 2.
      *
-     * @param expected A regular expression for the expected WKT.
+     * @param  expected  a regular expression for the expected WKT.
      *
      * @see #printInternalWKT()
      *
@@ -318,7 +320,7 @@ public abstract strictfp class MathTrans
     /**
      * Asserts that the current {@linkplain #transform transform} produces the given internal WKT.
      *
-     * @param expected The expected internal WKT.
+     * @param  expected  the expected internal WKT.
      *
      * @since 0.7
      */
@@ -331,7 +333,7 @@ public abstract strictfp class MathTrans
      * Asserts that the current {@linkplain #transform transform} produces an internal WKT
      * matching the given regular expression.
      *
-     * @param expected A regular expression for the expected internal WKT.
+     * @param  expected  a regular expression for the expected internal WKT.
      *
      * @since 0.7
      */

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -360,12 +360,17 @@ public strictfp class MetadataTest exten
             final DefaultDistribution distributionInfo = new DefaultDistribution();
             distributor.setRole(Role.DISTRIBUTOR);
             distributionInfo.setDistributors(singleton(new DefaultDistributor(distributor)));
-            distributionInfo.setDistributionFormats(singleton(new DefaultFormat(
-                    new Anchor(URI.create("SDN:L241:1:MEDATLAS"), "MEDATLAS ASCII"), "1.0")));
+
+            final DefaultFormat format = new DefaultFormat();
+            final DefaultCitation specification = new DefaultCitation();
+            specification.setAlternateTitles(singleton(new Anchor(URI.create("SDN:L241:1:MEDATLAS"), "MEDATLAS ASCII")));
+            specification.setEdition(new SimpleInternationalString("1.0"));
+            format.setFormatSpecificationCitation(specification);
+            distributionInfo.setDistributionFormats(singleton(format));
+
             final DefaultDigitalTransferOptions transfer = new DefaultDigitalTransferOptions();
             transfer.setTransferSize(2.431640625);
-            final DefaultOnlineResource onlines = new DefaultOnlineResource(URI.create(
-                    "http://www.ifremer.fr/data/something"));
+            final DefaultOnlineResource onlines = new DefaultOnlineResource(URI.create("http://www.ifremer.fr/data/something"));
             onlines.setDescription(new SimpleInternationalString("CTDF02"));
             onlines.setFunction(OnLineFunction.DOWNLOAD);
             onlines.setProtocol("http");

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -199,6 +199,7 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.factory.sql.EPSGDataFormatterTest.class,
     org.apache.sis.referencing.EPSGFactoryFallbackTest.class,
     org.apache.sis.referencing.AuthorityFactoriesTest.class,
+    org.apache.sis.referencing.cs.CodesTest.class,
     org.apache.sis.referencing.CRSTest.class,
 
     // Coordinate operation finders are last, since they need everything else.

Propchange: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec  8 17:42:51 2016
@@ -1 +1 @@
-text/html
+text/html;charset=UTF-8

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -63,6 +63,27 @@ public final class JDK8 {
     }
 
     /**
+     * Formats the given elements as a list.
+     *
+     * @param  delimiter  the characters to insert between each elements.
+     * @param  elements   the elements to format.
+     * @return the given elements formatted as a list.
+     *
+     * @since 0.8
+     */
+    public static String join(final CharSequence delimiter, final CharSequence... elements) {
+        final StringBuffer buffer = new StringBuffer();
+        for (final CharSequence cs : elements) {
+            if (buffer.length() != 0) {
+                buffer.append(delimiter);
+            }
+            buffer.append(cs);
+        }
+        return buffer.toString();
+    }
+
+
+    /**
      * Compares two numbers as unsigned long.
      *
      * @param  x  first unsigned value.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -191,7 +191,7 @@ public class SimpleIdentifiedObject impl
      * If name is a critical component of this object, then it shall be compared by the subclass.
      * This behavior is consistent with {@link org.apache.sis.referencing.AbstractIdentifiedObject}.
      *
-     * @param  object  the object to compare with this reference system.
+     * @param  object  the object to compare with this identified object.
      * @param  mode    the strictness level of the comparison.
      * @return {@code true} if both objects are equal.
      */

Propchange: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -67,9 +67,9 @@ public final class DefaultFactories exte
     /**
      * Returns {@code true} if the default factory of the given type is the given instance.
      *
-     * @param  <T>  The interface type.
-     * @param  type The interface type.
-     * @param  factory The factory implementation to test.
+     * @param  <T>      the interface type.
+     * @param  type     the interface type.
+     * @param  factory  the factory implementation to test.
      * @return {@code true} if the given factory implementation is the default instance.
      */
     public static synchronized <T> boolean isDefaultInstance(final Class<T> type, final T factory) {
@@ -81,9 +81,9 @@ public final class DefaultFactories exte
      * This method gives preference to Apache SIS implementation of factories if present.
      * This is a temporary mechanism while we are waiting for a real dependency injection mechanism.
      *
-     * @param  <T>  The interface type.
-     * @param  type The interface type.
-     * @return A factory implementing the given interface, or {@code null} if none.
+     * @param  <T>   the interface type.
+     * @param  type  the interface type.
+     * @return a factory implementing the given interface, or {@code null} if none.
      */
     public static synchronized <T> T forClass(final Class<T> type) {
         T factory = type.cast(FACTORIES.get(type));
@@ -124,9 +124,9 @@ public final class DefaultFactories exte
      * Returns a factory which is guaranteed to be present. If the factory is not found,
      * this will be considered a configuration error (corrupted JAR files of incorrect classpath).
      *
-     * @param  <T>  The interface type.
-     * @param  type The interface type.
-     * @return A factory implementing the given interface.
+     * @param  <T>   the interface type.
+     * @param  type  the interface type.
+     * @return a factory implementing the given interface.
      *
      * @since 0.6
      */
@@ -143,11 +143,11 @@ public final class DefaultFactories exte
      * Returns a factory of the given type, making sure that it is an implementation of the given class.
      * Use this method only when we know that Apache SIS registers only one implementation of a given service.
      *
-     * @param  <T>  The interface type.
-     * @param  <I>  The requested implementation class.
-     * @param  type The interface type.
-     * @param  impl The requested implementation class.
-     * @return A factory implementing the given interface.
+     * @param  <T>   the interface type.
+     * @param  <I>   the requested implementation class.
+     * @param  type  the interface type.
+     * @param  impl  the requested implementation class.
+     * @return a factory implementing the given interface.
      *
      * @since 0.6
      */
@@ -165,9 +165,9 @@ public final class DefaultFactories exte
      * The default is the current thread {@linkplain Thread#getContextClassLoader() context class loader},
      * provided that it can access at least the Apache SIS stores.
      *
-     * @param  <T> The compile-time value of {@code service} argument.
-     * @param  service The interface or abstract class representing the service.
-     * @return A new service loader for the given service type.
+     * @param  <T>      the compile-time value of {@code service} argument.
+     * @param  service  the interface or abstract class representing the service.
+     * @return a new service loader for the given service type.
      *
      * @since 0.8
      */
@@ -196,7 +196,7 @@ public final class DefaultFactories exte
      * <p>The intend of this method is to ensure that {@link ServiceLoader#load(Class)} will find the
      * Apache SIS services even in an environment that defined an unsuitable context class loader.</p>
      *
-     * @return The context class loader if suitable, or another class loader otherwise.
+     * @return the context class loader if suitable, or another class loader otherwise.
      * @throws SecurityException if this method is not allowed to get the current thread
      *         context class loader or one of its parent.
      *

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -64,7 +64,7 @@ public final class DelayedExecutor exten
      * The task must completes quickly, because we will typically use only one thread for all submitted tasks.
      * Completion of the task shall not be critical, since the JVM is allowed to shutdown before task completion.
      *
-     * @param task The task to schedule for later execution.
+     * @param  task  the task to schedule for later execution.
      */
     public static void schedule(final DelayedRunnable task) {
         QUEUE.add(task);

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -53,7 +53,7 @@ public abstract class DelayedRunnable im
      * It is user's responsibility to add the {@link System#nanoTime()} value
      * to the delay he wants to wait.
      *
-     * @param timestamp Time of execution of this task, in nanoseconds relative to {@link System#nanoTime()}.
+     * @param timestamp  time of execution of this task, in nanoseconds relative to {@link System#nanoTime()}.
      */
     protected DelayedRunnable(final long timestamp) {
         this.timestamp = timestamp;
@@ -74,7 +74,7 @@ public abstract class DelayedRunnable im
      * This restriction should be okay since the {@link DelayedExecutor} queue
      * accepts only {@code DelayedRunnable} instances.
      *
-     * @param other The other delayed object to compare with this delayed task.
+     * @param  other  the other delayed object to compare with this delayed task.
      * @return -1 if the other task should happen before this one, +1 if it should happen after, or 0.
      */
     @Override
@@ -111,8 +111,8 @@ public abstract class DelayedRunnable im
         /**
          * Returns the delay, which is fixed to 0 in every cases.
          *
-         * @param  unit The unit of the value to return (ignored).
-         * @return The delay, which is fixed to 0.
+         * @param  unit  the unit of the value to return (ignored).
+         * @return the delay, which is fixed to 0.
          */
         @Override
         public final long getDelay(final TimeUnit unit) {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -84,7 +84,7 @@ public final class Semaphores {
     /**
      * Returns {@code true} if the given flag is set.
      *
-     * @param flag One of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
+     * @param  flag  one of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
      * @return {@code true} if the given flag is set.
      */
     public static boolean query(final byte flag) {
@@ -95,7 +95,7 @@ public final class Semaphores {
     /**
      * Sets the given flag.
      *
-     * @param flag One of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
+     * @param  flag  one of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
      * @return {@code true} if the given flag was already set.
      */
     public static boolean queryAndSet(final byte flag) {
@@ -112,7 +112,7 @@ public final class Semaphores {
     /**
      * Clears the given flag.
      *
-     * @param flag One of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
+     * @param flag  one of {@link #CONVERSION_AND_CRS}, {@link #ENCLOSED_IN_OPERATION} or other constants.
      */
     public static void clear(final byte flag) {
         final Semaphores s = FLAGS.get();

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -21,9 +21,9 @@ import org.apache.sis.util.logging.Loggi
 
 
 /**
- * Utilities methods for threads. This class declares in a single place every {@link ThreadGroup}
- * used in SIS. Their intend is to bring some order in debugger informations, by grouping the
- * threads created by SIS together under the same parent tree node.
+ * Utilities methods for threads. This class declares in a single place every {@link ThreadGroup} used in SIS.
+ * Their intend is to bring some order in debugger informations, by grouping the threads created by SIS together
+ * under the same parent tree node.
  *
  * <div class="section">Note on dependencies</div>
  * This class shall not depend on {@link ReferenceQueueConsumer} or {@link DelayedExecutor},
@@ -93,9 +93,9 @@ final class Threads extends Static {
      * <p><strong>This method is for internal use by Apache SIS shutdown hooks only.</strong>
      * Users should never invoke this method explicitely.</p>
      *
-     * @param  stopWaitingAt A {@link System#nanoTime()} value telling when to stop waiting.
+     * @param  stopWaitingAt  a {@link System#nanoTime()} value telling when to stop waiting.
      *         This is used for preventing shutdown process to block an indefinite amount of time.
-     * @throws InterruptedException If an other thread invoked {@link Thread#interrupt()} while
+     * @throws InterruptedException if an other thread invoked {@link Thread#interrupt()} while
      *         we were waiting for the daemon threads to die.
      */
     static synchronized void shutdown(final long stopWaitingAt) throws InterruptedException {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -131,8 +131,8 @@ public final class CollectionsExt extend
      * Returns a {@linkplain SortedSet sorted set} which is always empty and accepts no element.
      *
      * <div class="note"><b>Note:</b>
-     * This method exists only on the JDK6 and JDK7 branches. This method will
-     * be removed from the JDK8 branch, since it has been added to the JDK.</div>
+     * This method exists only on the JDK7 branch, not on the JDK8 branch,
+     * since an equivalent method has been added to the JDK.</div>
      *
      * @param <E> The type of elements in the empty collection.
      * @return An empty collection.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -204,6 +204,12 @@ public final class Constants extends Sta
     public static final short EPSG_GREENWICH = 8901;
 
     /**
+     * The EPSG code for the two-dimensional Cartesian coordinate system with axes in metres.
+     * Cartesian 2D CS. Axes: easting, northing (E,N). Orientations: east, north. UoM: m.
+     */
+    public static final short EPSG_PROJECTED_CS = 4400;
+
+    /**
      * EPSG code of "WGS 84 / Arctic Polar Stereographic" projection.
      * Latitude of standard parallel is 71°N. All other parameters are zero.
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptySortedSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptySortedSet.java?rev=1773274&r1=1773273&r2=1773274&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptySortedSet.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptySortedSet.java [UTF-8] Thu Dec  8 17:42:51 2016
@@ -28,10 +28,10 @@ import java.util.SortedSet;
 
 /**
  * An immutable, serializable empty sorted set.
- * This class exists only on the JDK6 and JDK7 branches;
- * it will be removed on the JDK8 branch.
+ * This class exists only on the JDK7 branch, not on the JDK8 branch,
+ * since an equivalent method has been added to the JDK.
  *
- * @param  <E> Type of elements in the collection.
+ * @param  <E>  type of elements in the collection.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3




Mime
View raw message