Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,13 +18,12 @@ package org.apache.sis.referencing.cs;
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.measure.unit.Unit;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.RangeMeaning;
 import org.apache.sis.internal.metadata.AxisNames;
 import org.apache.sis.internal.metadata.AxisDirections;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -32,14 +31,14 @@ import org.apache.sis.internal.metadata.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final strictfp class HardCodedAxes {
     /**
      * Axis for geodetic longitudes in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing ordinates values go {@linkplain AxisDirection#EAST East}
-     * and units are {@linkplain NonSI#DEGREE_ANGLE degrees}.
+     * and units are {@linkplain Units#DEGREE degrees}.
      * The ISO 19111 name is <cite>"geodetic longitude"</cite> and the 
abbreviation is "λ" (lambda).
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link 
#GEODETIC_LATITUDE},
@@ -49,12 +48,12 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LATITUDE
      */
     public static final DefaultCoordinateSystemAxis GEODETIC_LONGITUDE = 
create(AxisNames.GEODETIC_LONGITUDE, "λ",
-            AxisDirection.EAST, NonSI.DEGREE_ANGLE, -180, 180, 
RangeMeaning.WRAPAROUND);
+            AxisDirection.EAST, Units.DEGREE, -180, 180, 
RangeMeaning.WRAPAROUND);
 
     /**
      * Axis for geodetic latitudes in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeographicCRS geographic CRS}.
      * Increasing ordinates values go {@linkplain AxisDirection#NORTH North}
-     * and units are {@linkplain NonSI#DEGREE_ANGLE degrees}.
+     * and units are {@linkplain Units#DEGREE degrees}.
      * The ISO 19111 name is <cite>"geodetic latitude"</cite> and the 
abbreviation is "φ" (phi).
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link 
#GEODETIC_LATITUDE},
@@ -64,42 +63,42 @@ public final strictfp class HardCodedAxe
      * @see #GEODETIC_LONGITUDE
      */
     public static final DefaultCoordinateSystemAxis GEODETIC_LATITUDE = 
create(AxisNames.GEODETIC_LATITUDE, "φ",
-            AxisDirection.NORTH, NonSI.DEGREE_ANGLE, -90, 90, 
RangeMeaning.EXACT);
+            AxisDirection.NORTH, Units.DEGREE, -90, 90, RangeMeaning.EXACT);
 
     /**
      * Identical to {@link #GEODETIC_LONGITUDE} except for the range of 
longitude values.
      */
     public static final DefaultCoordinateSystemAxis SHIFTED_LONGITUDE = 
create(AxisNames.GEODETIC_LONGITUDE, "λ",
-            AxisDirection.EAST, NonSI.DEGREE_ANGLE, 0, 360, 
RangeMeaning.WRAPAROUND);
+            AxisDirection.EAST, Units.DEGREE, 0, 360, RangeMeaning.WRAPAROUND);
 
     /**
-     * Axis for longitudes in gradian units.
+     * Axis for longitudes in grad units.
      * The axis name is {@code "Longitude"} (the {@code "Geodetic"} prefix is 
omitted for testing purpose).
-     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@link NonSI#GRADE}.
+     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@link Units#GRAD}.
      * The abbreviation is "λ" (lambda). The unit symbol is "gon".
      *
      * @see #GEODETIC_LONGITUDE
      * @see #SPHERICAL_LONGITUDE
      */
     public static final DefaultCoordinateSystemAxis LONGITUDE_gon = 
create(AxisNames.LONGITUDE, "λ",
-            AxisDirection.EAST, NonSI.GRADE, -200, 200, 
RangeMeaning.WRAPAROUND);
+            AxisDirection.EAST, Units.GRAD, -200, 200, 
RangeMeaning.WRAPAROUND);
 
     /**
-     * Axis for latitudes in gradian units.
+     * Axis for latitudes in grad units.
      * The axis name is {@code "Latitude"} (the {@code "Geodetic"} prefix is 
omitted for testing purpose).
-     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@link NonSI#GRADE}.
+     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@link Units#GRAD}.
      * The abbreviation is "φ" (phi). The unit symbol is "gon".
      *
      * @see #GEODETIC_LATITUDE
      * @see #SPHERICAL_LATITUDE
      */
     public static final DefaultCoordinateSystemAxis LATITUDE_gon = 
create(AxisNames.LATITUDE, "φ",
-            AxisDirection.NORTH, NonSI.GRADE, -100, 100, RangeMeaning.EXACT);
+            AxisDirection.NORTH, Units.GRAD, -100, 100, RangeMeaning.EXACT);
 
     /**
      * Axis for height values above the ellipsoid in a
      * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS 
geographic CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"ellipsoidal height"</cite> and the 
abbreviation is lower case <cite>"h"</cite>.
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link 
#GEODETIC_LATITUDE},
@@ -111,21 +110,21 @@ public final strictfp class HardCodedAxe
      * @see #DEPTH
      */
     public static final DefaultCoordinateSystemAxis ELLIPSOIDAL_HEIGHT = 
