sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1730026 - in /sis/branches/JDK8/core: sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/ sis-referencing/src/main/java/org/apache/sis/referencing/ sis-referencing/src/main/java/org/apache/sis/referencing/factory/ sis-r...
Date Fri, 12 Feb 2016 14:11:26 GMT
Author: desruisseaux
Date: Fri Feb 12 14:11:26 2016
New Revision: 1730026

URL: http://svn.apache.org/viewvc?rev=1730026&view=rev
Log:
Documentation update: revert the "EPSG::####" notation to "EPSG:####" in non-URN code for compliance with WMS usage.
Minor formatting.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Conversion.xml
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -116,7 +116,7 @@ public final class Code {
              * an EPSG code has the "EPSG" codespace. Example:
              *
              *    - XML: <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
-             *    - ISO: For "EPSG::4326", Identifier.codeSpace = "EPSG" and Identifier.code = "4326".
+             *    - ISO: For "EPSG:4326", Identifier.codeSpace = "EPSG" and Identifier.code = "4326".
              *
              * Apache SIS attempts to organize this apparent contradiction by considering IOGP as the codespace of
              * the EPSG codespace, but this interpretation is not likely to be widely used by libraries other than

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -505,7 +505,7 @@ public enum CommonCRS {
                         failure(this, "geographic", e);
                     }
                     /*
-                     * All constants defined in this enumeration use the same coordinate system, EPSG::6422.
+                     * All constants defined in this enumeration use the same coordinate system, EPSG:6422.
                      * We will arbitrarily create this CS only for the most frequently created CRS,
                      * and share that CS instance for all other constants.
                      */
@@ -562,7 +562,7 @@ public enum CommonCRS {
                         }
                     }
                     /*
-                     * All constants defined in this enumeration use the same coordinate system, EPSG::6423.
+                     * All constants defined in this enumeration use the same coordinate system, EPSG:6423.
                      * We will arbitrarily create this CS only for the most frequently created CRS,
                      * and share that CS instance for all other constants.
                      */
@@ -620,7 +620,7 @@ public enum CommonCRS {
                         }
                     }
                     /*
-                     * All constants defined in this enumeration use the same coordinate system, EPSG::6500.
+                     * All constants defined in this enumeration use the same coordinate system, EPSG:6500.
                      * We will arbitrarily create this CS only for the most frequently created CRS,
                      * and share that CS instance for all other constants.
                      */
