Author: desruisseaux
Date: Fri Mar 20 20:48:23 2015
New Revision: 1668146
URL: http://svn.apache.org/r1668146
Log:
Javadoc: other replacements for consistency.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1668146&r1=1668145&r2=1668146&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Fri Mar 20 20:48:23 2015
@@ -173,7 +173,7 @@ public class DefaultCoordinateSystemAxis
/**
* The abbreviation used for this coordinate system axes.
- * Examples are "<var>X</var>" and "<var>Y</var>".
+ * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
*/
@XmlElement(name = "axisAbbrev", required = true)
private final String abbreviation;
@@ -412,7 +412,7 @@ public class DefaultCoordinateSystemAxis
/**
* Returns the abbreviation used for this coordinate system axes.
- * Examples are "<var>X</var>" and "<var>Y</var>".
+ * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
*
* @return The coordinate system axis abbreviation.
*/
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java?rev=1668146&r1=1668145&r2=1668146&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
[UTF-8] Fri Mar 20 20:48:23 2015
@@ -98,7 +98,7 @@ public final strictfp class HardCodedAxe
* 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}.
- * The ISO 19111 name is <cite>"ellipsoidal height"</cite> and the
abbreviation is lower case "<var>h</var>".
+ * 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},
* {@link #ELLIPSOIDAL_HEIGHT} set.</p>
@@ -114,7 +114,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for height values measured from gravity.
* Increasing ordinates values go {@linkplain AxisDirection#UP up} and
units are {@linkplain SI#METRE metres}.
- * The ISO 19111 name is <cite>"gravity-related height"</cite> and the
abbreviation is upper case "<var>H</var>".
+ * The ISO 19111 name is <cite>"gravity-related height"</cite> and the
abbreviation is upper case <cite>"H"</cite>.
*
* @see #ALTITUDE
* @see #ELLIPSOIDAL_HEIGHT
@@ -133,7 +133,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for altitude values.
* Increasing ordinates values go {@linkplain AxisDirection#UP up} and
units are {@linkplain SI#METRE metres}.
- * The abbreviation is lower case "<var>h</var>".
+ * The abbreviation is lower case <cite>"h"</cite>.
*
* <p>This axis is usually part of a {@link #GEODETIC_LONGITUDE}, {@link
#GEODETIC_LATITUDE},
* {@link #ALTITUDE} tuple.</p>
@@ -163,7 +163,7 @@ public final strictfp class HardCodedAxe
* 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}.
- * The ISO 19111 name is <cite>"geocentric radius"</cite> and the
abbreviation is lower case "<var>r</var>".
+ * The ISO 19111 name is <cite>"geocentric radius"</cite> and the
abbreviation is lower case <cite>"r"</cite>.
*
* <p>This axis is usually part of a {@link #SPHERICAL_LONGITUDE}, {@link
#SPHERICAL_LATITUDE},
* {@link #GEOCENTRIC_RADIUS} set.</p>
@@ -211,7 +211,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The abbreviation is lower case "<var>x</var>".
+ * The abbreviation is lower case <cite>"x"</cite>.
*
* <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z}
set.</p>
*
@@ -227,7 +227,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The abbreviation is lower case "<var>y</var>".
+ * The abbreviation is lower case <cite>"y"</cite>.
*
* <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z}
set.</p>
*
@@ -243,7 +243,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The abbreviation is lower case "<var>z</var>".
+ * The abbreviation is lower case <cite>"z"</cite>.
*
* <p>This axis is usually part of a {@link #X}, {@link #Y}, {@link #Z}
set.</p>
*/
@@ -255,7 +255,7 @@ public final strictfp class HardCodedAxe
* 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}.
- * The ISO 19111 name is <cite>"Geocentric X"</cite> and the abbreviation
is upper case "<var>X</var>".
+ * 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),
* the direction was {@link AxisDirection#OTHER OTHER}).</p>
@@ -270,7 +270,7 @@ public final strictfp class HardCodedAxe
* 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}.
- * The ISO 19111 name is <cite>"Geocentric Y"</cite> and the abbreviation
is upper case "<var>Y</var>".
+ * 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),
* the direction was {@link AxisDirection#EAST EAST}).</p>
@@ -285,7 +285,7 @@ public final strictfp class HardCodedAxe
* 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}.
- * The ISO 19111 name is <cite>"Geocentric Z"</cite> and the abbreviation
is upper case "<var>Z</var>".
+ * 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),
* the direction was {@link AxisDirection#NORTH NORTH}).</p>
@@ -298,7 +298,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The ISO 19111 name is <cite>"easting"</cite> and the abbreviation is
upper case "<var>E</var>".
+ * 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>
*
@@ -312,7 +312,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The ISO 19111 name is <cite>"westing"</cite> and the abbreviation is
upper case "<var>W</var>".
+ * The ISO 19111 name is <cite>"westing"</cite> and the abbreviation is
upper case <cite>"W"</cite>.
*
* @see #X
* @see #EASTING
@@ -324,7 +324,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The ISO 19111 name is <cite>"northing"</cite> and the abbreviation is
upper case "<var>N</var>".
+ * 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>
*
@@ -338,7 +338,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The ISO 19111 name is <cite>"southing"</cite> and the abbreviation is
upper case "<var>S</var>".
+ * The ISO 19111 name is <cite>"southing"</cite> and the abbreviation is
upper case <cite>"S"</cite>.
*
* @see #Y
* @see #NORTHING
@@ -362,7 +362,7 @@ public final strictfp class HardCodedAxe
/**
* 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}.
- * The abbreviation is lower case "<var>t</var>".
+ * 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);
@@ -370,7 +370,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for column indices in a {@linkplain
org.opengis.coverage.grid.GridCoverage grid coverage}.
* Increasing values go toward {@linkplain AxisDirection#COLUMN_POSITIVE
positive column number}.
- * The abbreviation is lower case "<var>i</var>".
+ * 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);
@@ -378,7 +378,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for row indices in a {@linkplain
org.opengis.coverage.grid.GridCoverage grid coverage}.
* Increasing values go toward {@linkplain AxisDirection#ROW_POSITIVE
positive row number}.
- * The abbreviation is lower case "<var>j</var>".
+ * 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);
@@ -386,7 +386,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for <var>x</var> values in a display device.
* Increasing values go toward {@linkplain AxisDirection#DISPLAY_RIGHT
display right}.
- * The abbreviation is lower case "<var>x</var>".
+ * 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);
@@ -394,7 +394,7 @@ public final strictfp class HardCodedAxe
/**
* Axis for <var>y</var> values in a display device.
* Increasing values go toward {@linkplain AxisDirection#DISPLAY_DOWN
display down}.
- * The abbreviation is lower case "<var>y</var>".
+ * 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);
