You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/02/27 13:13:07 UTC
svn commit: r1572529 [2/4] - in /sis/branches/JDK6: ./
application/sis-console/src/site/apt/ application/sis-webapp/src/site/apt/
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
core/sis-build-helper/src/main/java/org/apache/sis/uti...
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -43,9 +43,10 @@ import org.apache.sis.internal.jdk7.Obje
* This is not specific to this implementation; in Java2D too, the visual axis orientation depend
* on the {@linkplain java.awt.Graphics2D#getTransform() affine transform in the graphics context}.</p>
*
- * {@note The rational for avoiding axis orientation restriction is that other <code>DirectPosition</code>
- * implementations do not have such restriction, and it would be hard to generalize.
- * For example there is no clear "x" or "y" classification for North-East direction.}
+ * <div class="note"><b>Note:</b>
+ * The rational for avoiding axis orientation restriction is that other {@code DirectPosition} implementations
+ * do not have such restriction, and it would be hard to generalize. For example there is no clear "x" or "y"
+ * classification for North-East direction.</div>
*
* {@section Caution when used in collections}
* Do not mix instances of this class with ordinary {@link Point2D} instances
@@ -213,11 +214,10 @@ public class DirectPosition2D extends Po
}
/**
- * Returns a sequence of numbers that hold the coordinate of this position in its
- * reference system.
+ * Returns a sequence of numbers that hold the coordinate of this position in its reference system.
*
- * {@note This method is final for ensuring consistency with the <code>x</code>
- * and <code>y</code> fields, which are public.}
+ * <div class="note"><b>API note:</b>
+ * This method is final for ensuring consistency with the {@code x} and {@code y} fields, which are public.</div>
*
* @return The coordinate.
*/
@@ -229,8 +229,8 @@ public class DirectPosition2D extends Po
/**
* Returns the ordinate at the specified dimension.
*
- * {@note This method is final for ensuring consistency with the <code>x</code>
- * and <code>y</code> fields, which are public.}
+ * <div class="note"><b>API note:</b>
+ * This method is final for ensuring consistency with the {@code x} and {@code y} fields, which are public.</div>
*
* @param dimension The dimension in the range 0 to 1 inclusive.
* @return The coordinate at the specified dimension.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -302,13 +302,13 @@ public class Envelope2D extends Rectangl
* <p>The object returned by this method is a copy. Change in the returned position
* will not affect this envelope, and conversely.</p>
*
- * {@note The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended
- * interpretation of the bounding box definition. In a WCS 1.1 data structure, the lower
- * corner defines the edges region in the directions of <em>decreasing</em> coordinate
- * values in the envelope CRS. This is usually the algebraic minimum coordinates, but not
- * always. For example, an envelope spanning the anti-meridian could have a lower corner
- * longitude greater than the upper corner longitude. Such extended interpretation applies
- * mostly to axes having <code>WRAPAROUND</code> range meaning.}
+ * <div class="note"><b>Note:</b>
+ * The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended interpretation of the
+ * bounding box definition. In a WCS 1.1 data structure, the lower corner defines the edges region in the
+ * directions of <em>decreasing</em> coordinate values in the envelope CRS. This is usually the algebraic
+ * minimum coordinates, but not always. For example, an envelope spanning the anti-meridian could have a
+ * lower corner longitude greater than the upper corner longitude. Such extended interpretation applies
+ * mostly to axes having {@code WRAPAROUND} range meaning.</div>
*
* @return A copy of the lower corner, typically (but not necessarily) containing minimal ordinate values.
*/
@@ -325,13 +325,13 @@ public class Envelope2D extends Rectangl
* <p>The object returned by this method is a copy. Change in the returned position
* will not affect this envelope, and conversely.</p>
*
- * {@note The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended
- * interpretation of the bounding box definition. In a WCS 1.1 data structure, the upper
- * corner defines the edges region in the directions of <em>increasing</em> coordinate
- * values in the envelope CRS. This is usually the algebraic maximum coordinates, but not
- * always. For example, an envelope spanning the anti-meridian could have an upper corner
- * longitude less than the lower corner longitude. Such extended interpretation applies
- * mostly to axes having <code>WRAPAROUND</code> range meaning.}
+ * <div class="note"><b>Note:</b>
+ * The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended interpretation of the
+ * bounding box definition. In a WCS 1.1 data structure, the upper corner defines the edges region in the
+ * directions of <em>increasing</em> coordinate values in the envelope CRS. This is usually the algebraic
+ * maximum coordinates, but not always. For example, an envelope spanning the anti-meridian could have an
+ * upper corner longitude less than the lower corner longitude. Such extended interpretation applies
+ * mostly to axes having {@code WRAPAROUND} range meaning.</div>
*
* @return A copy of the upper corner, typically (but not necessarily) containing maximal ordinate values.
*/
@@ -559,9 +559,9 @@ public class Envelope2D extends Rectangl
* represents this envelope as four separated rectangles.
* </ul>
*
- * {@note The return type is the <code>Rectangle2D.Double</code> implementation class rather than the
- * <code>Rectangle2D</code> abstract class because the <code>Envelope2D</code> class hierarchy
- * already exposes this implementation choice.}
+ * <div class="note"><b>API note:</b>
+ * The return type is the {@code Rectangle2D.Double} implementation class rather than the {@code Rectangle2D}
+ * abstract class because the {@code Envelope2D} class hierarchy already exposes this implementation choice.</div>
*
* @return A representation of this envelope as an array of non-empty Java2D rectangles.
* The array never contains {@code this}.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -107,8 +107,9 @@ public final class Envelopes extends Sta
* <blockquote>{@code BOX}<var>n</var>{@code D(}{@linkplain Envelope#getLowerCorner() lower
* corner}{@code ,} {@linkplain Envelope#getUpperCorner() upper corner}{@code )}</blockquote>
*
- * {@note The <code>BOX</code> element is not part of the standard <cite>Well Known Text</cite>
- * (WKT) format. However it is understood by many softwares, for example GDAL and PostGIS.}
+ * <div class="note"><b>Note:</b>
+ * The {@code BOX} element is not part of the standard <cite>Well Known Text</cite> (WKT) format.
+ * However it is understood by many softwares, for example GDAL and PostGIS.</div>
*
* The string returned by this method can be {@linkplain GeneralEnvelope#GeneralEnvelope(CharSequence)
* parsed} by the {@code GeneralEnvelope} constructor.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -100,10 +100,10 @@ public class GeneralDirectPosition exten
* This constructor assigns the given array directly (without clone) to the {@link #ordinates} field.
* Consequently, callers shall not recycle the same array for creating many instances.
*
- * {@note The array is not cloned because this is usually not needed, especially in the context
- * of variable argument lengths since the array is often created implicitly. Furthermore
- * the <code>ordinates</code> field is public, so cloning the array would not protect
- * the state of this object anyway.}
+ * <div class="note"><b>Implementation note:</b>
+ * The array is not cloned because this is usually not needed, especially in the context of variable
+ * argument lengths since the array is often created implicitly. Furthermore the {@link #ordinates}
+ * field is public, so cloning the array would not protect the state of this object anyway.</div>
*
* @param ordinates The ordinate values. This array is <strong>not</strong> cloned.
*/
@@ -185,11 +185,10 @@ public class GeneralDirectPosition exten
}
/**
- * Returns a sequence of numbers that hold the coordinate of this position in its
- * reference system.
+ * Returns a sequence of numbers that hold the coordinate of this position in its reference system.
*
- * {@note This method is final for ensuring consistency with the <code>ordinates</code>,
- * array field, which is public.}
+ * <div class="note"><b>API note:</b>
+ * This method is final for ensuring consistency with the {@link #ordinates}, array field, which is public.</div>
*
* @return A copy of the {@linkplain #ordinates ordinates} array.
*/
@@ -218,8 +217,8 @@ public class GeneralDirectPosition exten
/**
* Returns the ordinate at the specified dimension.
*
- * {@note This method is final for ensuring consistency with the <code>ordinates</code>,
- * array field, which is public.}
+ * <div class="note"><b>API note:</b>
+ * This method is final for ensuring consistency with the {@link #ordinates}, array field, which is public.</div>
*
* @param dimension The dimension in the range 0 to {@linkplain #getDimension() dimension}-1.
* @return The ordinate at the specified dimension.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -46,10 +46,10 @@ import static org.apache.sis.math.MathFu
* (coordinate points). To encode an {@code Envelope}, it is sufficient to encode these
* two points.
*
- * {@note <code>Envelope</code> uses an arbitrary <cite>Coordinate Reference System</cite>, which
- * doesn't need to be geographic. This is different than the <code>GeographicBoundingBox</code>
- * class provided in the metadata package, which can be used as a kind of envelope restricted to
- * a Geographic CRS having Greenwich prime meridian.}
+ * <div class="note"><b>Note:</b>
+ * {@code Envelope} uses an arbitrary <cite>Coordinate Reference System</cite>, which does not need to be geographic.
+ * This is different than the {@code GeographicBoundingBox} class provided in the metadata package, which can be used
+ * as a kind of envelope restricted to a Geographic CRS having Greenwich prime meridian.</div>
*
* This particular implementation of {@code Envelope} is said "General" because it uses
* coordinates of an arbitrary number of dimensions. This is in contrast with
@@ -237,14 +237,15 @@ public class GeneralEnvelope extends Arr
* check that every points in a {@code LINESTRING} have the same dimension. However this
* constructor ensures that the parenthesis are balanced, in order to catch some malformed WKT.
*
- * {@example The following texts can be parsed by this constructor in addition of the usual
- * <code>BOX</code> element. This constructor creates the bounding box of those geometries:
+ * <div class="note"><b>Example:</b>
+ * The following texts can be parsed by this constructor in addition of the usual {@code BOX} element.
+ * This constructor creates the bounding box of those geometries:
*
* <ul>
- * <li><code>POINT(6 10)</code></li>
- * <li><code>MULTIPOLYGON(((1 1, 5 1, 1 5, 1 1),(2 2, 3 2, 3 3, 2 2)))</code></li>
- * <li><code>GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(3 8,7 10))</code></li>
- * </ul>}
+ * <li>{@code POINT(6 10)}</li>
+ * <li>{@code MULTIPOLYGON(((1 1, 5 1, 1 5, 1 1),(2 2, 3 2, 3 3, 2 2)))}</li>
+ * <li>{@code GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(3 8,7 10))}</li>
+ * </ul></div>
*
* @param wkt The {@code BOX}, {@code POLYGON} or other kind of element to parse.
* @throws IllegalArgumentException If the given string can not be parsed.
@@ -348,10 +349,10 @@ public class GeneralEnvelope extends Arr
* this {@linkplain #getDimension() envelope dimension}, and minimum shall not be greater
* than maximum.
*
- * {@example
+ * <div class="note"><b>Example:</b>
* (<var>x</var><sub>min</sub>, <var>y</var><sub>min</sub>, <var>z</var><sub>min</sub>,
* <var>x</var><sub>max</sub>, <var>y</var><sub>max</sub>, <var>z</var><sub>max</sub>)
- * }
+ * </div>
*
* @param corners Ordinates of the new lower corner followed by the new upper corner.
*/
@@ -463,8 +464,9 @@ public class GeneralEnvelope extends Arr
* with the added point as an argument will return {@code true}, except if one of the point
* ordinates was {@link Double#NaN} in which case the corresponding ordinate has been ignored.</p>
*
- * {@note This method assumes that the specified point uses the same CRS than this envelope.
- * For performance raisons, it will no be verified unless Java assertions are enabled.}
+ * {@section Pre-conditions}
+ * This method assumes that the specified point uses the same CRS than this envelope.
+ * For performance reasons, it will no be verified unless Java assertions are enabled.
*
* {@section Spanning the anti-meridian of a Geographic CRS}
* This method supports envelopes spanning the anti-meridian. In such cases it is possible to
@@ -542,8 +544,9 @@ public class GeneralEnvelope extends Arr
* Adds an envelope object to this envelope. The resulting envelope is the union of the
* two {@code Envelope} objects.
*
- * {@note This method assumes that the specified envelope uses the same CRS than this envelope.
- * For performance raisons, it will no be verified unless Java assertions are enabled.}
+ * {@section Pre-conditions}
+ * This method assumes that the specified envelope uses the same CRS than this envelope.
+ * For performance reasons, it will no be verified unless Java assertions are enabled.
*
* {@section Spanning the anti-meridian of a Geographic CRS}
* This method supports envelopes spanning the anti-meridian. If one or both envelopes span
@@ -668,8 +671,9 @@ public class GeneralEnvelope extends Arr
/**
* Sets this envelope to the intersection if this envelope with the specified one.
*
- * {@note This method assumes that the specified envelope uses the same CRS than this envelope.
- * For performance raisons, it will no be verified unless Java assertions are enabled.}
+ * {@section Pre-conditions}
+ * This method assumes that the specified envelope uses the same CRS than this envelope.
+ * For performance reasons, it will no be verified unless Java assertions are enabled.
*
* {@section Spanning the anti-meridian of a Geographic CRS}
* This method supports envelopes spanning the anti-meridian.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -306,9 +306,10 @@ public class DefaultParameterDescriptor<
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code ParameterDescriptor.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>ParameterDescriptor</code> sub-interface. Overriding possibility is left mostly
- * for implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code ParameterDescriptor}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their own
+ * set of interfaces.</div>
*
* @return {@code ParameterDescriptor.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -691,8 +691,9 @@ public class DefaultParameterValue<T> ex
* Parameter["False easting", 0.0, LengthUnit["metre", 1]]
* }
*
- * {@note Version 1 of WKT format did not specified the parameter unit explicitely.
- * Instead, the unit was inherited from the enclosing element.}
+ * <div class="note"><b>Compatibility note:</b>
+ * Version 1 of WKT format did not specified the parameter unit explicitely.
+ * Instead, the unit was inherited from the enclosing element.</div>
*
* @param formatter The formatter where to format the inner content of this WKT element.
* @return {@code "Parameter"}.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -89,10 +89,11 @@ import org.apache.sis.internal.jdk7.Obje
* Applications should instead instantiate the most specific subclass having a name starting by {@code Default}.
* However exceptions to this rule may occur when it is not possible to identify the exact type.
*
- * {@example It is sometime not possible to infer the exact coordinate system type from
- * <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">version 1 of
- * <cite>Well Known Text format</cite></a>, for example when parsing a <code>LOCAL_CS</code> element.
- * In such exceptional situation, a plain <code>AbstractCS</code> object may be instantiated.}
+ * <div class="note"><b>Example:</b>
+ * It is sometime not possible to infer the exact coordinate system type from
+ * <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">version 1
+ * of <cite>Well Known Text format</cite></a>, for example when parsing a {@code LOCAL_CS} element.
+ * In such exceptional situation, a plain {@code AbstractCS} object may be instantiated.</div>
*
* {@code IdentifiedObject} instances are created in two main ways:
*
@@ -753,7 +754,7 @@ public class AbstractIdentifiedObject ex
* The strictness level is controlled by the second argument,
* from stricter to more permissive values:
*
- * <p><table class="compact">
+ * <table class="compact">
* <tr><td>{@link ComparisonMode#STRICT STRICT}:</td>
* <td>Verifies if the two objects are of the same {@linkplain #getClass() class}
* and compares all public properties, including SIS-specific (non standard) properties.</td></tr>
@@ -773,7 +774,7 @@ public class AbstractIdentifiedObject ex
* <td>Same as {@code IGNORE_METADATA}, with some tolerance threshold on numerical values.</td></tr>
* <tr><td>{@link ComparisonMode#DEBUG DEBUG}:</td>
* <td>Special mode for figuring out why two objects expected to be equal are not.</td></tr>
- * </table></p>
+ * </table>
*
* The main guideline is that if {@code sourceCRS.equals(targetCRS, IGNORE_METADATA)} returns {@code true},
* then the transformation from {@code sourceCRS} to {@code targetCRS} should be the identity transform
@@ -959,7 +960,7 @@ public class AbstractIdentifiedObject ex
* For example if this formattable element is for a {@code GeodeticCRS[…]} element,
* then subclasses shall write the content starting at the insertion point shown below:
*
- * <p><table class="compact">
+ * <table class="compact">
* <tr>
* <th>WKT example</th>
* <th>Java code example</th>
@@ -975,7 +976,7 @@ public class AbstractIdentifiedObject ex
* // ... write the elements at the insertion point ...
* return "GeodeticCRS";
* }
- * </td></tr></table></p>
+ * </td></tr></table>
*
* {@section Formatting non-standard WKT}
* If the implementation can not represent this object without violating some WKT constraints,
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -395,10 +395,11 @@ public final class CRS extends Static {
* <li>Otherwise throws a {@code ClassCastException}.</li>
* </ul>
*
- * {@example Apache SIS allows 4-dimensional (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)
+ * <div class="note"><b>Example:</b>
+ * Apache SIS allows 4-dimensional (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)
* coordinate reference system to be built in two different ways as shown below:
*
- * <p><table class="compact">
+ * <table class="compact">
* <tr><th>Hierarchical structure</th><th>Flat list</th></tr>
* <tr><td><blockquote>
* <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>, <var>z</var>, <var>t</var>)<br>
@@ -412,11 +413,11 @@ public final class CRS extends Static {
* <code> ├─VerticalCRS</code> — (<var>z</var>)<br>
* <code> └─TemporalCRS</code> — (<var>t</var>)
* </blockquote>
- * </td></tr></table></p>
+ * </td></tr></table>
*
* This method guaranteed that the returned list is a flat one as shown on the right side.
* Note that such flat lists are the only one allowed by ISO/OGC standards for compound CRS.
- * The hierarchical structure is an Apache SIS flexibility.}
+ * The hierarchical structure is an Apache SIS flexibility.</div>
*
* @param crs The coordinate reference system, or {@code null}.
* @return The single coordinate reference systems, or an empty list if the given CRS is {@code null}.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -158,9 +158,10 @@ public enum CommonCRS {
* <tr><th>Ellipsoid axes unit:</th> <td>{@link SI#METRE}</td></tr>
* </table></blockquote>
*
- * {@note <cite>NAD83</cite> uses the same ellipsoid for a different datum.
- * The <cite>Web Map Server</cite> <code>"CRS:83"</code> authority code uses the NAD83 datum,
- * while the <code>"IGNF:MILLER"</code> authority code uses the GRS80 datum.}
+ * <div class="note"><b>Note:</b>
+ * {@link #NAD83} uses the same ellipsoid for a different datum.
+ * The <cite>Web Map Server</cite> {@code "CRS:83"} authority code uses the NAD83 datum,
+ * while the {@code "IGNF:MILLER"} authority code uses the GRS80 datum.</div>
*/
ETRS89((short) 4258, (short) 4937, (short) 4936, (short) 6258, (short) 7019),
@@ -181,9 +182,10 @@ public enum CommonCRS {
* <tr><th>Ellipsoid axes unit:</th> <td>{@link SI#METRE}</td></tr>
* </table></blockquote>
*
- * {@note <cite>ETRS89</cite> uses the same ellipsoid for a different datum.
- * The <cite>Web Map Server</cite> <code>"CRS:83"</code> authority code uses the NAD83 datum,
- * while the <code>"IGNF:MILLER"</code> authority code uses the GRS80 datum.}
+ * <div class="note"><b>Note:</b>
+ * {@link #ETRS89} uses the same ellipsoid for a different datum.
+ * The <cite>Web Map Server</cite> {@code "CRS:83"} authority code uses the NAD83 datum,
+ * while the {@code "IGNF:MILLER"} authority code uses the GRS80 datum.</div>
*/
NAD83((short) 4269, (short) 0, (short) 0, (short) 6269, (short) 7019),
@@ -353,14 +355,15 @@ public enum CommonCRS {
* <li>Prime meridian in Greenwich.</li>
* </ul>
*
- * {@note This method makes no guarantees about the datum. The current default datum is WGS 84,
- * but this may change in future SIS versions if a WGS 84 replacement become in wide use.}
+ * <div class="note"><b>Note:</b>
+ * This method makes no guarantees about the datum. The current default datum is WGS 84,
+ * but this may change in future SIS versions if a WGS 84 replacement become in wide use.</div>
*
- * <p>This default CRS is assigned to
+ * This default CRS is assigned to
* {@linkplain org.apache.sis.geometry.GeneralEnvelope#GeneralEnvelope(org.opengis.metadata.extent.GeographicBoundingBox)
* envelopes created from a geographic bounding box}.
* Since ISO 19115 {@link org.opengis.metadata.extent.GeographicBoundingBox} is approximative by definition,
- * their datum can be arbitrary.</p>
+ * their datum can be arbitrary.
*
* @return The default two-dimensional geographic CRS with (<var>longitude</var>, <var>latitude</var>) axis order.
*/
@@ -775,9 +778,10 @@ public enum CommonCRS {
* <tr><td>Other surface</td> <td>CRS, Datum</td> <td>{@link #OTHER_SURFACE}</td></tr>
* </table></blockquote>
*
- * {@note We do not provide a <code>GEOIDAL</code> value because its definition depends on the realization epoch.
+ * <div class="note"><b>Note:</b>
+ * We do not provide a {@code GEOIDAL} value because its definition depends on the realization epoch.
* For example EGM84, EGM96 and EGM2008 are applications of three different geoid models on the WGS 84 ellipsoid.
- * The <code>MEAN_SEA_LEVEL</code> value can be used instead as an approximation of geoidal heights.}
+ * The {@link #MEAN_SEA_LEVEL} value can be used instead as an approximation of geoidal heights.</div>
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.4
@@ -871,9 +875,10 @@ public enum CommonCRS {
/**
* Creates a new enumeration value of the given name.
*
- * {@note This constructor does not expect <code>VerticalDatumType</code> constant in order to avoid too
- * early class initialization. In particular, we do not want early dependency to the SIS-specific
- * <code>VerticalDatumTypes.ELLIPSOIDAL</code> constant.}
+ * <div class="note"><b>Note:</b>
+ * This constructor does not expect {@link VerticalDatumType} constant in order to avoid too
+ * early class initialization. In particular, we do not want early dependency to the SIS-specific
+ * {@code VerticalDatumTypes.ELLIPSOIDAL} constant.</div>
*/
private Vertical(final boolean isEPSG, final short crs, final short datum) {
this.isEPSG = isEPSG;
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -277,10 +277,11 @@ public class AbstractCRS extends Abstrac
* Sets the coordinate system to the given value. This method is invoked only by JAXB at
* unmarshalling time and can be invoked only if the coordinate system has never been set.
*
- * {@note It was easy to put JAXB annotations directly on datum fields in subclasses because each CRS
- * type can be associated to only one datum type. But we do not have this convenience for
- * coordinate systems, where the same CRS may accept more than one kind of CS.
- * In GML, the different kinds of CS are marshalled in different XML elements.}
+ * <div class="note"><b>Implementation note:</b>
+ * It was easy to put JAXB annotations directly on datum fields in subclasses because each CRS type
+ * can be associated to only one datum type. But we do not have this convenience for coordinate systems,
+ * where the same CRS may accept more than one kind of CS. In GML, the different kinds of CS are marshalled
+ * in different XML elements.</div>
*
* @param name The property name, used only in case of error message to format.
* @throws IllegalStateException If the coordinate system has already been set.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -52,7 +52,7 @@ import static org.apache.sis.internal.re
* This class is often used for defining 4-dimensional (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>)
* coordinate reference systems as an aggregation of simpler CRS. Below is two examples of such aggregations:
*
- * <p><table class="compact">
+ * <table class="compact">
* <tr><th>Flat list</th><th>Hierarchical structure</th></tr>
* <tr><td><blockquote>
* <code>CompoundCRS</code> — (<var>x</var>, <var>y</var>, <var>z</var>, <var>t</var>)<br>
@@ -66,7 +66,7 @@ import static org.apache.sis.internal.re
* <code> │ └─VerticalCRS</code> — (<var>z</var>)<br>
* <code> └─TemporalCRS</code> — (<var>t</var>)
* </blockquote></td></tr>
- * </table></p>
+ * </table>
*
* Strictly speaking, only the flat list on the left side is allowed by OGC/ISO specifications.
* However Apache SIS relaxes this rule by allowing hierarchies as shown on the right side. This
@@ -256,9 +256,10 @@ public class DefaultCompoundCRS extends
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code CompoundCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>CompoundCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code CompoundCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code CompoundCRS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -189,9 +189,10 @@ public class DefaultEngineeringCRS exten
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code EngineeringCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>EngineeringCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code EngineeringCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code EngineeringCRS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -179,9 +179,10 @@ public class DefaultGeocentricCRS extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code GeocentricCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>GeocentricCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code GeocentricCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code GeocentricCRS.class} or a user-defined sub-interface.
*/
@@ -222,7 +223,7 @@ public class DefaultGeocentricCRS extend
/**
* Formats this CRS as a <cite>Well Known Text</cite> {@code GeodeticCRS[…]} element.
*
- * <blockquote><font size="-1"><b>Example:</b> Well-Known Text (version 2)
+ * <div class="note"><b>Example:</b> Well-Known Text (version 2)
* of a geocentric coordinate reference system using the WGS 84 datum.
*
* {@preformat wkt
@@ -249,7 +250,7 @@ public class DefaultGeocentricCRS extend
* AXIS["Y", EAST],
* AXIS["Z", NORTH]]
* }
- * </font></blockquote>
+ * </div>
*
* @return {@code "GeodeticCRS"} (WKT 2) or {@code "GeocCS"} (WKT 1).
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -150,9 +150,10 @@ public class DefaultGeographicCRS extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code GeographicCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>GeographicCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code GeographicCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code GeographicCRS.class} or a user-defined sub-interface.
*/
@@ -203,7 +204,7 @@ public class DefaultGeographicCRS extend
/**
* Formats this CRS as a <cite>Well Known Text</cite> {@code GeodeticCRS[…]} element.
*
- * <blockquote><font size="-1"><b>Example:</b> Well-Known Text (version 2)
+ * <div class="note"><b>Example:</b> Well-Known Text (version 2)
* of a geographic coordinate reference system using the WGS 84 datum.
*
* {@preformat wkt
@@ -233,7 +234,7 @@ public class DefaultGeographicCRS extend
* AXIS["Longitude", EAST],
* AUTHORITY["EPSG", "4326"]]
* }
- * </font></blockquote>
+ * </div>
*
* @return {@code "GeodeticCRS"} (WKT 2) or {@code "GeogCS"} (WKT 1).
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -171,9 +171,10 @@ public class DefaultImageCRS extends Abs
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code ImageCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>ImageCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code ImageCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code ImageCRS.class} or a user-defined sub-interface.
*/
@@ -255,7 +256,8 @@ public class DefaultImageCRS extends Abs
/**
* Formats this CRS as a <cite>Well Known Text</cite> {@code ImageCRS[…]} element.
*
- * {@note <code>ImageCRS</code> are defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code ImageCRS} are defined in the WKT 2 specification only.</div>
*
* @return {@code "ImageCRS"}.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -192,9 +192,10 @@ public class DefaultTemporalCRS extends
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code TemporalCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>TemporalCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code TemporalCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code TemporalCRS.class} or a user-defined sub-interface.
*/
@@ -298,7 +299,8 @@ public class DefaultTemporalCRS extends
/**
* Formats this CRS as a <cite>Well Known Text</cite> {@code TimeCRS[…]} element.
*
- * {@note <code>TimeCRS</code> is defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code TimeCRS} is defined in the WKT 2 specification only.</div>
*
* @return {@code "TimeCRS"}.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -171,9 +171,10 @@ public class DefaultVerticalCRS extends
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code VerticalCRS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>VerticalCRS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code VerticalCRS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code VerticalCRS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -419,7 +419,7 @@ public class AbstractCS extends Abstract
* the {@code CS[…]} element for historical reasons. Axes shall be formatted by the enclosing
* element (usually an {@link org.apache.sis.referencing.crs.AbstractCRS}).
*
- * <blockquote><font size="-1"><b>Example:</b> Well-Known Text of a two-dimensional {@code EllipsoidalCS}
+ * <div class="note"><b>Example:</b> Well-Known Text of a two-dimensional {@code EllipsoidalCS}
* having (φ,λ) axes in a unit defined by the enclosing CRS (usually degrees).
*
* {@preformat wkt
@@ -427,9 +427,10 @@ public class AbstractCS extends Abstract
* Axis["latitude", north],
* Axis["longitude", east]
* }
- * </font></blockquote>
+ * </div>
*
- * {@note <code>CS</code> is defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code CS} is defined in the WKT 2 specification only.</div>
*
* @return {@code "CS"}.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -103,8 +103,9 @@ public enum AxesConvention {
* <li>Temporal units are set to {@link javax.measure.unit.NonSI#DAY}.</li>
* </ul>
*
- * {@note The rules for normalized coordinate systems may be adjusted in future SIS versions based on experience
- * gained. For more predictable results, consider using the <code>RIGHT_HANDED</code> enum instead.}
+ * <div class="note"><b>Note:</b>
+ * The rules for normalized coordinate systems may be adjusted in future SIS versions based on experience gained.
+ * For more predictable results, consider using the {@link #RIGHT_HANDED} enum instead.</div>
*
* @see org.apache.sis.referencing.CommonCRS#normalizedGeographic()
*/
@@ -120,22 +121,22 @@ public enum AxesConvention {
* does not guarantee that longitude or <var>x</var> axis will be first in every cases. The most notable exception
* is the (North, West) case.</p>
*
- * {@note We do not provide a "<cite>longitude or <var>x</var> axis first</cite>" enumeration value because
- * such criterion is hard to apply to inter-cardinal directions and has no meaning for map projections
- * over a pole, while the right-handed rule can apply everywhere.}
- *
- * {@example The following table lists some axis orientations in the first column, and
- * how those axes are reordered in a right-handed coordinate system (second column):
- * <ul>
- * <table class="sis">
- * <tr><th>Left-handed</th> <th>Right-handed</th> <th>Remarks</th></tr>
- * <tr><td>(North, East)</td> <td>(East, North)</td> <td>This is the most common case.</td></tr>
- * <tr><td>(West, North)</td> <td>(North, West)</td> <td>This right-handed system has latitude first.</td></tr>
- * <tr><td>(South, West)</td> <td>(West, South)</td> <td>Used for the mapping of southern Africa.</td></tr>
- * <tr><td>(South along 0°,<br>South along 90° West)</td>
- * <td>(South along 90° West,<br>South along 0°)</td> <td>Can be used for the mapping of North pole.</td></tr>
- * </table>
- * </ul>}
+ * <div class="note"><b>Note:</b>
+ * We do not provide a "<cite>longitude or <var>x</var> axis first</cite>" enumeration value because such
+ * criterion is hard to apply to inter-cardinal directions and has no meaning for map projections over a pole,
+ * while the right-handed rule can apply everywhere.</div>
+ *
+ * <div class="note"><b>Example:</b>
+ * The following table lists some axis orientations in the first column, and
+ * how those axes are reordered in a right-handed coordinate system (second column):
+ * <table class="sis">
+ * <tr><th>Left-handed</th> <th>Right-handed</th> <th>Remarks</th></tr>
+ * <tr><td>(North, East)</td> <td>(East, North)</td> <td>This is the most common case.</td></tr>
+ * <tr><td>(West, North)</td> <td>(North, West)</td> <td>This right-handed system has latitude first.</td></tr>
+ * <tr><td>(South, West)</td> <td>(West, South)</td> <td>Used for the mapping of southern Africa.</td></tr>
+ * <tr><td>(South along 0°,<br>South along 90° West)</td>
+ * <td>(South along 90° West,<br>South along 0°)</td> <td>Can be used for the mapping of North pole.</td></tr>
+ * </table></div>
*
* @see org.apache.sis.referencing.cs.CoordinateSystems#angle(AxisDirection, AxisDirection)
* @see <a href="http://en.wikipedia.org/wiki/Right_hand_rule">Right-hand rule on Wikipedia</a>
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -217,7 +217,7 @@ public final class CoordinateSystems ext
* ({@linkplain AxisDirection#EAST East}, {@linkplain AxisDirection#NORTH North})
* are taken in account by this method.
*
- * <blockquote><font size="-1"><b>Example:</b>
+ * <div class="note"><b>Example:</b>
* If coordinates in {@code sourceCS} are (<var>x</var>,<var>y</var>) tuples in metres
* and coordinates in {@code targetCS} are (<var>-y</var>,<var>x</var>) tuples in centimetres,
* then the transformation can be performed as below:
@@ -229,7 +229,7 @@ public final class CoordinateSystems ext
* │ 1 │ │ 0 0 1 │ │ 1 │
* └ ┘ └ ┘ └ ┘
* }
- * </font></blockquote>
+ * </div>
*
* @param sourceCS The source coordinate system.
* @param targetCS The target coordinate system.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -206,9 +206,10 @@ public class DefaultCartesianCS extends
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code CartesianCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>CartesianCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code CartesianCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code CartesianCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -379,9 +379,10 @@ public class DefaultCoordinateSystemAxis
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code CoordinateSystemAxis.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>CoordinateSystemAxis</code> sub-interface. Overriding possibility is left mostly
- * for implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code CoordinateSystemAxis}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their own
+ * set of interfaces.</div>
*
* @return {@code CoordinateSystemAxis.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -177,9 +177,10 @@ public class DefaultCylindricalCS extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code CylindricalCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>CylindricalCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code CylindricalCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code CylindricalCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -202,9 +202,10 @@ public class DefaultEllipsoidalCS extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code EllipsoidalCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>EllipsoidalCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code EllipsoidalCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code EllipsoidalCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -170,9 +170,10 @@ public class DefaultLinearCS extends Abs
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code LinearCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>LinearCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code LinearCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code LinearCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -173,9 +173,10 @@ public class DefaultPolarCS extends Abst
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code PolarCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>PolarCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code PolarCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code PolarCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -177,9 +177,10 @@ public class DefaultSphericalCS extends
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code SphericalCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>SphericalCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code SphericalCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code SphericalCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -170,9 +170,10 @@ public class DefaultTimeCS extends Abstr
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code TimeCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>TimeCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code TimeCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code TimeCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -167,9 +167,10 @@ public class DefaultUserDefinedCS extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code UserDefinedCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>UserDefinedCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code UserDefinedCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code UserDefinedCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -185,9 +185,10 @@ public class DefaultVerticalCS extends A
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code VerticalCS.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>VerticalCS</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code VerticalCS}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code VerticalCS.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -177,7 +177,8 @@ final class DirectionAlongMeridian exten
* {@linkplain #baseDirection base directions} don't match.
* A positive angle denote a right-handed system.
*
- * {@example The angle from "<cite>North along 90 deg East</cite>" to "<cite>North along 0 deg</cite> is 90°.}
+ * <div class="note"><b>Example:</b>
+ * The angle from "<cite>North along 90 deg East</cite>" to "<cite>North along 0 deg</cite> is 90°.</div>
*/
public double angle(final DirectionAlongMeridian other) {
if (!baseDirection.equals(other.baseDirection)) {
@@ -285,7 +286,8 @@ final class DirectionAlongMeridian exten
* This element contains the meridian value and the unit of measurement.
* The unit is currently fixed to degrees, but this may change in any future implementation.
*
- * {@note <code>Meridian</code> is defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code Meridian} is defined in the WKT 2 specification only.</div>
*
* @param formatter The formatter where to format the inner content of this WKT element.
* @return {@code "Meridian"}.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -50,9 +50,10 @@ import org.apache.sis.internal.jdk7.Obje
* where the <var>X</var> axis points towards the Greenwich Prime Meridian,
* the <var>Y</var> axis points East, and the <var>Z</var> axis points North.</p>
*
- * {@note The upper case letters are intentional. By convention, (<var>X</var>, <var>Y</var>, <var>Z</var>)
- * stand for <cite>geocentric</cite> coordinates while (<var>x</var>, <var>y</var>, <var>z</var>)
- * stand for <cite>projected</cite> coordinates.}
+ * <div class="note"><b>Note:</b>
+ * The upper case letters are intentional. By convention, (<var>X</var>, <var>Y</var>, <var>Z</var>)
+ * stand for <cite>geocentric</cite> coordinates while (<var>x</var>, <var>y</var>, <var>z</var>)
+ * stand for <cite>projected</cite> coordinates.</div>
*
* The "Bursa-Wolf" formula is expressed with 7 parameters, listed in the table below.
* The <cite>code</cite>, <cite>name</cite> and <cite>abbreviation</cite> columns list EPSG identifiers,
@@ -157,8 +158,9 @@ import org.apache.sis.internal.jdk7.Obje
* can been found in the EPSG database for a given pair of source and target CRS.</li>
* </ol>
*
- * {@note In EPSG terminology, Apache SIS gives precedence to the <cite>late-binding</cite> approach
- * (case 1 above) over the <cite>early-binding</cite> approach (case 3 above).}
+ * <div class="note"><b>Note:</b>
+ * In EPSG terminology, Apache SIS gives precedence to the <cite>late-binding</cite> approach
+ * (case 1 above) over the <cite>early-binding</cite> approach (case 3 above).</div>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.4 (derived from geotk-1.2)
@@ -219,9 +221,9 @@ public class BursaWolfParameters extends
* The scale difference in parts per million (EPSG:8611).
* The legacy OGC parameter name is {@code "ppm"}.
*
- * {@example If a distance of 100 km in the source coordinate reference system translates into a distance
- * of 100.001 km in the target coordinate reference system, the scale difference is 1 ppm
- * (the ratio being 1.000001).}
+ * <div class="note"><b>Example:</b>
+ * If a distance of 100 km in the source coordinate reference system translates into a distance of 100.001 km
+ * in the target coordinate reference system, the scale difference is 1 ppm (the ratio being 1.000001).</div>
*/
public double dS;
@@ -624,7 +626,8 @@ public class BursaWolfParameters extends
* <blockquote><code>TOWGS84[{@linkplain #tX}, {@linkplain #tY}, {@linkplain #tZ}, {@linkplain #rX},
* {@linkplain #rY}, {@linkplain #rZ}, {@linkplain #dS}]</code></blockquote>
*
- * {@note <code>TOWGS84</code> is defined in the WKT 1 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code TOWGS84} is defined in the WKT 1 specification only.</div>
*
* The element name is {@code "ToWGS84"} in the common case where the {@linkplain #getTargetDatum() target datum}
* is WGS 84. For other targets, the element name will be derived from the datum name.
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -373,9 +373,10 @@ public class DefaultEllipsoid extends Ab
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code Ellipsoid.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>Ellipsoid</code> sub-interface. This method may be overridden if an implementor
- * extended GeoAPI with his own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code Ellipsoid}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code Ellipsoid.class} or a user-defined sub-interface.
*/
@@ -598,8 +599,9 @@ public class DefaultEllipsoid extends Ab
* The orthodromic distance is the shortest distance between two points on a ellipsoid's surface.
* The orthodromic path is always on a great circle.
*
- * {@note Orthodromic distances anre different than the <cite>loxodromic distance</cite>.
- * The later is a longer distance on a path with a constant direction on the compass.}
+ * <div class="note"><b>Note:</b>
+ * Orthodromic distances are different than the <cite>loxodromic distance</cite>.
+ * The later is a longer distance on a path with a constant direction on the compass.</div>
*
* @param λ1 Longitude of first point (in decimal degrees).
* @param φ1 Latitude of first point (in decimal degrees).
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -151,9 +151,10 @@ public class DefaultEngineeringDatum ext
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code EngineeringDatum.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>EngineeringDatum</code> sub-interface. Overriding possibility is left mostly
- * for implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code EngineeringDatum}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code EngineeringDatum.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -294,9 +294,10 @@ public class DefaultGeodeticDatum extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code GeodeticDatum.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>GeodeticDatum</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code GeodeticDatum}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code GeodeticDatum.class} or a user-defined sub-interface.
*/
@@ -499,7 +500,7 @@ public class DefaultGeodeticDatum extend
/**
* Formats this datum as a <cite>Well Known Text</cite> {@code Datum[…]} element.
*
- * <blockquote><font size="-1"><b>Example:</b> Well-Known Text of a WGS 84 datum.
+ * <div class="note"><b>Example:</b> Well-Known Text of a WGS 84 datum.
*
* {@preformat wkt
* Datum["World Geodetic System 1984",
@@ -514,7 +515,7 @@ public class DefaultGeodeticDatum extend
* SPHEROID["WGS84", 6378137.0, 298.257223563],
* AUTHORITY["EPSG", "6326"]]
* }
- * </font></blockquote>
+ * </div>
*
* @return {@code "Datum"}.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -170,9 +170,10 @@ public class DefaultImageDatum extends A
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code ImageDatum.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>ImageDatum</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code ImageDatum}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with
+ * their own set of interfaces.</div>
*
* @return {@code ImageDatum.class} or a user-defined sub-interface.
*/
@@ -233,7 +234,8 @@ public class DefaultImageDatum extends A
/**
* Formats this datum as a <cite>Well Known Text</cite> {@code ImageDatum[…]} element.
*
- * {@note <code>ImageDatum</code> is defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code ImageDatum} is defined in the WKT 2 specification only.</div>
*
* @return {@code "ImageDatum"}.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] Thu Feb 27 12:13:03 2014
@@ -201,9 +201,10 @@ public class DefaultPrimeMeridian extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code PrimeMeridian.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>PrimeMeridian</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code PrimeMeridian}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code PrimeMeridian.class} or a user-defined sub-interface.
*/
Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1572529&r1=1572528&r2=1572529&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java Thu Feb 27 12:13:03 2014
@@ -203,9 +203,10 @@ public class DefaultTemporalDatum extend
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code TemporalDatum.class}.
*
- * {@note Subclasses usually do not need to override this method since GeoAPI does not define
- * <code>TemporalDatum</code> sub-interface. Overriding possibility is left mostly for
- * implementors who wish to extend GeoAPI with their own set of interfaces.}
+ * <div class="note"><b>Note for implementors:</b>
+ * Subclasses usually do not need to override this method since GeoAPI does not define {@code TemporalDatum}
+ * sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
+ * own set of interfaces.</div>
*
* @return {@code TemporalDatum.class} or a user-defined sub-interface.
*/
@@ -277,7 +278,8 @@ public class DefaultTemporalDatum extend
/**
* Formats this datum as a <cite>Well Known Text</cite> {@code TimeDatum[â¦]} element.
*
- * {@note <code>TimeDatum</code> is defined in the WKT 2 specification only.}
+ * <div class="note"><b>Compatibility note:</b>
+ * {@code TimeDatum} is defined in the WKT 2 specification only.</div>
*
* @return {@code "TimeDatum"}.
*/