@@ -883,7 +883,7 @@ public enum CommonCRS {
                 }
             }
             /*
-             * All constants defined in this enumeration use the same coordinate system, EPSG::4400.
+             * All constants defined in this enumeration use the same coordinate system, EPSG:4400.
              * We will arbitrarily create this CS only for a frequently created CRS, and share that
              * CS instance for all other constants.
              */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -103,7 +103,7 @@ public abstract class GeodeticAuthorityF
 
     /**
      * Returns all namespaces recognized by this factory. Those namespaces can appear before codes in
-     * calls to {@code createFoo(String)} methods, for example {@code "EPSG"} in {@code "EPSG::4326"}.
+     * calls to {@code createFoo(String)} methods, for example {@code "EPSG"} in {@code "EPSG:4326"}.
      * Namespaces are case-insensitive.
      *
      * <p>The namespaces are closely related to the {@linkplain #getAuthority() authority}. Often the namespace is
@@ -115,7 +115,7 @@ public abstract class GeodeticAuthorityF
      *   <li>The {@link org.apache.sis.referencing.factory.sql.EPSGFactory} authority identifier is {@code "EPSG"}
      *       and its {@code getCodeSpaces()} method returns a set containing {@code "EPSG"}. So in this example,
      *       authority and namespace match. That namespace value means that {@code EPSGFactory.createFoo(String)}
-     *       methods accept both {@code "EPSG::4326"} (case-insensitive) and {@code "4326"} codes as argument.</li>
+     *       methods accept both {@code "EPSG:4326"} (case-insensitive) and {@code "4326"} codes as argument.</li>
      *
      *   <li>The {@link org.apache.sis.referencing.factory.sql.EPSGDataAccess} authority identifier is {@code "EPSG"}
      *       but its {@code getCodeSpaces()} method returns an empty set. This means that despite the EPSG authority,
@@ -198,15 +198,15 @@ public abstract class GeodeticAuthorityF
      * Two frequently used authorities are "CRS" and "EPSG", which include the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Type</th>          <th>Description</th></tr>
-     *   <tr><td>CRS:84</td>     <td>Geographic</td>    <td>Like EPSG::4326 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
-     *   <tr><td>EPSG::4326</td> <td>Geographic</td>    <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::4979</td> <td>Geographic 3D</td> <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::4978</td> <td>Geocentric</td>    <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::3395</td> <td>Projected</td>     <td>WGS 84 / World Mercator</td></tr>
-     *   <tr><td>EPSG::5714</td> <td>Vertical</td>      <td>Mean Sea Level height</td></tr>
-     *   <tr><td>EPSG::6349</td> <td>Compound</td>      <td>NAD83(2011) + NAVD88 height</td></tr>
-     *   <tr><td>EPSG::5800</td> <td>Engineering</td>   <td>Astra Minas Grid</td></tr>
+     *   <tr><th>Code</th>       <th>Type</th>         <th>Description</th></tr>
+     *   <tr><td>CRS:84</td>     <td>Geographic</td>   <td>Like EPSG:4326 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
+     *   <tr><td>EPSG:4326</td> <td>Geographic</td>    <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:4979</td> <td>Geographic 3D</td> <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:4978</td> <td>Geocentric</td>    <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:3395</td> <td>Projected</td>     <td>WGS 84 / World Mercator</td></tr>
+     *   <tr><td>EPSG:5714</td> <td>Vertical</td>      <td>Mean Sea Level height</td></tr>
+     *   <tr><td>EPSG:6349</td> <td>Compound</td>      <td>NAD83(2011) + NAVD88 height</td></tr>
+     *   <tr><td>EPSG:5800</td> <td>Engineering</td>   <td>Astra Minas Grid</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -238,20 +238,20 @@ public abstract class GeodeticAuthorityF
      * Two frequently used authorities are "CRS" and "EPSG", which include the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Type</th>          <th>Description</th></tr>
-     *   <tr><td>CRS:27</td>     <td>Geographic</td>    <td>Like EPSG::4267 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
-     *   <tr><td>CRS:83</td>     <td>Geographic</td>    <td>Like EPSG::4269 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
-     *   <tr><td>CRS:84</td>     <td>Geographic</td>    <td>Like EPSG::4326 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
-     *   <tr><td>EPSG::4322</td> <td>Geographic</td>    <td>World Geodetic System 1972</td></tr>
-     *   <tr><td>EPSG::4985</td> <td>Geographic 3D</td> <td>World Geodetic System 1972</td></tr>
-     *   <tr><td>EPSG::4326</td> <td>Geographic</td>    <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::4979</td> <td>Geographic 3D</td> <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::4267</td> <td>Geographic</td>    <td>North American Datum 1927</td></tr>
-     *   <tr><td>EPSG::4269</td> <td>Geographic</td>    <td>North American Datum 1983</td></tr>
-     *   <tr><td>EPSG::4230</td> <td>Geographic</td>    <td>European Datum 1950</td></tr>
-     *   <tr><td>EPSG::4258</td> <td>Geographic</td>    <td>European Terrestrial Reference Frame 1989</td></tr>
-     *   <tr><td>EPSG::4937</td> <td>Geographic 3D</td> <td>European Terrestrial Reference Frame 1989</td></tr>
-     *   <tr><td>EPSG::4047</td> <td>Geographic</td>    <td>GRS 1980 Authalic Sphere</td></tr>
+     *   <tr><th>Code</th>      <th>Type</th>          <th>Description</th></tr>
+     *   <tr><td>CRS:27</td>    <td>Geographic</td>    <td>Like EPSG:4267 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
+     *   <tr><td>CRS:83</td>    <td>Geographic</td>    <td>Like EPSG:4269 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
+     *   <tr><td>CRS:84</td>    <td>Geographic</td>    <td>Like EPSG:4326 except for (<var>longitude</var>, <var>latitude</var>) axis order</td></tr>
+     *   <tr><td>EPSG:4322</td> <td>Geographic</td>    <td>World Geodetic System 1972</td></tr>
+     *   <tr><td>EPSG:4985</td> <td>Geographic 3D</td> <td>World Geodetic System 1972</td></tr>
+     *   <tr><td>EPSG:4326</td> <td>Geographic</td>    <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:4979</td> <td>Geographic 3D</td> <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:4267</td> <td>Geographic</td>    <td>North American Datum 1927</td></tr>
+     *   <tr><td>EPSG:4269</td> <td>Geographic</td>    <td>North American Datum 1983</td></tr>
+     *   <tr><td>EPSG:4230</td> <td>Geographic</td>    <td>European Datum 1950</td></tr>
+     *   <tr><td>EPSG:4258</td> <td>Geographic</td>    <td>European Terrestrial Reference Frame 1989</td></tr>
+     *   <tr><td>EPSG:4937</td> <td>Geographic 3D</td> <td>European Terrestrial Reference Frame 1989</td></tr>
+     *   <tr><td>EPSG:4047</td> <td>Geographic</td>    <td>GRS 1980 Authalic Sphere</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -282,10 +282,10 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::4936</td> <td>European Terrestrial Reference Frame 1989</td></tr>
-     *   <tr><td>EPSG::4978</td> <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::4984</td> <td>World Geodetic System 1972</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:4936</td> <td>European Terrestrial Reference Frame 1989</td></tr>
+     *   <tr><td>EPSG:4978</td> <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:4984</td> <td>World Geodetic System 1972</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -317,10 +317,10 @@ public abstract class GeodeticAuthorityF
      * Some of them are:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::3034</td> <td>ETRS89 / Lambert Conic Conformal Europe</td></tr>
-     *   <tr><td>EPSG::3395</td> <td>WGS 84 / World Mercator</td></tr>
-     *   <tr><td>EPSG::6350</td> <td>NAD83(2011) / Conus Albers Equal Area</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:3034</td> <td>ETRS89 / Lambert Conic Conformal Europe</td></tr>
+     *   <tr><td>EPSG:3395</td> <td>WGS 84 / World Mercator</td></tr>
+     *   <tr><td>EPSG:6350</td> <td>NAD83(2011) / Conus Albers Equal Area</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -349,9 +349,9 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::5715</td> <td>Mean Sea Level depth</td></tr>
-     *   <tr><td>EPSG::5714</td> <td>Mean Sea Level height</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:5715</td> <td>Mean Sea Level depth</td></tr>
+     *   <tr><td>EPSG:5714</td> <td>Mean Sea Level height</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -398,9 +398,9 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::6349</td> <td>NAD83(2011) + NAVD88 height</td></tr>
-     *   <tr><td>EPSG::7423</td> <td>ETRS89 + EVRF2007 height</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:6349</td> <td>NAD83(2011) + NAVD88 height</td></tr>
+     *   <tr><td>EPSG:7423</td> <td>ETRS89 + EVRF2007 height</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -446,8 +446,8 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::5800</td> <td>Astra Minas Grid</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:5800</td> <td>Astra Minas Grid</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -496,12 +496,12 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which contains hundred of datum. Some of them are:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Type</th>        <th>Description</th></tr>
-     *   <tr><td>EPSG::6326</td> <td>Geodetic</td>    <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::6322</td> <td>Geodetic</td>    <td>World Geodetic System 1972</td></tr>
-     *   <tr><td>EPSG::1027</td> <td>Vertical</td>    <td>EGM2008 geoid</td></tr>
-     *   <tr><td>EPSG::5100</td> <td>Vertical</td>    <td>Mean Sea Level</td></tr>
-     *   <tr><td>EPSG::9315</td> <td>Engineering</td> <td>Seismic bin grid datum</td></tr>
+     *   <tr><th>Code</th>      <th>Type</th>        <th>Description</th></tr>
+     *   <tr><td>EPSG:6326</td> <td>Geodetic</td>    <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:6322</td> <td>Geodetic</td>    <td>World Geodetic System 1972</td></tr>
+     *   <tr><td>EPSG:1027</td> <td>Vertical</td>    <td>EGM2008 geoid</td></tr>
+     *   <tr><td>EPSG:5100</td> <td>Vertical</td>    <td>Mean Sea Level</td></tr>
+     *   <tr><td>EPSG:9315</td> <td>Engineering</td> <td>Seismic bin grid datum</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -530,11 +530,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which contains hundred of datum. Some of them are:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::6326</td> <td>World Geodetic System 1984</td></tr>
-     *   <tr><td>EPSG::6322</td> <td>World Geodetic System 1972</td></tr>
-     *   <tr><td>EPSG::6269</td> <td>North American Datum 1983</td></tr>
-     *   <tr><td>EPSG::6258</td> <td>European Terrestrial Reference System 1989</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:6326</td> <td>World Geodetic System 1984</td></tr>
+     *   <tr><td>EPSG:6322</td> <td>World Geodetic System 1972</td></tr>
+     *   <tr><td>EPSG:6269</td> <td>North American Datum 1983</td></tr>
+     *   <tr><td>EPSG:6258</td> <td>European Terrestrial Reference System 1989</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -564,11 +564,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::5100</td> <td>Mean Sea Level</td></tr>
-     *   <tr><td>EPSG::1027</td> <td>EGM2008 geoid</td></tr>
-     *   <tr><td>EPSG::1131</td> <td>Japanese Geodetic Datum 2011 (vertical)</td></tr>
-     *   <tr><td>EPSG::5215</td> <td>European Vertical Reference Frame 2007</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:5100</td> <td>Mean Sea Level</td></tr>
+     *   <tr><td>EPSG:1027</td> <td>EGM2008 geoid</td></tr>
+     *   <tr><td>EPSG:1131</td> <td>Japanese Geodetic Datum 2011 (vertical)</td></tr>
+     *   <tr><td>EPSG:5215</td> <td>European Vertical Reference Frame 2007</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -617,9 +617,9 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::9315</td> <td>Seismic bin grid datum</td></tr>
-     *   <tr><td>EPSG::9300</td> <td>Astra Minas</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:9315</td> <td>Seismic bin grid datum</td></tr>
+     *   <tr><td>EPSG:9300</td> <td>Astra Minas</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -667,10 +667,10 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::7030</td> <td>WGS 84</td></tr>
-     *   <tr><td>EPSG::7034</td> <td>Clarke 1880</td></tr>
-     *   <tr><td>EPSG::7048</td> <td>GRS 1980 Authalic Sphere</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:7030</td> <td>WGS 84</td></tr>
+     *   <tr><td>EPSG:7034</td> <td>Clarke 1880</td></tr>
+     *   <tr><td>EPSG:7048</td> <td>GRS 1980 Authalic Sphere</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -698,12 +698,12 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::8901</td> <td>Greenwich</td></tr>
-     *   <tr><td>EPSG::8903</td> <td>Paris</td></tr>
-     *   <tr><td>EPSG::8904</td> <td>Bogota</td></tr>
-     *   <tr><td>EPSG::8905</td> <td>Madrid</td></tr>
-     *   <tr><td>EPSG::8906</td> <td>Rome</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:8901</td> <td>Greenwich</td></tr>
+     *   <tr><td>EPSG:8903</td> <td>Paris</td></tr>
+     *   <tr><td>EPSG:8904</td> <td>Bogota</td></tr>
+     *   <tr><td>EPSG:8905</td> <td>Madrid</td></tr>
+     *   <tr><td>EPSG:8906</td> <td>Rome</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -731,9 +731,9 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::1262</td> <td>World</td></tr>
-     *   <tr><td>EPSG::3391</td> <td>World - between 80°S and 84°N</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:1262</td> <td>World</td></tr>
+     *   <tr><td>EPSG:3391</td> <td>World - between 80°S and 84°N</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -763,12 +763,12 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Type</th>              <th>Axes</th>                                    <th>Orientations</th>    <th>Unit</th></tr>
-     *   <tr><td>EPSG::4496</td> <td>Cartesian 2D CS</td>   <td>easting, northing (E,N)</td>                 <td>east, north</td>     <td>metre</td></tr>
-     *   <tr><td>EPSG::6422</td> <td>Ellipsoidal 2D CS</td> <td>latitude, longitude</td>                     <td>north, east</td>     <td>degree</td></tr>
-     *   <tr><td>EPSG::6423</td> <td>Ellipsoidal 3D CS</td> <td>latitude, longitude, ellipsoidal height</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
-     *   <tr><td>EPSG::6404</td> <td>Spherical 3D CS</td>   <td>latitude, longitude, radius</td>             <td>north, east, up</td> <td>degree, degree, metre</td></tr>
-     *   <tr><td>EPSG::6499</td> <td>Vertical CS</td>       <td>height (H)</td>                              <td>up</td>              <td>metre</td></tr>
+     *   <tr><th>Code</th>      <th>Type</th>              <th>Axes</th>                                    <th>Orientations</th>    <th>Unit</th></tr>
+     *   <tr><td>EPSG:4496</td> <td>Cartesian 2D CS</td>   <td>easting, northing (E,N)</td>                 <td>east, north</td>     <td>metre</td></tr>
+     *   <tr><td>EPSG:6422</td> <td>Ellipsoidal 2D CS</td> <td>latitude, longitude</td>                     <td>north, east</td>     <td>degree</td></tr>
+     *   <tr><td>EPSG:6423</td> <td>Ellipsoidal 3D CS</td> <td>latitude, longitude, ellipsoidal height</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
+     *   <tr><td>EPSG:6404</td> <td>Spherical 3D CS</td>   <td>latitude, longitude, radius</td>             <td>north, east, up</td> <td>degree, degree, metre</td></tr>
+     *   <tr><td>EPSG:6499</td> <td>Vertical CS</td>       <td>height (H)</td>                              <td>up</td>              <td>metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -796,11 +796,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Axes</th>                                    <th>Orientations</th>    <th>Unit</th></tr>
-     *   <tr><td>EPSG::6422</td> <td>latitude, longitude</td>                     <td>north, east</td>     <td>degree</td></tr>
-     *   <tr><td>EPSG::6424</td> <td>longitude, latitude</td>                     <td>east, north</td>     <td>degree</td></tr>
-     *   <tr><td>EPSG::6429</td> <td>longitude, latitude</td>                     <td>east, north</td>     <td>radian</td></tr>
-     *   <tr><td>EPSG::6423</td> <td>latitude, longitude, ellipsoidal height</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
+     *   <tr><th>Code</th>      <th>Axes</th>                                    <th>Orientations</th>    <th>Unit</th></tr>
+     *   <tr><td>EPSG:6422</td> <td>latitude, longitude</td>                     <td>north, east</td>     <td>degree</td></tr>
+     *   <tr><td>EPSG:6424</td> <td>longitude, latitude</td>                     <td>east, north</td>     <td>degree</td></tr>
+     *   <tr><td>EPSG:6429</td> <td>longitude, latitude</td>                     <td>east, north</td>     <td>radian</td></tr>
+     *   <tr><td>EPSG:6423</td> <td>latitude, longitude, ellipsoidal height</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -827,9 +827,9 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Axes</th>       <th>Orientations</th> <th>Unit</th></tr>
-     *   <tr><td>EPSG::6498</td> <td>depth (D)</td>  <td>down</td>         <td>metre</td></tr>
-     *   <tr><td>EPSG::6499</td> <td>height (H)</td> <td>up</td>           <td>metre</td></tr>
+     *   <tr><th>Code</th>      <th>Axes</th>       <th>Orientations</th> <th>Unit</th></tr>
+     *   <tr><td>EPSG:6498</td> <td>depth (D)</td>  <td>down</td>         <td>metre</td></tr>
+     *   <tr><td>EPSG:6499</td> <td>height (H)</td> <td>up</td>           <td>metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -876,11 +876,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Axes</th>                    <th>Orientations</th> <th>Unit</th></tr>
-     *   <tr><td>EPSG::4406</td> <td>easting, northing (E,N)</td> <td>east, north</td>  <td>kilometre</td></tr>
-     *   <tr><td>EPSG::4496</td> <td>easting, northing (E,N)</td> <td>east, north</td>  <td>metre</td></tr>
-     *   <tr><td>EPSG::4500</td> <td>northing, easting (N,E)</td> <td>north, east</td>  <td>metre</td></tr>
-     *   <tr><td>EPSG::4491</td> <td>westing, northing (W,N)</td> <td>west, north</td>  <td>metre</td></tr>
+     *   <tr><th>Code</th>      <th>Axes</th>                    <th>Orientations</th> <th>Unit</th></tr>
+     *   <tr><td>EPSG:4406</td> <td>easting, northing (E,N)</td> <td>east, north</td>  <td>kilometre</td></tr>
+     *   <tr><td>EPSG:4496</td> <td>easting, northing (E,N)</td> <td>east, north</td>  <td>metre</td></tr>
+     *   <tr><td>EPSG:4500</td> <td>northing, easting (N,E)</td> <td>north, east</td>  <td>metre</td></tr>
+     *   <tr><td>EPSG:4491</td> <td>westing, northing (W,N)</td> <td>west, north</td>  <td>metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -908,8 +908,8 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Axes</th>                        <th>Orientations</th>    <th>Unit</th></tr>
-     *   <tr><td>EPSG::6404</td> <td>latitude, longitude, radius</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
+     *   <tr><th>Code</th>      <th>Axes</th>                        <th>Orientations</th>    <th>Unit</th></tr>
+     *   <tr><td>EPSG:6404</td> <td>latitude, longitude, radius</td> <td>north, east, up</td> <td>degree, degree, metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -974,11 +974,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th>   <th>Unit</th></tr>
-     *   <tr><td>EPSG::106</td>  <td>Latitude (φ)</td>  <td>degree</td></tr>
-     *   <tr><td>EPSG::107</td>  <td>Longitude (λ)</td> <td>degree</td></tr>
-     *   <tr><td>EPSG::1</td>    <td>Easting (E)</td>   <td>metre</td></tr>
-     *   <tr><td>EPSG::2</td>    <td>Northing (N)</td>  <td>metre</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th>   <th>Unit</th></tr>
+     *   <tr><td>EPSG:106</td>  <td>Latitude (φ)</td>  <td>degree</td></tr>
+     *   <tr><td>EPSG:107</td>  <td>Longitude (λ)</td> <td>degree</td></tr>
+     *   <tr><td>EPSG:1</td>    <td>Easting (E)</td>   <td>metre</td></tr>
+     *   <tr><td>EPSG:2</td>    <td>Northing (N)</td>  <td>metre</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -1007,12 +1007,12 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="Authority codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::9002</td> <td>decimal degree</td></tr>
-     *   <tr><td>EPSG::9001</td> <td>metre</td></tr>
-     *   <tr><td>EPSG::9030</td> <td>kilometre</td></tr>
-     *   <tr><td>EPSG::1040</td> <td>second</td></tr>
-     *   <tr><td>EPSG::1029</td> <td>year</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:9002</td> <td>decimal degree</td></tr>
+     *   <tr><td>EPSG:9001</td> <td>metre</td></tr>
+     *   <tr><td>EPSG:9030</td> <td>kilometre</td></tr>
+     *   <tr><td>EPSG:1040</td> <td>second</td></tr>
+     *   <tr><td>EPSG:1029</td> <td>year</td></tr>
      * </table>
      *
      * See {@link org.apache.sis.measure.Units#valueOfEPSG(int)} for a more complete list of codes.</div>
@@ -1041,12 +1041,12 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="EPSG codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::8801</td> <td>Latitude of natural origin</td></tr>
-     *   <tr><td>EPSG::8802</td> <td>Longitude of natural origin</td></tr>
-     *   <tr><td>EPSG::8805</td> <td>Scale factor at natural origin</td></tr>
-     *   <tr><td>EPSG::8806</td> <td>False easting</td></tr>
-     *   <tr><td>EPSG::8807</td> <td>False northing</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:8801</td> <td>Latitude of natural origin</td></tr>
+     *   <tr><td>EPSG:8802</td> <td>Longitude of natural origin</td></tr>
+     *   <tr><td>EPSG:8805</td> <td>Scale factor at natural origin</td></tr>
+     *   <tr><td>EPSG:8806</td> <td>False easting</td></tr>
+     *   <tr><td>EPSG:8807</td> <td>False northing</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>
@@ -1104,11 +1104,11 @@ public abstract class GeodeticAuthorityF
      * A frequently used authority is "EPSG", which includes the following codes:
      *
      * <table class="sis" summary="EPSG codes examples">
-     *   <tr><th>Code</th>       <th>Description</th></tr>
-     *   <tr><td>EPSG::1133</td> <td>ED50 to WGS 84 (1)</td></tr>
-     *   <tr><td>EPSG::1241</td> <td>NAD27 to NAD83 (1)</td></tr>
-     *   <tr><td>EPSG::1173</td> <td>NAD27 to WGS 84 (4)</td></tr>
-     *   <tr><td>EPSG::6326</td> <td>NAD83(2011) to NAVD88 height (1)</td></tr>
+     *   <tr><th>Code</th>      <th>Description</th></tr>
+     *   <tr><td>EPSG:1133</td> <td>ED50 to WGS 84 (1)</td></tr>
+     *   <tr><td>EPSG:1241</td> <td>NAD27 to NAD83 (1)</td></tr>
+     *   <tr><td>EPSG:1173</td> <td>NAD27 to WGS 84 (4)</td></tr>
+     *   <tr><td>EPSG:6326</td> <td>NAD83(2011) to NAVD88 height (1)</td></tr>
      * </table></div>
      *
      * <div class="section">Default implementation</div>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -62,7 +62,7 @@ import java.util.Objects;
  * {@code IdentifiedObjectSet} can be used as the set returned by implementations of the
  * {@link GeodeticAuthorityFactory#createFromCoordinateReferenceSystemCodes(String, String)} method.
  * Deferred creation can have great performance impact since some set may contain as much as 40 entries
- * (e.g. transformations from <cite>"ED50"</cite> (EPSG::4230) to <cite>"WGS 84"</cite> (EPSG::4326))
+ * (e.g. transformations from <cite>"ED50"</cite> (EPSG:4230) to <cite>"WGS 84"</cite> (EPSG:4326))
  * while some users only want to look for the first entry.
  *
  * <div class="section">Exception handling</div>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -1839,7 +1839,7 @@ addURIs:    for (int i=0; ; i++) {
                 DefaultGeographicBoundingBox bbox = null;
                 if (!Double.isNaN(ymin) || !Double.isNaN(ymax) || !Double.isNaN(xmin) || !Double.isNaN(xmax)) {
                     /*
-                     * Fix an error found in EPSG::3790 New Zealand - South Island - Mount Pleasant mc
+                     * Fix an error found in EPSG:3790 New Zealand - South Island - Mount Pleasant mc
                      * for older database (this error is fixed in EPSG database 8.2).
                      *
                      * Do NOT apply anything similar for the x axis, because xmin > xmax is not error:
@@ -2165,7 +2165,7 @@ addURIs:    for (int i=0; ; i++) {
      * Current implementation first checks if {@link Units#valueOfEPSG(int)} can provide a hard-coded unit
      * for the given code before to try to parse the information found in the database. This is done that
      * way for better support of non-straightforward units like <cite>sexagesimal degrees</cite>
-     * (EPSG::9110 and 9111).
+     * (EPSG:9110 and 9111).
      *
      * <div class="note"><b>Example:</b>
      * some EPSG codes for units are:
@@ -2775,7 +2775,7 @@ addURIs:    for (int i=0; ; i++) {
             } while ((searchTransformations = !searchTransformations) == true);
             /*
              * Search finished. We may have a lot of coordinate operations
-             * (e.g. about 40 for "ED50" (EPSG::4230) to "WGS 84" (EPSG::4326)).
+             * (e.g. about 40 for "ED50" (EPSG:4230) to "WGS 84" (EPSG:4326)).
              * Alter the ordering using the information supplied in the supersession table.
              */
             final String[] codes = set.getAuthorityCodes();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -42,7 +42,7 @@
  * <div class="section">The EPSG dataset</div>
  * A widely-used factory is the <a href="http://www.epsg.org">EPSG geodetic dataset</a>.
  * EPSG codes are numerical identifiers.