create(AxisNames.ELLIPSOIDAL_HEIGHT, "h",
-            AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for height values above the ellipsoid in a
      * {@linkplain org.apache.sis.referencing.crs.DefaultGeographicCRS 
geographic CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#CENTIMETRE centimetres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#CENTIMETRE centimetres}.
      *
      * @since 0.7
      */
     public static final DefaultCoordinateSystemAxis ELLIPSOIDAL_HEIGHT_cm = 
create(AxisNames.ELLIPSOIDAL_HEIGHT, "h",
-            AxisDirection.UP, SI.CENTIMETRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.CENTIMETRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for height values measured from gravity.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"gravity-related height"</cite> and the 
abbreviation is upper case <cite>"H"</cite>.
      *
      * @see #ALTITUDE
@@ -134,17 +133,17 @@ public final strictfp class HardCodedAxe
      * @see #DEPTH
      */
     public static final DefaultCoordinateSystemAxis GRAVITY_RELATED_HEIGHT = 
create(AxisNames.GRAVITY_RELATED_HEIGHT, "H",
-            AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * A height in centimetres.
      */
     public static final DefaultCoordinateSystemAxis HEIGHT_cm = 
create("Height", "h",
-            AxisDirection.UP, SI.CENTIMETRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.CENTIMETRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for altitude values.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#METRE metres}.
      * The abbreviation is lower case <cite>"h"</cite>.
      *
      * <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link 
#GEODETIC_LATITUDE},
@@ -156,11 +155,11 @@ public final strictfp class HardCodedAxe
      * @see #DEPTH
      */
     public static final DefaultCoordinateSystemAxis ALTITUDE = 
create("Altitude", "h",
-            AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for depth.
-     * Increasing ordinates values go {@linkplain AxisDirection#DOWN down} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#DOWN down} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"depth"</cite>.
      *
      * @see #ALTITUDE
@@ -169,12 +168,12 @@ public final strictfp class HardCodedAxe
      * @see #GRAVITY_RELATED_HEIGHT
      */
     public static final DefaultCoordinateSystemAxis DEPTH = 
create(AxisNames.DEPTH, "D",
-            AxisDirection.DOWN, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.DOWN, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for radius in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS 
spherical CS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"geocentric radius"</cite> and the 
abbreviation is upper-case <cite>"R"</cite>.
      *
      * <div class="note"><b>Note:</b>
@@ -193,13 +192,13 @@ public final strictfp class HardCodedAxe
      * @see #DEPTH
      */
     public static final DefaultCoordinateSystemAxis GEOCENTRIC_RADIUS = 
create(AxisNames.GEOCENTRIC_RADIUS, "R",
-            AxisDirection.UP, SI.METRE, 0, Double.POSITIVE_INFINITY, 
RangeMeaning.EXACT);
+            AxisDirection.UP, Units.METRE, 0, Double.POSITIVE_INFINITY, 
RangeMeaning.EXACT);
 
     /**
      * Axis for longitudes in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS 
spherical CS}.
      * Increasing ordinates values go {@linkplain AxisDirection#EAST East}
-     * and units are {@linkplain NonSI#DEGREE_ANGLE degrees}.
+     * and units are {@linkplain Units#DEGREE degrees}.
      * The ISO 19111 name is <cite>"spherical longitude"</cite> and the 
abbreviation is "θ" (theta).
      *
      * <p>This axis is close to the definition found in the EPSG database, 
except for the "long" abbreviation which
@@ -218,13 +217,13 @@ public final strictfp class HardCodedAxe
      * @see <a 
href="http://mathworld.wolfram.com/SphericalCoordinates.html";>Spherical 
coordinate system on MathWorld</a>
      */
     public static final DefaultCoordinateSystemAxis SPHERICAL_LONGITUDE = 
create(AxisNames.SPHERICAL_LONGITUDE, "θ",
-            AxisDirection.EAST, NonSI.DEGREE_ANGLE, -180, 180, 
RangeMeaning.WRAPAROUND);
+            AxisDirection.EAST, Units.DEGREE, -180, 180, 
RangeMeaning.WRAPAROUND);
 
     /**
      * Axis for latitudes in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultSphericalCS 
spherical CS}.
      * Increasing ordinates values go {@linkplain AxisDirection#NORTH North}
-     * and units are {@linkplain NonSI#DEGREE_ANGLE degrees}.
+     * and units are {@linkplain Units#DEGREE degrees}.
      * The ISO 19111 name is <cite>"spherical latitude"</cite> and the 
abbreviation is "φ′" (phi prime).
      *
      * <p>This axis is close to the definition found in the EPSG database, 
except for the "lat" abbreviation
@@ -241,11 +240,11 @@ public final strictfp class HardCodedAxe
      * @see #SPHERICAL_LONGITUDE
      */
     public static final DefaultCoordinateSystemAxis SPHERICAL_LATITUDE = 
create(AxisNames.SPHERICAL_LATITUDE, "φ′",
-            AxisDirection.NORTH, NonSI.DEGREE_ANGLE, -90, 90, 
RangeMeaning.EXACT);
+            AxisDirection.NORTH, Units.DEGREE, -90, 90, RangeMeaning.EXACT);
 
     /**
      * Axis for <var>x</var> values in a {@linkplain 
org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@linkplain Units#METRE metres}.
      * The abbreviation is lower case <cite>"x"</cite>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} 
set.</p>
@@ -257,11 +256,11 @@ public final strictfp class HardCodedAxe
      * @see #COLUMN
      */
     public static final DefaultCoordinateSystemAxis X = create("x", "x",
-            AxisDirection.EAST, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.EAST, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>y</var> values in a {@linkplain 
org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@linkplain Units#METRE metres}.
      * The abbreviation is lower case <cite>"y"</cite>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} 
set.</p>
@@ -273,23 +272,23 @@ public final strictfp class HardCodedAxe
      * @see #ROW
      */
     public static final DefaultCoordinateSystemAxis Y = create("y", "y",
-            AxisDirection.NORTH, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.NORTH, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>z</var> values in a {@linkplain 
org.apache.sis.referencing.cs.DefaultCartesianCS Cartesian CS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#UP up} and 
units are {@linkplain Units#METRE metres}.
      * The abbreviation is lower case <cite>"z"</cite>.
      *
      * <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z} 
set.</p>
      */
     public static final DefaultCoordinateSystemAxis Z = create("z", "z",
-            AxisDirection.UP, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.UP, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>x</var> values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS 
Cartesian CS}.
      * Increasing ordinates values goes typically toward prime meridian, but 
the actual axis direction
-     * is {@link AxisDirection#GEOCENTRIC_X GEOCENTRIC_X}. The units are 
{@linkplain SI#METRE metres}.
+     * is {@link AxisDirection#GEOCENTRIC_X GEOCENTRIC_X}. The units are 
{@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"Geocentric X"</cite> and the abbreviation 
is upper case <cite>"X"</cite>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
@@ -298,13 +297,13 @@ public final strictfp class HardCodedAxe
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link 
#GEOCENTRIC_Y}, {@link #GEOCENTRIC_Z} set.</p>
      */
     public static final DefaultCoordinateSystemAxis GEOCENTRIC_X = 
create(AxisNames.GEOCENTRIC_X, "X",
-            AxisDirection.GEOCENTRIC_X, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.GEOCENTRIC_X, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>y</var> values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS 
Cartesian CS}.
      * Increasing ordinates values goes typically toward East, but the actual 
axis direction is
-     * {@link AxisDirection#GEOCENTRIC_Y GEOCENTRIC_Y}. The units are 
{@linkplain SI#METRE metres}.
+     * {@link AxisDirection#GEOCENTRIC_Y GEOCENTRIC_Y}. The units are 
{@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"Geocentric Y"</cite> and the abbreviation 
is upper case <cite>"Y"</cite>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
@@ -313,13 +312,13 @@ public final strictfp class HardCodedAxe
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link 
#GEOCENTRIC_Y}, {@link #GEOCENTRIC_Z} set.</p>
      */
     public static final DefaultCoordinateSystemAxis GEOCENTRIC_Y = 
create(AxisNames.GEOCENTRIC_Y, "Y",
-            AxisDirection.GEOCENTRIC_Y, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.GEOCENTRIC_Y, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>z</var> values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultGeocentricCRS geocentric CRS}
      * using {@linkplain org.apache.sis.referencing.cs.DefaultCartesianCS 
Cartesian CS}.
      * Increasing ordinates values goes typically toward North, but the actual 
axis direction is
-     * {@link AxisDirection#GEOCENTRIC_Z GEOCENTRIC_Z}. The units are 
{@linkplain SI#METRE metres}.
+     * {@link AxisDirection#GEOCENTRIC_Z GEOCENTRIC_Z}. The units are 
{@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"Geocentric Z"</cite> and the abbreviation 
is upper case <cite>"Z"</cite>.
      *
      * <p>In legacy OGC 01-009 specification (still in use for WKT 1 format),
@@ -328,11 +327,11 @@ public final strictfp class HardCodedAxe
      * <p>This axis is usually part of a {@link #GEOCENTRIC_X}, {@link 
#GEOCENTRIC_Y}, {@link #GEOCENTRIC_Z} set.</p>
      */
     public static final DefaultCoordinateSystemAxis GEOCENTRIC_Z = 
create(AxisNames.GEOCENTRIC_Z, "Z",
-            AxisDirection.GEOCENTRIC_Z, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.GEOCENTRIC_Z, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for Easting values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#EAST East} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"easting"</cite> and the abbreviation is 
upper case <cite>"E"</cite>.
      *
      * <p>This axis is usually part of a {@link #EASTING}, {@link #NORTHING} 
set.</p>
@@ -342,11 +341,11 @@ public final strictfp class HardCodedAxe
      * @see #WESTING
      */
     public static final DefaultCoordinateSystemAxis EASTING = 
create(AxisNames.EASTING, "E",
-            AxisDirection.EAST, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.EAST, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for Westing values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#WEST West} and 
units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#WEST West} and 
units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"westing"</cite> and the abbreviation is 
upper case <cite>"W"</cite>.
      *
      * @see #X
@@ -354,11 +353,11 @@ public final strictfp class HardCodedAxe
      * @see #WESTING
      */
     public static final DefaultCoordinateSystemAxis WESTING = 
create(AxisNames.WESTING, "W",
-            AxisDirection.WEST, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.WEST, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for Northing values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#NORTH North} 
and units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"northing"</cite> and the abbreviation is 
upper case <cite>"N"</cite>.
      *
      * <p>This axis is usually part of a {@link #EASTING}, {@link #NORTHING} 
set.</p>
@@ -368,11 +367,11 @@ public final strictfp class HardCodedAxe
      * @see #SOUTHING
      */
     public static final DefaultCoordinateSystemAxis NORTHING = 
create(AxisNames.NORTHING, "N",
-            AxisDirection.NORTH, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.NORTH, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for Southing values in a {@linkplain 
org.apache.sis.referencing.crs.DefaultProjectedCRS projected CRS}.
-     * Increasing ordinates values go {@linkplain AxisDirection#SOUTH South} 
and units are {@linkplain SI#METRE metres}.
+     * Increasing ordinates values go {@linkplain AxisDirection#SOUTH South} 
and units are {@linkplain Units#METRE metres}.
      * The ISO 19111 name is <cite>"southing"</cite> and the abbreviation is 
upper case <cite>"S"</cite>.
      *
      * @see #Y
@@ -380,19 +379,19 @@ public final strictfp class HardCodedAxe
      * @see #SOUTHING
      */
     public static final DefaultCoordinateSystemAxis SOUTHING = 
create(AxisNames.SOUTHING, "S",
-            AxisDirection.SOUTH, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.SOUTH, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * An axis with North-East orientation.
      */
     public static final DefaultCoordinateSystemAxis NORTH_EAST = 
create("North-East", "NE",
-            AxisDirection.NORTH_EAST, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.NORTH_EAST, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * An axis with South-East orientation.
      */
     public static final DefaultCoordinateSystemAxis SOUTH_EAST = 
create("South-East", "SE",
-            AxisDirection.SOUTH_EAST, SI.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.SOUTH_EAST, Units.METRE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * An axis for a distance from an origin.
@@ -402,7 +401,7 @@ public final strictfp class HardCodedAxe
      * @see #GEOCENTRIC_RADIUS
      */
     public static final DefaultCoordinateSystemAxis DISTANCE = 
create("Distance", "r",
-            AxisDirections.AWAY_FROM, SI.METRE, 0, Double.POSITIVE_INFINITY, 
RangeMeaning.EXACT);
+            AxisDirections.AWAY_FROM, Units.METRE, 0, 
Double.POSITIVE_INFINITY, RangeMeaning.EXACT);
 
     /**
      * An axis with clockwise orientation.
@@ -410,7 +409,7 @@ public final strictfp class HardCodedAxe
      * (not to be confused with geodetic spherical coordinate system).
      */
     public static final DefaultCoordinateSystemAxis BEARING = 
create("Bearing", "θ",
-            AxisDirections.CLOCKWISE, NonSI.DEGREE_ANGLE, -180, +180, 
RangeMeaning.WRAPAROUND);
+            AxisDirections.CLOCKWISE, Units.DEGREE, -180, +180, 
RangeMeaning.WRAPAROUND);
 
     /**
      * An axis with for elevation angle.
@@ -418,15 +417,15 @@ public final strictfp class HardCodedAxe
      * (not to be confused with geodetic spherical coordinate system).
      */
     public static final DefaultCoordinateSystemAxis ELEVATION = 
create("Elevation", "φ",
-            AxisDirection.UP, NonSI.DEGREE_ANGLE, -90, +90, 
RangeMeaning.WRAPAROUND);
+            AxisDirection.UP, Units.DEGREE, -90, +90, RangeMeaning.WRAPAROUND);
 
     /**
      * Axis for time values in a {@linkplain 
org.apache.sis.referencing.cs.DefaultTimeCS time CS}.
-     * Increasing time go toward {@linkplain AxisDirection#FUTURE future} and 
units are {@linkplain NonSI#DAY days}.
+     * Increasing time go toward {@linkplain AxisDirection#FUTURE future} and 
units are {@linkplain Units#DAY days}.
      * The abbreviation is lower case <cite>"t"</cite>.
      */
     public static final DefaultCoordinateSystemAxis TIME = create("Time", "t",
-            AxisDirection.FUTURE, NonSI.DAY, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.FUTURE, Units.DAY, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for column indices in a {@linkplain 
org.opengis.coverage.grid.GridCoverage grid coverage}.
@@ -434,7 +433,7 @@ public final strictfp class HardCodedAxe
      * The abbreviation is lower case <cite>"i"</cite>.
      */
     public static final DefaultCoordinateSystemAxis COLUMN = create("Column", 
"i",
-            AxisDirection.COLUMN_POSITIVE, Unit.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.COLUMN_POSITIVE, Units.ONE, 
Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for row indices in a {@linkplain 
org.opengis.coverage.grid.GridCoverage grid coverage}.
@@ -442,7 +441,7 @@ public final strictfp class HardCodedAxe
      * The abbreviation is lower case <cite>"j"</cite>.
      */
     public static final DefaultCoordinateSystemAxis ROW = create("Row", "j",
-            AxisDirection.ROW_POSITIVE, Unit.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.ROW_POSITIVE, Units.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>x</var> values in a display device.
@@ -450,7 +449,7 @@ public final strictfp class HardCodedAxe
      * The abbreviation is lower case <cite>"x"</cite>.
      */
     public static final DefaultCoordinateSystemAxis DISPLAY_X = create("x", 
"x",
-            AxisDirection.DISPLAY_RIGHT, Unit.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.DISPLAY_RIGHT, Units.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Axis for <var>y</var> values in a display device.
@@ -458,7 +457,7 @@ public final strictfp class HardCodedAxe
      * The abbreviation is lower case <cite>"y"</cite>.
      */
     public static final DefaultCoordinateSystemAxis DISPLAY_Y = create("y", 
"y",
-            AxisDirection.DISPLAY_DOWN, Unit.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.DISPLAY_DOWN, Units.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Undefined or unknown axis. Axis direction is {@link AxisDirection#OTHER 
OTHER}
@@ -466,7 +465,7 @@ public final strictfp class HardCodedAxe
      * for axes that were not properly defined.
      */
     public static final DefaultCoordinateSystemAxis UNDEFINED = 
create("Undefined", "z",
-            AxisDirection.OTHER, Unit.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
+            AxisDirection.OTHER, Units.ONE, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, null);
 
     /**
      * Creates a new axis of the given name, abbreviation, direction and unit.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.cs;
 
 import java.util.Map;
-import javax.measure.unit.SI;
 import org.opengis.referencing.cs.AxisDirection;
 import org.apache.sis.measure.Units;
 
@@ -31,7 +30,7 @@ import static org.apache.sis.referencing
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final strictfp class HardCodedCS {
@@ -246,14 +245,14 @@ public final strictfp class HardCodedCS
     /**
      * A one-dimensional temporal CS with
      * <var>{@linkplain HardCodedAxes#TIME time}</var>,
-     * axis in {@linkplain javax.measure.unit.NonSI#DAY day} units.
+     * axis in {@linkplain Units#DAY day} units.
      */
     public static final DefaultTimeCS DAYS;
 
     /**
      * A one-dimensional temporal CS with
      * <var>{@linkplain HardCodedAxes#TIME time}</var>,
-     * axis in {@linkplain javax.measure.unit.SI#SECOND second} units.
+     * axis in {@linkplain Units#SECOND second} units.
      */
     public static final DefaultTimeCS SECONDS;
 
@@ -266,7 +265,7 @@ public final strictfp class HardCodedCS
     static {
         final Map<String,?> properties = getProperties(HardCodedAxes.TIME);
         DAYS         = new DefaultTimeCS(properties, HardCodedAxes.TIME);
-        SECONDS      = new DefaultTimeCS(properties, new 
DefaultCoordinateSystemAxis(properties, "t", AxisDirection.FUTURE, SI.SECOND));
+        SECONDS      = new DefaultTimeCS(properties, new 
DefaultCoordinateSystemAxis(properties, "t", AxisDirection.FUTURE, 
Units.SECOND));
         MILLISECONDS = new DefaultTimeCS(properties, new 
DefaultCoordinateSystemAxis(properties, "t", AxisDirection.FUTURE, 
Units.MILLISECOND));
     }
 

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,10 +18,10 @@ package org.apache.sis.referencing.cs;
 
 import java.util.Map;
 import java.util.Arrays;
-import javax.measure.unit.SI;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.measure.Units;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -36,7 +36,7 @@ import static org.apache.sis.test.Refere
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -156,7 +156,7 @@ public final strictfp class NormalizerTe
         final Map<String,?> properties = singletonMap(NAME_KEY, "Temporary 
axis");
         final CoordinateSystemAxis[] axis = new 
CoordinateSystemAxis[directions.length];
         for (int i=0; i<directions.length; i++) {
-            axis[i] = new DefaultCoordinateSystemAxis(properties, "none", 
directions[i], SI.METRE);
+            axis[i] = new DefaultCoordinateSystemAxis(properties, "none", 
directions[i], Units.METRE);
         }
         return axis;
     }
@@ -188,13 +188,13 @@ public final strictfp class NormalizerTe
         assertSame(HardCodedAxes.HEIGHT_cm, 
Normalizer.normalize(HardCodedAxes.HEIGHT_cm,
                 AxesConvention.CONVENTIONALLY_ORIENTED));                      
             // Do not change unit.
         assertAxisEquals("Height", "h", AxisDirection.UP,
-                Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, SI.METRE, 
null,
+                Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, 
Units.METRE, null,
                 Normalizer.normalize(HardCodedAxes.HEIGHT_cm, 
AxesConvention.NORMALIZED));
         /*
          * Test a change of direction from West to East.
          */
         assertAxisEquals(Vocabulary.format(Vocabulary.Keys.Unnamed), "E",
-                AxisDirection.EAST, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, SI.METRE, null,
+                AxisDirection.EAST, Double.NEGATIVE_INFINITY, 
Double.POSITIVE_INFINITY, Units.METRE, null,
                 Normalizer.normalize(HardCodedAxes.WESTING, 
AxesConvention.NORMALIZED));
     }
 }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.datum
 
 import java.util.Random;
 import javax.xml.bind.JAXBException;
-import javax.measure.unit.NonSI;
+import org.apache.sis.measure.Units;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.referencing.IdentifiedObjects;
@@ -37,7 +37,7 @@ import static org.apache.sis.test.Metada
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -222,7 +222,7 @@ public final strictfp class DefaultEllip
         assertEquals("semiMajorAxis",     20926202,           
ellipsoid.getSemiMajorAxis(), 0);
         assertEquals("semiMinorAxis",     20854895,           
ellipsoid.getSemiMinorAxis(), 0);
         assertEquals("inverseFlattening", 293.46630765562986, 
ellipsoid.getInverseFlattening(), 1E-12);
-        assertEquals("axisUnit",          NonSI.FOOT,         
ellipsoid.getAxisUnit());
+        assertEquals("axisUnit",          Units.FOOT,         
ellipsoid.getAxisUnit());
         /*
          * Marshall and compare to the original file.
          */

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,13 +19,12 @@ package org.apache.sis.referencing.datum
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.JAXBException;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.test.Validators;
+import org.apache.sis.measure.Units;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;
@@ -45,7 +44,7 @@ import static org.apache.sis.referencing
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -66,11 +65,11 @@ public final strictfp class DefaultGeode
     public void testCreateAndSerialize() {
         final Map<String,Object> properties = new HashMap<>();
         assertNull(properties.put(DefaultEllipsoid.NAME_KEY, "Asteroid"));
-        final DefaultEllipsoid ellipsoid = 
DefaultEllipsoid.createEllipsoid(properties, 1200, 1000, SI.METRE);
+        final DefaultEllipsoid ellipsoid = 
DefaultEllipsoid.createEllipsoid(properties, 1200, 1000, Units.METRE);
 
         properties.clear();
         assertNull(properties.put(DefaultEllipsoid.NAME_KEY, "Somewhere"));
-        final DefaultPrimeMeridian primeMeridian = new 
DefaultPrimeMeridian(properties, 12, NonSI.DEGREE_ANGLE);
+        final DefaultPrimeMeridian primeMeridian = new 
DefaultPrimeMeridian(properties, 12, Units.DEGREE);
 
         properties.clear();
         assertNull(properties.put("name",       "This is a name"));

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.referencing.datum;
 
-import javax.measure.unit.NonSI;
 import javax.measure.quantity.Angle;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
@@ -43,7 +42,7 @@ import static org.apache.sis.referencing
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.8
  * @module
  */
 @DependsOn(org.apache.sis.referencing.AbstractIdentifiedObjectTest.class)
@@ -74,7 +73,7 @@ public final strictfp class DefaultPrime
     public void testWKT_inGrads() {
         final DefaultPrimeMeridian pm = HardCodedDatum.PARIS;
         assertWktEquals(Convention.WKT1, "PRIMEM[“Paris”, 2.33722917, 
AUTHORITY[“EPSG”, “8903”]]", pm);
-        assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Paris”, 
2.5969213, Unit[“grade”, 0.015707963267948967],"
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Paris”, 
2.5969213, Unit[“grad”, 0.015707963267948967],"
                 + " Id[“EPSG”, 8903, 
URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
     }
 
@@ -183,17 +182,17 @@ public final strictfp class DefaultPrime
     public void testParisMeridian() throws JAXBException {
         final DefaultPrimeMeridian pm = 
unmarshalFile(DefaultPrimeMeridian.class, "PrimeMeridian.xml");
         assertIsParis(pm);
-        assertEquals("greenwichLongitude", 2.33722917, 
pm.getGreenwichLongitude(NonSI.DEGREE_ANGLE), 1E-12);
+        assertEquals("greenwichLongitude", 2.33722917, 
pm.getGreenwichLongitude(Units.DEGREE), 1E-12);
         assertEquals("Equivalent to 2°20′14.025″.", 
pm.getRemarks().toString());
         assertNull("name.codeSpace", pm.getName().getCodeSpace());
         assertWktEquals(Convention.WKT1,
                 "PRIMEM[“Paris”, 2.33722917, AUTHORITY[“EPSG”, “8903”]]", pm);
         assertWktEquals(Convention.WKT2,
-                "PRIMEM[“Paris”, 2.5969213, ANGLEUNIT[“grade”, 
0.015707963267948967], ID[“EPSG”, 8903, 
URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
+                "PRIMEM[“Paris”, 2.5969213, ANGLEUNIT[“grad”, 
0.015707963267948967], ID[“EPSG”, 8903, 
URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
         assertWktEquals(Convention.WKT2_SIMPLIFIED,
-                "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 
0.015707963267948967], Id[“EPSG”, 8903, 
URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
+                "PrimeMeridian[“Paris”, 2.5969213, Unit[“grad”, 
0.015707963267948967], Id[“EPSG”, 8903, 
URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
         assertWktEquals(Convention.INTERNAL,
-                "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 
0.015707963267948967, Id[“EPSG”, 9105]], Id[“EPSG”, 8903],\n" +
+                "PrimeMeridian[“Paris”, 2.5969213, Unit[“grad”, 
0.015707963267948967, Id[“EPSG”, 9105]], Id[“EPSG”, 8903],\n" +
                 "  Remark[“Equivalent to 2°20′14.025″.”]]", pm);
         assertXmlEquals(
                 "<gml:PrimeMeridian xmlns:gml=\"" + Namespaces.GML + "\">\n" +

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/GeodeticDatumMock.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,8 +17,7 @@
 package org.apache.sis.referencing.datum;
 
 import java.util.Date;
-import javax.measure.unit.Unit;
-import javax.measure.unit.SI;
+import javax.measure.Unit;
 import javax.measure.quantity.Length;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.extent.Extent;
@@ -27,6 +26,7 @@ import org.opengis.referencing.datum.Geo
 import org.opengis.referencing.datum.PrimeMeridian;
 import org.apache.sis.test.mock.IdentifiedObjectMock;
 import org.apache.sis.internal.metadata.ReferencingServices;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -34,7 +34,7 @@ import org.apache.sis.internal.metadata.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @SuppressWarnings("serial")
@@ -122,7 +122,7 @@ public final strictfp class GeodeticDatu
 
     @Override public PrimeMeridian        getPrimeMeridian()      {return 
PrimeMeridianMock.GREENWICH;}
     @Override public Ellipsoid            getEllipsoid()          {return 
this;}
-    @Override public Unit<Length>         getAxisUnit()           {return 
SI.METRE;}
+    @Override public Unit<Length>         getAxisUnit()           {return 
Units.METRE;}
     @Override public double               getSemiMajorAxis()      {return 
semiMajorAxis;}
     @Override public double               getSemiMinorAxis()      {return 
semiMinorAxis;}
     @Override public double               getInverseFlattening()  {return 
inverseFlattening;}

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,13 +19,12 @@ package org.apache.sis.referencing.datum
 import java.util.Date;
 import java.util.Map;
 import java.util.HashMap;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import org.opengis.referencing.datum.PixelInCell;
 import org.opengis.referencing.datum.VerticalDatumType;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.internal.metadata.VerticalDatumTypes;
 import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+import org.apache.sis.measure.Units;
 
 import static org.opengis.referencing.datum.Datum.*;
 import static 
org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
@@ -36,7 +35,7 @@ import static org.apache.sis.internal.ut
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.6
+ * @version 0.8
  * @module
  */
 public final strictfp class HardCodedDatum {
@@ -45,7 +44,7 @@ public final strictfp class HardCodedDat
      */
     public static final DefaultPrimeMeridian GREENWICH = new 
DefaultPrimeMeridian(
             properties("Greenwich", "8901", null),
-            0, NonSI.DEGREE_ANGLE);
+            0, Units.DEGREE);
 
     /**
      * Paris meridian (EPSG:8903), with angular measurements in grad.
@@ -54,7 +53,7 @@ public final strictfp class HardCodedDat
      */
     public static final DefaultPrimeMeridian PARIS = new DefaultPrimeMeridian(
             properties("Paris", "8903", null),
-            2.5969213, NonSI.GRADE);
+            2.5969213, Units.GRAD);
 
     /**
      * Old Paris meridian (EPSG:8914) defined as 2°20'13.95"E.
@@ -67,7 +66,7 @@ public final strictfp class HardCodedDat
      */
     public static final DefaultPrimeMeridian PARIS_RGS = new 
DefaultPrimeMeridian(
             properties("Paris RGS", "8914", null),
-            2 + (20 + 13.95/60)/60, NonSI.DEGREE_ANGLE);
+            2 + (20 + 13.95/60)/60, Units.DEGREE);
 
     /**
      * WGS 1984 datum (EPSG:6326). Prime meridian is Greenwich.
@@ -105,7 +104,7 @@ public final strictfp class HardCodedDat
     public static final DefaultGeodeticDatum TOKYO = new DefaultGeodeticDatum(
             properties("Tokyo 1918", "6301", "Geodetic survey."),
             DefaultEllipsoid.createFlattenedSphere(properties("Bessel 1841", 
"7004", null),
-                    6377397.155, 299.1528128, SI.METRE), GREENWICH);
+                    6377397.155, 299.1528128, Units.METRE), GREENWICH);
 
     /**
      * Japanese Geodetic Datum 2000 datum (EPSG:6612). Ellipsoid is GRS 1980 
and prime meridian is Greenwich.
@@ -116,7 +115,7 @@ public final strictfp class HardCodedDat
     public static final DefaultGeodeticDatum JGD2000 = new 
DefaultGeodeticDatum(
             properties("Japanese Geodetic Datum 2000", "6612", 
TOKYO.getScope()),
             DefaultEllipsoid.createFlattenedSphere(properties("GRS 1980", 
"7019", null),
-                    6378137, 298.257222101, SI.METRE), GREENWICH);
+                    6378137, 298.257222101, Units.METRE), GREENWICH);
 
     /**
      * Spherical datum based on GRS 1980 Authalic Sphere (EPSG:6047). Prime 
meridian is Greenwich.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/PrimeMeridianMock.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,11 +16,11 @@
  */
 package org.apache.sis.referencing.datum;
 
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import org.opengis.referencing.datum.PrimeMeridian;
 import org.apache.sis.test.mock.IdentifiedObjectMock;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -28,7 +28,7 @@ import org.apache.sis.test.mock.Identifi
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.8
  * @module
  */
 @SuppressWarnings("serial")
@@ -56,12 +56,12 @@ final strictfp class PrimeMeridianMock e
     }
 
     /**
-     * Returns the angular unit, which is fixed to {@link NonSI#DEGREE_ANGLE}.
+     * Returns the angular unit, which is fixed to {@link Units#DEGREE}.
      *
-     * @return {@link NonSI#DEGREE_ANGLE}.
+     * @return {@link Units#DEGREE}.
      */
     @Override
     public Unit<Angle> getAngularUnit() {
-        return NonSI.DEGREE_ANGLE;
+        return Units.DEGREE;
     }
 }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.facto
 
 import java.util.Set;
 import java.util.LinkedHashSet;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.referencing.IdentifiedObject;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,8 +20,6 @@ import java.util.Arrays;
 import java.util.Set;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import org.opengis.util.FactoryException;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.parameter.ParameterValueGroup;
@@ -39,6 +37,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.io.wkt.Convention;
+import org.apache.sis.measure.Units;
 
 // Test imports
 import org.apache.sis.test.DependsOnMethod;
@@ -215,7 +214,7 @@ public final strictfp class CommonAuthor
         assertEquals(Constants.CENTRAL_MERIDIAN, -123, 
p.parameter(Constants.CENTRAL_MERIDIAN)  .doubleValue(), STRICT);
         assertEquals(Constants.LATITUDE_OF_ORIGIN,  0, 
p.parameter(Constants.LATITUDE_OF_ORIGIN).doubleValue(), STRICT);
         assertEquals(Constants.FALSE_NORTHING,      0, 
p.parameter(Constants.FALSE_NORTHING)    .doubleValue(), STRICT);
-        assertEquals("axis[0].unit", SI.METRE, 
crs.getCoordinateSystem().getAxis(0).getUnit());
+        assertEquals("axis[0].unit", Units.METRE, 
crs.getCoordinateSystem().getAxis(0).getUnit());
         try {
             factory.createObject("AUTO:42001");
             fail("Should not have accepted incomplete code.");
@@ -237,7 +236,7 @@ public final strictfp class CommonAuthor
         assertSame("Legacy namespace.", crs, 
factory.createProjectedCRS("AUTO:42001,9002,-123,0"));
         assertEquals("name", "WGS 84 / UTM zone 10N", crs.getName().getCode());
         assertTrue("Expected no EPSG identifier because the axes are not in 
metres.", crs.getIdentifiers().isEmpty());
-        assertEquals("axis[0].unit", NonSI.FOOT, 
crs.getCoordinateSystem().getAxis(0).getUnit());
+        assertEquals("axis[0].unit", Units.FOOT, 
crs.getCoordinateSystem().getAxis(0).getUnit());
     }
 
     /**

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,9 +18,7 @@ package org.apache.sis.referencing.facto
 
 import java.util.Map;
 import java.util.Collections;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Length;
 import org.opengis.util.FactoryException;
@@ -46,6 +44,7 @@ import org.apache.sis.internal.system.De
 import org.apache.sis.referencing.operation.DefaultConversion;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.io.wkt.Convention;
+import org.apache.sis.measure.Units;
 
 // Test dependencies
 import org.opengis.test.referencing.ObjectFactoryTest;
@@ -179,14 +178,14 @@ public final strictfp class GeodeticObje
         /*
          * Prime meridian
          */
-        angularUnit = NonSI.DEGREE_ANGLE;
+        angularUnit = Units.DEGREE;
         meridian = datumFactory.createPrimeMeridian(name("Greenwich"), 0, 
angularUnit);
         assertWktEquals(Convention.WKT1,
                 "PRIMEM[“Greenwich”, 0.0]", meridian);
         /*
          * Ellipsoid
          */
-        linearUnit = SI.METRE;
+        linearUnit = Units.METRE;
         ellipsoid = datumFactory.createEllipsoid(name("Airy1830"), 
6377563.396, 6356256.910, linearUnit);
         assertWktEquals(Convention.WKT1,
                 "SPHEROID[“Airy1830”, 6377563.396, 299.3249753150345]", 
ellipsoid);

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,7 +20,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import javax.measure.unit.SI;
 import org.opengis.referencing.IdentifiedObject;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.referencing.crs.CRSAuthorityFactory;
@@ -39,6 +38,7 @@ import org.apache.sis.internal.system.Lo
 import org.apache.sis.metadata.iso.extent.Extents;
 import org.apache.sis.referencing.crs.HardCodedCRS;
 import org.apache.sis.referencing.datum.HardCodedDatum;
+import org.apache.sis.measure.Units;
 import org.apache.sis.test.LoggingWatcher;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
@@ -55,7 +55,7 @@ import static org.apache.sis.test.Assert
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn(AuthorityFactoryProxyTest.class)
@@ -207,7 +207,7 @@ public final strictfp class MultiAuthori
         assertSame("With spaces",   HardCodedCRS  .DEPTH,     
factory.createVerticalCRS  (" MoCk : : 9905"));
         assertSame("Version 0",     HardCodedDatum.SPHERE,    
factory.createGeodeticDatum("MOCK: 0:6047"));
         assertSame("With spaces",   Extents       .WORLD,     
factory.createExtent       ("MOCK: 2.3 : 1262"));
-        assertSame("With spaces",   SI            .METRE,     
factory.createUnit         (" MoCK : : 9001 "));
+        assertSame("With spaces",   Units         .METRE,     
factory.createUnit         (" MoCK : : 9001 "));
         assertEquals("Greenwich",   
factory.getDescriptionText("MOCK:8901").toString());
         try {
             factory.createGeodeticDatum("MOCK2:4326");
@@ -236,7 +236,7 @@ public final strictfp class MultiAuthori
         assertSame("With version",  HardCodedDatum.WGS84,     
factory.createDatum        ("urn:ogc:def:datum:mock:2.3:6326"));
         assertSame("Empty version", HardCodedDatum.GREENWICH, 
factory.createObject       ("urn:ogc:def:meridian: MoCk :: 8901"));
         assertSame("Version 0",     HardCodedDatum.SPHERE,    
factory.createGeodeticDatum("urn:ogc:def:datum:MOCK: 0 :6047"));
-        assertSame("Upper case",    SI            .METRE,     
factory.createUnit         ("URN:OGC:DEF:UOM:MOCK::9001"));
+        assertSame("Upper case",    Units         .METRE,     
factory.createUnit         ("URN:OGC:DEF:UOM:MOCK::9001"));
         try {
             factory.createGeographicCRS("urn:ogc:def:datum:MOCK::4326");
             fail("Should create an object of the wrong type.");

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -23,7 +23,7 @@ import java.util.Locale;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Collections;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterValueGroup;
@@ -83,7 +83,7 @@ import static org.apache.sis.test.Refere
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Vadim Semenov
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -493,11 +493,11 @@ public final strictfp class EPSGFactoryT
             for (int i=0; i<dimension; i++) {
                 final CoordinateSystemAxis ref  = expected.getAxis(i);
                 final CoordinateSystemAxis axis = deprecated.getAxis(i);
-                assertEquals("name",         ref.getName(),         
axis.getName());
-                assertEquals("alias",        ref.getAlias(),        
axis.getAlias());
-                assertEquals("direction",    ref.getDirection(),    
axis.getDirection());
-                assertEquals("rangeMeaning", ref.getRangeMeaning(), 
axis.getRangeMeaning());
-                assertEquals("unit",         ref.getUnit().toSI(),  
axis.getUnit().toSI());
+                assertEquals("name",         ref.getName(),                 
axis.getName());
+                assertEquals("alias",        ref.getAlias(),                
axis.getAlias());
+                assertEquals("direction",    ref.getDirection(),            
axis.getDirection());
+                assertEquals("rangeMeaning", ref.getRangeMeaning(),         
axis.getRangeMeaning());
+                assertEquals("unit",         ref.getUnit().getSystemUnit(), 
axis.getUnit().getSystemUnit());
             }
         }
     }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -321,7 +321,7 @@ public final strictfp class CoordinateOp
                 "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Latitude (φ)”, NORTH],\n" +
                 "    Axis[“Longitude (λ)”, EAST],\n" +
-                "    Unit[“grade”, 0.015707963267949],\n" +
+                "    Unit[“grad”, 0.015707963267949],\n" +
                 "  Id[“EPSG”, “4807”]]");
 
         final GeographicCRS       targetCRS = CommonCRS.WGS84.geographic();

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -154,7 +154,7 @@ public final strictfp class CoordinateOp
                 "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Latitude (φ)”, NORTH],\n" +
                 "    Axis[“Longitude (λ)”, EAST],\n" +
-                "    Unit[“grade”, 0.015707963267948967]]");
+                "    Unit[“grad”, 0.015707963267948967]]");
                 // Intentionally omit Id[“EPSG”, 4807] for testing capability 
to find it back.
 
         final CoordinateReferenceSystem targetCRS = 
CommonCRS.WGS84.geographic();
@@ -224,7 +224,7 @@ public final strictfp class CoordinateOp
                 "  CS[ellipsoidal, 2],\n" +
                 "    Axis[“Longitude (λ)”, EAST],\n" +
                 "    Axis[“Latitude (φ)”, NORTH],\n" +
-                "    Unit[“grade”, 0.015707963267948967]]");
+                "    Unit[“grad”, 0.015707963267948967]]");
 
         final CoordinateReferenceSystem sourceCRS = 
CommonCRS.WGS84.normalizedGeographic();
         final CoordinateOperation operation = 
registry.createOperation(sourceCRS, targetCRS);
@@ -254,8 +254,8 @@ public final strictfp class CoordinateOp
                 "  $NTF,\n" +
                 "    PrimeMeridian[“Paris”, 2.5969213],\n" +
                 "  CS[ellipsoidal, 3],\n" +
-                "    Axis[“Latitude (φ)”, NORTH, Unit[“grade”, 
0.015707963267948967]],\n" +
-                "    Axis[“Longitude (λ)”, EAST, Unit[“grade”, 
0.015707963267948967]],\n" +
+                "    Axis[“Latitude (φ)”, NORTH, Unit[“grad”, 
0.015707963267948967]],\n" +
+                "    Axis[“Longitude (λ)”, EAST, Unit[“grad”, 
0.015707963267948967]],\n" +
                 "    Axis[“Height (h)”, UP, Unit[“m”, 1]]]");
 
         final CoordinateReferenceSystem targetCRS = 
CommonCRS.WGS84.geographic3D();

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -67,7 +67,7 @@ import static org.apache.sis.test.Metada
 public final strictfp class DefaultConversionTest extends TestCase {
     /**
      * The rotation from a CRS using the Paris prime meridian to a CRS using 
the Greenwich prime meridian,
-     * in degrees. The definitive value is 2.5969213 grades.
+     * in degrees. The definitive value is 2.5969213 grads.
      */
     private static final double OFFSET = 2.33722917;
 

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -93,7 +93,7 @@ public final strictfp class DefaultCoord
                 "    Datum[“Nouvelle Triangulation Française (Paris)”,\n" +
                 "      Ellipsoid[“Clarke 1880 (IGN)”, 6378249.2, 
293.4660212936269]],\n" +
                 "      PrimeMeridian[“Paris”, 2.5969213],\n" +
-                "    Unit[“grade”, 0.015707963267948967]]\n," +
+                "    Unit[“grad”, 0.015707963267948967]]\n," +
                 "  Conversion[“Lambert zone II”,\n" +
                 "    Method[“Lambert Conic Conformal (1SP)”],\n" +
                 "    Parameter[“Latitude of natural origin”, 52.0],\n" +

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
 import javax.xml.bind.JAXBException;
-import javax.measure.unit.NonSI;
 import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
@@ -33,6 +32,7 @@ import org.opengis.referencing.crs.Geode
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.OperationMethod;
 import org.opengis.test.Validators;
+import org.apache.sis.measure.Units;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.internal.referencing.provider.Mercator1SP;
 import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroupTest;
@@ -55,7 +55,7 @@ import static org.apache.sis.test.Refere
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -71,8 +71,8 @@ public final strictfp class SingleOperat
         final ParameterBuilder builder = new ParameterBuilder();
         builder.setCodeSpace(EPSG, "EPSG").setRequired(true);
         ParameterDescriptor<?>[] parameters = {
-            builder.addIdentifier("8801").addName("Latitude of natural origin" 
).create(0, NonSI.DEGREE_ANGLE),
-            builder.addIdentifier("8802").addName("Longitude of natural 
origin").create(0, NonSI.DEGREE_ANGLE)
+            builder.addIdentifier("8801").addName("Latitude of natural origin" 
).create(0, Units.DEGREE),
+            builder.addIdentifier("8802").addName("Longitude of natural 
origin").create(0, Units.DEGREE)
             // There is more parameters for a Mercator projection, but 2 is 
enough for this test.
         };
         builder.addName(null, "Mercator (1SP)");
@@ -221,9 +221,9 @@ public final strictfp class SingleOperat
         assertSame("parameters.descriptors", method.getParameters(), 
parameters.getDescriptor());
 
         final ParameterValue<?> parameter = (ParameterValue<?>) 
getSingleton(parameters.values());
-        assertSame  ("parameters.descriptor", descriptor,  
parameter.getDescriptor());
-        assertEquals("parameters.unit",       NonSI.GRADE, 
parameter.getUnit());
-        assertEquals("parameters.value",      2.5969213,   
parameter.getValue());
+        assertSame  ("parameters.descriptor", descriptor, 
parameter.getDescriptor());
+        assertEquals("parameters.unit",       Units.GRAD, parameter.getUnit());
+        assertEquals("parameters.value",      2.5969213,  
parameter.getValue());
 
         final CoordinateReferenceSystem sourceCRS = c.getSourceCRS();
         assertInstanceOf("sourceCRS",            GeodeticCRS.class,  
sourceCRS);

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.referencing.operation.projection;
 
-import javax.measure.unit.SI;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.OperationMethod;
@@ -28,6 +27,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.measure.Units;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.junit.Test;
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
  * @author  Rémi Marechal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -131,11 +131,11 @@ public final strictfp class ObliqueStere
         /*
          * Following parameters are reproduced verbatim from EPSG registry and 
EPSG guide.
          */
-        p.parameter("Latitude of natural origin")    .setValue(φ0, SI.RADIAN);
-        p.parameter("Longitude of natural origin")   .setValue(λ0, SI.RADIAN);
+        p.parameter("Latitude of natural origin")    .setValue(φ0, 
Units.RADIAN);
+        p.parameter("Longitude of natural origin")   .setValue(λ0, 
Units.RADIAN);
         p.parameter("Scale factor at natural origin").setValue(k0);
-        p.parameter("False easting")                 .setValue(FE, SI.METRE);
-        p.parameter("False northing")                .setValue(FN, SI.METRE);
+        p.parameter("False easting")                 .setValue(FE, 
Units.METRE);
+        p.parameter("False northing")                .setValue(FN, 
Units.METRE);
 
         transform = new ObliqueStereographic(op, (Parameters) p);
     }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.referencing.operation.transform;
 
-import javax.measure.unit.SI;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.SphericalCS;
@@ -26,6 +25,7 @@ import org.apache.sis.referencing.crs.De
 import org.apache.sis.referencing.cs.CoordinateSystems;
 import org.apache.sis.referencing.cs.AxesConvention;
 import org.apache.sis.referencing.CommonCRS;
+import org.apache.sis.measure.Units;
 
 // Test dependencies
 import org.opengis.test.referencing.TransformTestCase;
@@ -42,7 +42,7 @@ import org.junit.Test;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -84,7 +84,7 @@ public final strictfp class CoordinateSy
      * Returns the given coordinate system but with linear axes in centimetres 
instead of metres.
      */
     private static CoordinateSystem toCentimetres(final CoordinateSystem cs) {
-        return CoordinateSystems.replaceLinearUnit(cs, SI.CENTIMETRE);
+        return CoordinateSystems.replaceLinearUnit(cs, Units.CENTIMETRE);
     }
 
     /**

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.operation.transform;
 
 import java.util.Iterator;
-import javax.measure.unit.SI;
 import org.opengis.util.FactoryException;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.referencing.datum.Ellipsoid;
@@ -29,6 +28,7 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.geometry.DirectPosition2D;
 import org.apache.sis.geometry.GeneralDirectPosition;
+import org.apache.sis.measure.Units;
 
 import static java.lang.StrictMath.toRadians;
 
@@ -47,7 +47,7 @@ import static org.apache.sis.test.Assert
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -152,7 +152,7 @@ public final strictfp class EllipsoidToC
     public void testHighEccentricity() throws FactoryException, 
TransformException, FactoryException {
         transform = EllipsoidToCentricTransform.createGeodeticConversion(
                 DefaultFactories.forBuildin(MathTransformFactory.class),
-                6000000, 4000000, SI.METRE, true, 
EllipsoidToCentricTransform.TargetType.CARTESIAN);
+                6000000, 4000000, Units.METRE, true, 
EllipsoidToCentricTransform.TargetType.CARTESIAN);
 
         final double delta = toRadians(100.0 / 60) / 1852;
         derivativeDeltas  = new double[] {delta, delta, 100};

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.operation.transform;
 
 import java.util.Iterator;
-import javax.measure.unit.SI;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
@@ -25,6 +24,7 @@ import org.opengis.referencing.operation
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.referencing.datum.HardCodedDatum;
 import org.apache.sis.referencing.operation.matrix.Matrices;
+import org.apache.sis.measure.Units;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
@@ -38,7 +38,7 @@ import static org.opengis.test.Assert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -209,7 +209,7 @@ public final strictfp class TransformSep
     @DependsOnMethod("testLinearTransform")
     public void testPassThroughTransform() throws FactoryException {
         final MathTransform nonLinear = new 
EllipsoidToCentricTransform(6378137, 6356752.314245179,
-                SI.METRE, false, 
EllipsoidToCentricTransform.TargetType.CARTESIAN);
+                Units.METRE, false, 
EllipsoidToCentricTransform.TargetType.CARTESIAN);
         final TransformSeparator s = new 
TransformSeparator(PassThroughTransform.create(2, nonLinear, 3));
         /*
          * Trivial case: no dimension specified, we should get the transform 
unchanged.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,7 +20,7 @@ import java.util.Collection;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
 import java.awt.geom.AffineTransform;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.geometry.Envelope;
 import org.opengis.metadata.Identifier;
 import org.opengis.parameter.GeneralParameterValue;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -24,7 +24,6 @@ import java.io.StringWriter;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.JAXBException;
-import javax.measure.unit.SI;
 
 import org.opengis.metadata.*;
 import org.opengis.metadata.citation.*;
@@ -46,6 +45,7 @@ import org.opengis.referencing.crs.Verti
 import org.opengis.referencing.datum.VerticalDatum;
 import org.opengis.referencing.datum.VerticalDatumType;
 
+import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.*;
 import org.apache.sis.metadata.iso.citation.*;
 import org.apache.sis.metadata.iso.constraint.*;
@@ -97,7 +97,7 @@ import java.nio.charset.StandardCharsets
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.5
- * @version 0.7
+ * @version 0.8
  * @module
  *
  * @see org.apache.sis.metadata.iso.DefaultMetadataTest
@@ -271,7 +271,7 @@ public strictfp class MetadataTest exten
             {
                 final DefaultCoordinateSystemAxis axis = new 
DefaultCoordinateSystemAxis(
                         singletonMap(DefaultCoordinateSystemAxis.NAME_KEY, new 
NamedIdentifier(null, "Depth")),
-                        "d", AxisDirection.DOWN, SI.METRE);
+                        "d", AxisDirection.DOWN, Units.METRE);
 
                 final DefaultVerticalCS cs = new DefaultVerticalCS(
                         singletonMap(DefaultVerticalCS.NAME_KEY, new 
NamedIdentifier(null, "Depth")),

Modified: 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -23,6 +23,7 @@ import java.nio.charset.UnsupportedChars
 import java.net.URISyntaxException;
 import java.net.MalformedURLException;
 import java.nio.file.InvalidPathException;
+import javax.measure.format.ParserException;
 import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.Locales;
 import org.apache.sis.util.Numbers;
@@ -302,12 +303,12 @@ abstract class StringConverter<T> extend
         }
     }
 
-    public static final class Unit extends 
StringConverter<javax.measure.unit.Unit<?>> {
+    public static final class Unit extends 
StringConverter<javax.measure.Unit<?>> {
         private static final long serialVersionUID = -1809497218136016210L;
         @SuppressWarnings("unchecked")
-        public Unit() {super((Class) javax.measure.unit.Unit.class);}          
     // Instantiated by ServiceLoader.
+        public Unit() {super((Class) javax.measure.Unit.class);}               
// Instantiated by ServiceLoader.
 
-        @Override javax.measure.unit.Unit<?> doConvert(String source) throws 
IllegalArgumentException {
+        @Override javax.measure.Unit<?> doConvert(String source) throws 
ParserException {
             return Units.valueOf(source);
         }
     }

Modified: 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,11 +16,11 @@
  */
 package org.apache.sis.internal.jaxb.gco;
 
-import javax.measure.unit.SI;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.apache.sis.internal.jaxb.gml.Measure;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.sis.internal.jaxb.gml.
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 @XmlType(name = "Distance_PropertyType")
@@ -60,7 +60,7 @@ public final class GO_Distance extends X
      *       replace the Double type by some quantity type.
      */
     private GO_Distance(final Double value) {
-        distance = new Measure(value, SI.METRE);
+        distance = new Measure(value, Units.METRE);
         distance.asXPointer = true;
     }
 

Modified: 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,11 +16,11 @@
  */
 package org.apache.sis.internal.jaxb.gco;
 
-import javax.measure.unit.SI;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.apache.sis.internal.jaxb.gml.Measure;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.sis.internal.jaxb.gml.
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.8
  * @module
  */
 @XmlType(name = "Measure_PropertyType")
@@ -60,7 +60,7 @@ public final class GO_Measure extends Xm
      *       replace the Double type by some quantity type.
      */
     private GO_Measure(final Double value) {
-        measure = new Measure(value, SI.METRE);
+        measure = new Measure(value, Units.METRE);
         measure.asXPointer = true;
     }
 

Modified: 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.internal.jaxb.gco;
 
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.gml.Measure;



Reply via email to