- * For example {@code "EPSG::4326"} is the EPSG identifier for the <cite>"WGS 84"</cite> geographic CRS.
+ * For example {@code "EPSG:4326"} is the EPSG identifier for the <cite>"WGS 84"</cite> geographic CRS.
  * As an extension, the Apache SIS implementation accepts names as well as numeric identifiers.
  * For example the two following method calls fetch the same object:
  *

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -164,7 +164,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "WGS 84" geographic CRS (EPSG::4326).
+     * Tests the "WGS 84" geographic CRS (EPSG:4326).
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -174,16 +174,17 @@ public final strictfp class EPSGFactoryT
         final GeographicCRS crs = factory.createGeographicCRS("EPSG:4326");
         assertEpsgNameAndIdentifierEqual("WGS 84", 4326, crs);
         assertEpsgNameAndIdentifierEqual("World Geodetic System 1984", 6326, crs.getDatum());
-        assertAxisDirectionsEqual("EPSG::6422", crs.getCoordinateSystem(), AxisDirection.NORTH, AxisDirection.EAST);
+        assertAxisDirectionsEqual("EPSG:6422", crs.getCoordinateSystem(), AxisDirection.NORTH, AxisDirection.EAST);
 
         final BursaWolfParameters[] bwp = ((DefaultGeodeticDatum) crs.getDatum()).getBursaWolfParameters();
         assertEquals("Expected no Bursa-Wolf parameters.", 0, bwp.length);
 
         assertSame("CRS shall be cached", crs, factory.createCoordinateReferenceSystem("4326"));
+        assertSame("Shall accept \"::\"", crs, factory.createGeographicCRS("EPSG::4326"));
     }
 
     /**
-     * Tests the "Datum 73" geographic CRS (EPSG::4274), which has a datum different than the WGS84 one.
+     * Tests the "Datum 73" geographic CRS (EPSG:4274), which has a datum different than the WGS84 one.
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -203,7 +204,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "Lao 1997" geographic CRS (EPSG::4993) with an ellipsoidal height.
+     * Tests the "Lao 1997" geographic CRS (EPSG:4993) with an ellipsoidal height.
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -221,7 +222,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "ITRF93" geocentric CRS (EPSG::4915).
+     * Tests the "ITRF93" geocentric CRS (EPSG:4915).
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -238,7 +239,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "NAD27(76) / UTM zone 15N" projected CRS (EPSG::2027).
+     * Tests the "NAD27(76) / UTM zone 15N" projected CRS (EPSG:2027).
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -274,7 +275,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "Beijing 1954 / 3-degree Gauss-Kruger CM 135E" projected CRS (EPSG::2442).
+     * Tests the "Beijing 1954 / 3-degree Gauss-Kruger CM 135E" projected CRS (EPSG:2442).
      * This projected CRS has (North, East) axis orientations instead of (East, North).
      *
      * @throws FactoryException if an error occurred while querying the factory.
@@ -410,7 +411,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "Barcelona Grid B1" engineering CRS (EPSG::5801).
+     * Tests the "Barcelona Grid B1" engineering CRS (EPSG:5801).
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -744,7 +745,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests the "UTM zone 10N" conversion (EPSG::16010).
+     * Tests the "UTM zone 10N" conversion (EPSG:16010).
      *
      * @throws FactoryException if an error occurred while querying the factory.
      */
@@ -790,7 +791,7 @@ public final strictfp class EPSGFactoryT
         } catch (AssertionError error) {
             out.println("The following contains more information about a JUnit test failure.");
             out.println("See the JUnit report for the stack trace. Below is a cache dump.");
-            out.println("See the operation method EPSG::9807 and compare with:");
+            out.println("See the operation method EPSG:9807 and compare with:");
             out.print  ("  - Method obtained directly:   "); out.println(System.identityHashCode(copMethod));
             out.print  ("  - Method obtained indirectly: "); out.println(System.identityHashCode(crsMethod));
             out.println("Content of EPSGFactory cache:");
@@ -800,7 +801,7 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests longitude rotation (EPSG::1764). This is a very simple case for checking
+     * Tests longitude rotation (EPSG:1764). This is a very simple case for checking
      * that this part is okay before to try more complex transformations.
      *
      * @throws FactoryException if an error occurred while querying the factory.
@@ -815,8 +816,8 @@ public final strictfp class EPSGFactoryT
     }
 
     /**
-     * Tests "BD72 to WGS 84 (1)" (EPSG::1609) transformation. This one has an unusual unit for the
-     * "Scale difference" parameter (EPSG::8611). The value is 0.999999 and the unit is "unity" (EPSG::9201)
+     * Tests "BD72 to WGS 84 (1)" (EPSG:1609) transformation. This one has an unusual unit for the
+     * "Scale difference" parameter (EPSG:8611). The value is 0.999999 and the unit is "unity" (EPSG:9201)
      * instead of the usual "parts per million" (EPSG:9202).
      *
      * @throws FactoryException if an error occurred while querying the factory.
@@ -925,7 +926,7 @@ public final strictfp class EPSGFactoryT
                 "  AXIS[“Geodetic longitude”, EAST]]");
         /*
          * First, search for a CRS with axis order that does not match the ones in the EPSG database.
-         * IdentifiedObjectFinder should not accept EPSG::4326 as a match for the given CRS.
+         * IdentifiedObjectFinder should not accept EPSG:4326 as a match for the given CRS.
          */
         assertEquals("Full scan should be enabled by default.",
                 IdentifiedObjectFinder.Domain.VALID_DATASET, finder.getSearchDomain());

Modified: sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Conversion.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Conversion.xml?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Conversion.xml (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/operation/Conversion.xml Fri Feb 12 14:11:26 2016
@@ -26,7 +26,7 @@
                 xmlns:xlink        = "http://www.w3.org/1999/xlink"
                 gml:id             = "WorldMercator">
 
-  <gml:identifier codeSpace="test">3395</gml:identifier>  <!-- Not the real EPSG::3395 -->
+  <gml:identifier codeSpace="test">3395</gml:identifier>                    <!-- Not the real EPSG:3395 -->
   <gml:name>World Mercator</gml:name>
   <gml:domainOfValidity>
     <gmd:EX_Extent>
@@ -64,7 +64,7 @@
   </gml:coordinateOperationAccuracy>
   <gml:method>
     <gml:OperationMethod gml:id="Mercator">
-      <gml:identifier codeSpace="test">19883</gml:identifier>  <!-- Not the real EPSG::19883 -->
+      <gml:identifier codeSpace="test">19883</gml:identifier>               <!-- Not the real EPSG:19883 -->
       <gml:name>Mercator (1SP)</gml:name>
       <gml:formula>See EPSG guide.</gml:formula>
       <gml:sourceDimensions>2</gml:sourceDimensions>

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -149,7 +149,7 @@ public abstract class SetOfUnknownSize<E
          * iterate over the elements of this Set. The reason is that this Set may compute the values dynamically and
          * it is sometime difficult to ensure that this Set's iterator is fully consistent with the values recognized
          * by the contains(Object) method. For example the iterator may return "EPSG:4326" while the contains(Object)
-         * method may accept both "EPSG:4326" and "EPSG::4326". For this equals(Object) method, we consider the
+         * method may accept both "EPSG:4326" and "EPSG:4326". For this equals(Object) method, we consider the
          * contains(Object) method of the other Set as more reliable.
          */
         if (object == this) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -441,8 +441,10 @@ public final class DecimalFunctions exte
      *   <li>Otherwise this method returns {@code fractionDigits}.</li>
      * </ul>
      *
-     * Examples:
+     * <div class="note"><b>Note:</b>
+     * The threshold of 4 trailing fraction digits is arbitrary and may change in any future SIS version.</div>
      *
+     * <div class="note"><b>Examples:</b>
      * <ul>
      *   <li>{@code fractionDigitsForValue(179.12499999999824)} returns 14,
      *       the amount of digits after the decimal separator.</li>
@@ -455,9 +457,7 @@ public final class DecimalFunctions exte
      *   <li>{@code fractionDigitsForValue(179.12499997999999, 3)} returns 14 because rounding the 3 last digits
      *       results in 179.12499997000. The condition for 4 trailing zero fraction digits is not meet.</li>
      * </ul>
-     *
-     * <div class="note"><b>Note:</b>
-     * The threshold of 4 trailing fraction digits is arbitrary and may change in any future SIS version.</div>
+     * </div>
      *
      * @param  value The value for which to get the number of significant fraction fraction digits minus rounding error.
      * @param  uncertainDigits Number of trailing fraction digits which may be rounding error artefacts.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1730026&r1=1730025&r2=1730026&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] Fri Feb 12 14:11:26 2016
@@ -70,7 +70,7 @@ public final class Units extends Static
     public static final Unit<Duration> MILLISECOND = SI.MetricPrefix.MILLI(SI.SECOND);
 
     /**
-     * The EPSG::1029 definition of year.
+     * The EPSG:1029 definition of year.
      */
     private static final Unit<Duration> YEAR = SI.SECOND.divide(31556925.445);
 
@@ -593,8 +593,8 @@ public final class Units extends Static
      *
      * <p>The same unit may be represented by different EPSG codes depending on the context:</p>
      * <ul>
-     *   <li>EPSG::9102 – <cite>degree</cite> – is used for prime meridian and coordinate operation parameters.</li>
-     *   <li>EPSG::9122 – <cite>degree (supplier to define representation)</cite> – is used for coordinate system axes.</li>
+     *   <li>EPSG:9102 – <cite>degree</cite> – is used for prime meridian and coordinate operation parameters.</li>
+     *   <li>EPSG:9122 – <cite>degree (supplier to define representation)</cite> – is used for coordinate system axes.</li>
      * </ul>
      *
      * When such choice exists, the code to return is determined by the {@code inAxis} argument,



Mime
View raw message