sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1572725 [3/4] - in /sis/trunk: ./ application/sis-console/src/site/ application/sis-webapp/src/site/ application/src/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-build-helper/src/main/java/org/apache/sis/ut...
Date Thu, 27 Feb 2014 20:40:04 GMT
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -83,11 +83,10 @@ public final class Matrices extends Stat
      * Creates a square identity matrix of size {@code size} × {@code size}.
      * Elements on the diagonal (<var>j</var> == <var>i</var>) are set to 1.
      *
-     * <blockquote><font size=-1><b>Implementation note:</b>
+     * <div class="note"><b>Implementation note:</b>
      * For sizes between {@value org.apache.sis.referencing.operation.matrix.Matrix1#SIZE} and
      * {@value org.apache.sis.referencing.operation.matrix.Matrix4#SIZE} inclusive, the matrix
-     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.
-     * </font></blockquote>
+     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.</div>
      *
      * @param  size Numbers of row and columns. For an affine transform matrix, this is the number of
      *         {@linkplain MathTransform#getSourceDimensions() source} and
@@ -109,12 +108,11 @@ public final class Matrices extends Stat
      * Elements on the diagonal (<var>j</var> == <var>i</var>) are set to 1.
      * The result is an identity matrix if {@code numRow} = {@code numCol}.
      *
-     * <blockquote><font size=-1><b>Implementation note:</b>
+     * <div class="note"><b>Implementation note:</b>
      * For {@code numRow} == {@code numCol} with a value between
      * {@value org.apache.sis.referencing.operation.matrix.Matrix1#SIZE} and
      * {@value org.apache.sis.referencing.operation.matrix.Matrix4#SIZE} inclusive, the matrix
-     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.
-     * </font></blockquote>
+     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.</div>
      *
      * @param numRow For a math transform, this is the number of {@linkplain MathTransform#getTargetDimensions() target dimensions} + 1.
      * @param numCol For a math transform, this is the number of {@linkplain MathTransform#getSourceDimensions() source dimensions} + 1.
@@ -132,12 +130,11 @@ public final class Matrices extends Stat
      * Creates a matrix of size {@code numRow} × {@code numCol} filled with zero values.
      * This constructor is convenient when the caller wants to initialize the matrix elements himself.
      *
-     * <blockquote><font size=-1><b>Implementation note:</b>
+     * <div class="note"><b>Implementation note:</b>
      * For {@code numRow} == {@code numCol} with a value between
      * {@value org.apache.sis.referencing.operation.matrix.Matrix1#SIZE} and
      * {@value org.apache.sis.referencing.operation.matrix.Matrix4#SIZE} inclusive, the matrix
-     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.
-     * </font></blockquote>
+     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.</div>
      *
      * @param numRow For a math transform, this is the number of {@linkplain MathTransform#getTargetDimensions() target dimensions} + 1.
      * @param numCol For a math transform, this is the number of {@linkplain MathTransform#getSourceDimensions() source dimensions} + 1.
@@ -158,12 +155,11 @@ public final class Matrices extends Stat
      * Creates a matrix of size {@code numRow} × {@code numCol} initialized to the given elements.
      * The elements array size must be equals to {@code numRow*numCol}. Column indices vary fastest.
      *
-     * <blockquote><font size=-1><b>Implementation note:</b>
+     * <div class="note"><b>Implementation note:</b>
      * For {@code numRow} == {@code numCol} with a value between
      * {@value org.apache.sis.referencing.operation.matrix.Matrix1#SIZE} and
      * {@value org.apache.sis.referencing.operation.matrix.Matrix4#SIZE} inclusive, the matrix
-     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.
-     * </font></blockquote>
+     * is guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.</div>
      *
      * @param  numRow   Number of rows.
      * @param  numCol   Number of columns.
@@ -370,9 +366,10 @@ public final class Matrices extends Stat
      *       then an exception will be thrown.</li>
      * </ul>
      *
-     * {@example It is legal to transform from (<i>easting</i>, <i>northing</i>, <i>up</i>) to
-     *           (<i>easting</i>, <i>northing</i>) - this is the first above case, but illegal
-     *           to transform (<i>easting</i>, <i>northing</i>) to (<i>easting</i>, <i>up</i>).}
+     * <div class="note"><b>Example:</b>
+     * It is legal to transform from (<i>easting</i>, <i>northing</i>, <i>up</i>) to
+     * (<i>easting</i>, <i>northing</i>) - this is the first above case, but illegal
+     * to transform (<i>easting</i>, <i>northing</i>) to (<i>easting</i>, <i>up</i>).</div>
      *
      * {@section Example}
      * The following method call:
@@ -662,11 +659,10 @@ public final class Matrices extends Stat
     /**
      * Creates a new matrix which is a copy of the given matrix.
      *
-     * <blockquote><font size=-1><b>Implementation note:</b>
+     * <div class="note"><b>Implementation note:</b>
      * For square matrix with a size between {@value org.apache.sis.referencing.operation.matrix.Matrix1#SIZE}
      * and {@value org.apache.sis.referencing.operation.matrix.Matrix4#SIZE} inclusive, the returned matrix is
-     * guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.
-     * </font></blockquote>
+     * guaranteed to be an instance of one of {@link Matrix1} … {@link Matrix4} subtypes.</div>
      *
      * @param matrix The matrix to copy, or {@code null}.
      * @return A copy of the given matrix, or {@code null} if the given matrix was null.
@@ -878,10 +874,11 @@ public final class Matrices extends Stat
      *   └                                                       ┘
      * }
      *
-     * {@note Formatting on a per-column basis is convenient for the kind of matrices used in referencing by coordinates,
-     *        because each column is typically a displacement vector in a different dimension of the source coordinate
-     *        reference system. In addition, the last column is often a translation vector having a magnitude very
-     *        different than the other columns.}
+     * <div class="note"><b>Note:</b>
+     * Formatting on a per-column basis is convenient for the kind of matrices used in referencing by coordinates,
+     * because each column is typically a displacement vector in a different dimension of the source coordinate
+     * reference system. In addition, the last column is often a translation vector having a magnitude very
+     * different than the other columns.</div>
      *
      * @param  matrix The matrix for which to get a string representation.
      * @return A string representation of the given matrix.

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java Thu Feb 27 20:40:01 2014
@@ -22,9 +22,10 @@ import org.opengis.geometry.MismatchedDi
 /**
  * Thrown when two matrices can not be added or multiplied because the sizes do not match.
  *
- * {@note This exception extends <code>MismatchedDimensionException</code> because the matrices in this package
- *        are used in <cite>Coordinate Operation Steps</cite>, in which case a mismatched matrix size means that
- *        the operation involves two Coordinate Reference Systems of incompatible dimensions.}
+ * <div class="note"><b>Note:</b>
+ * This exception extends {@code MismatchedDimensionException} because the matrices in this package
+ * are used in <cite>Coordinate Operation Steps</cite>, in which case a mismatched matrix size means
+ * that the operation involves two Coordinate Reference Systems of incompatible dimensions.</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java Thu Feb 27 20:40:01 2014
@@ -23,9 +23,10 @@ import org.opengis.referencing.operation
  * Thrown when a matrix can not be inverted.
  * This may be because the matrix is singular, or because the matrix is not square.
  *
- * {@note This exception extends <code>NoninvertibleTransformException</code> because the matrices in this package
- *        are used in <cite>Coordinate Operation Steps</cite>, in which case a singular matrix means that the
- *        operation is not invertible.}
+ * <div class="note"><b>Note:</b>
+ * This exception extends {@code NoninvertibleTransformException} because the matrices in this package
+ * are used in <cite>Coordinate Operation Steps</cite>, in which case a singular matrix means that the
+ * operation is not invertible.</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4

Modified: sis/trunk/core/sis-referencing/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/javadoc/overview.html?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/javadoc/overview.html (original)
+++ sis/trunk/core/sis-referencing/src/main/javadoc/overview.html Thu Feb 27 20:40:01 2014
@@ -25,7 +25,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   </head>
   <body>
-    Overview of Apache <a href="{@website}/sis-referencing">sis-referencing</a> module.
+    Overview of Apache <code>sis-referencing</code> module.
     This Javadoc is only about one specific module. For the full Apache SIS project,
     see the <a href="http://sis.apache.org/apidocs/overview-summary.html">aggregated Javadoc</a>.
   </body>

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -94,8 +94,9 @@ public final strictfp class MatricesTest
      * Tests {@link Matrices#createTransform(AxisDirection[], AxisDirection[])} with the same sequence of axes.
      * The result shall be an identity matrix.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     public void testCreateTransformWithSameAxes() {
@@ -114,8 +115,9 @@ public final strictfp class MatricesTest
      * Axes are moved in different positions, and some axes will have opposite directions.
      * However the number of axes stay the same.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     @DependsOnMethod("testCreateTransformWithSameAxes")
@@ -140,8 +142,9 @@ public final strictfp class MatricesTest
      * Tests {@link Matrices#createTransform(AxisDirection[], AxisDirection[])} with less axes
      * in the destination than in the source.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     @DependsOnMethod("testCreateTransformWithDifferentAxes")
@@ -164,8 +167,9 @@ public final strictfp class MatricesTest
      * Tests {@link Matrices#createTransform(AxisDirection[], AxisDirection[])} with the axis repeated twice.
      * This unusual, but shall nevertheless be supported.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     @DependsOnMethod("testCreateTransformWithLessAxes")
@@ -188,8 +192,9 @@ public final strictfp class MatricesTest
      * Tests that {@link Matrices#createTransform(AxisDirection[], AxisDirection[])}
      * throw an exception if a destination axis is not in the source.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     public void testCreateTransformWithAxisNotInSource() {
@@ -207,8 +212,9 @@ public final strictfp class MatricesTest
      * Tests that {@link Matrices#createTransform(AxisDirection[], AxisDirection[])}
      * throw an exception if the arguments contain colinear axis directions.
      *
-     * {@note <code>Matrices.createTransform(AxisDirection[], AxisDirection[])</code> needs to be tested with
-     *        special care, because this method will be the most frequently invoked one when building CRS.}
+     * <div class="note"><b>Note:</b>
+     * {@code Matrices.createTransform(AxisDirection[], AxisDirection[])} needs to be tested with special care,
+     * because this method will be the most frequently invoked one when building CRS.</div>
      */
     @Test
     public void testCreateTransformWithColinearAxes() {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -289,7 +289,8 @@ public final class Context extends Marsh
      * The valid values are documented in the {@link org.apache.sis.xml.XML#SCHEMAS} property.
      * If the returned value is not empty, then this method guarantees it ends with {@code '/'}.
      *
-     * {@note This method is static for the convenience of performing the check for null context.}
+     * <div class="note"><b>API note:</b>
+     * This method is static for the convenience of performing the check for null context.</div>
      *
      * @param  context The current context, or {@code null} if none.
      * @param  key One of the value documented in the "<cite>Map key</cite>" column of
@@ -321,7 +322,8 @@ public final class Context extends Marsh
      * If no GML version were specified, then this method returns {@code true}, i.e. newest
      * version is assumed.
      *
-     * {@note This method is static for the convenience of performing the check for null context.}
+     * <div class="note"><b>API note:</b>
+     * This method is static for the convenience of performing the check for null context.</div>
      *
      * @param  context The current context, or {@code null} if none.
      * @param  version The version to compare to.
@@ -343,7 +345,8 @@ public final class Context extends Marsh
      * Returns the reference resolver in use for the current marshalling or unmarshalling process.
      * If no resolver were explicitely set, then this method returns {@link ReferenceResolver#DEFAULT}.
      *
-     * {@note This method is static for the convenience of performing the check for null context.}
+     * <div class="note"><b>API note:</b>
+     * This method is static for the convenience of performing the check for null context.</div>
      *
      * @param  context The current context, or {@code null} if none.
      * @return The current reference resolver (never null).
@@ -362,7 +365,8 @@ public final class Context extends Marsh
      * Returns the value converter in use for the current marshalling or unmarshalling process.
      * If no converter were explicitely set, then this method returns {@link ValueConverter#DEFAULT}.
      *
-     * {@note This method is static for the convenience of performing the check for null context.}
+     * <div class="note"><b>API note:</b>
+     * This method is static for the convenience of performing the check for null context.</div>
      *
      * @param  context The current context, or {@code null} if none.
      * @return The current value converter (never null).

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -269,9 +269,10 @@ public class GO_CharacterString {
      * Returns the text as a string, or {@code null} if none.
      * The null value is expected by various {@code PT_FreeText}.
      *
-     * {@note Returning <code>null</code> is unusual and not a recommended practice.
-     * But precedents exist (for example Swing <code>DefaultMutableTreeNode</code>)
-     * and this class is not for public usage.}
+     * <div class="note"><b>Note:</b>
+     * Returning {@code null} is unusual and not a recommended practice.
+     * But precedents exist (for example {@link javax.swing.tree.DefaultMutableTreeNode})
+     * and this class is not for public usage.</div>
      *
      * @return The text as a string (may be null).
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -185,9 +185,10 @@ public final class Measure {
      * Sets the unit to the given value, and returns {@code true} if the current {@link #unit} value was different.
      * A return value of {@code true} means that the caller should log a warning.
      *
-     * {@example Some users wrongly assign the "m" unit to <code>Ellipsoid.inverseFlattening</code>.
-     *           The SIS adapter forces the unit to <code>Unit.ONE</code>, but we want to let the user
-     *           know that he probably did something wrong.}
+     * <div class="note"><b>Example:</b>
+     * Some users wrongly assign the "m" unit to {@code Ellipsoid.inverseFlattening}.
+     * The SIS adapter forces the unit to {@link Unit#ONE}, but we want to let the user
+     * know that he probably did something wrong.</div>
      *
      * @param  newUnit The new unit (can not be null).
      * @return {@code true} if a different unit was defined before this method call.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -85,19 +85,20 @@ import org.apache.sis.util.iso.SimpleInt
  * The actual implementation may be slightly more complicated than the above if there is
  * various subclasses to check.
  *
- * {@note A previous version provided an abstract <code>getElement()</code> method in this class
+ * <div class="note"><b>Note:</b>
+ * A previous version provided an abstract {@code getElement()} method in this class
  * for enforcing its definition in subclasses. But this has been removed for two reasons:
  * <ul>
- *   <li>While the return value is usually <code>BoundType</code>, in some situations it is
- *       rather an other type like <code>String</code>. For this raison the return type must
- *       be declared as <code>Object</code>, and subclasses have to restrict it to a more
+ *   <li>While the return value is usually {@code BoundType}, in some situations it is
+ *       rather an other type like {@code String}. For this raison the return type must
+ *       be declared as {@code Object}, and subclasses have to restrict it to a more
  *       specific type.</li>
  *   <li>The parameterized return type forces the compiler to generate bridge methods under
- *       the hood. In the particular case of typical <code>PropertyType</code> subclasses,
- *       this increases the size of <code>.class</code></li> files by approximatively 4.5%.
+ *       the hood. In the particular case of typical {@code PropertyType} subclasses,
+ *       this increases the size of {@code .class} files by approximatively 4.5%.
  *       While quite small, this is a useless overhead since we never need to invoke the
- *       abstract <code>getElement()</code> from this class.</li>
- * </ul>}
+ *       abstract {@code getElement()} from this class.</li>
+ * </ul></div>
  *
  * @param <ValueType> The adapter subclass.
  * @param <BoundType> The interface being adapted.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -75,8 +75,9 @@ public final class FileName {
     /**
      * Returns the file path, or {@code null} if none.
      *
-     * {@note Returning <code>null</code> is usually not recommended for a <code>toString()</code> method,
-     *        but this class is for internal usage only.}
+     * <div class="note"><b>Note:</b>
+     * Returning {@code null} is usually not recommended for a {@code toString()} method,
+     * but this class is for internal usage only.</div>
      *
      * @return The file path, or {@code null} if none.
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -75,8 +75,9 @@ public final class MimeFileType {
     /**
      * Returns the MIME type, or {@code null} if none.
      *
-     * {@note Returning <code>null</code> is usually not recommended for a <code>toString()</code> method,
-     *        but this class is for internal usage only.}
+     * <div class="note"><b>Note:</b>
+     * Returning {@code null} is usually not recommended for a {@code toString()} method,
+     * but this class is for internal usage only.</div>
      *
      * @return The MIME type, or {@code null} if none.
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -27,10 +27,11 @@ import org.apache.sis.util.logging.Loggi
  * This thread is reserved to internal SIS usage - no user code shall be executed here.
  * All submitted tasks shall be very quick, since there is only one thread shared by everyone.
  *
- * {@note In practice some user code may be indirectly executed, since some SIS tasks invoke
- * overrideable methods. We may need to revisit the <code>DelayedExecutor</code> design in a
- * future version if the above happens to be a problem. For example we may allow the user to
- * specify an application-wide scheduled executor and delegate the tasks to that executor.}
+ * <div class="note"><b>Note:</b>
+ * In practice some user code may be indirectly executed, since some SIS tasks invoke overrideable methods.
+ * We may need to revisit the {@code DelayedExecutor} design in a future version if the above happens to be
+ * a problem. For example we may allow the user to specify an application-wide scheduled executor and delegate
+ * the tasks to that executor.</div>
  *
  * The methods for use in this class are:
  * <ul>
@@ -142,9 +143,10 @@ public final class DelayedExecutor exten
      * Constructs a new thread as a daemon thread. This thread will be sleeping most of the time.
      * It will run only only a few nanoseconds every time a new {@link DelayedRunnable} is taken.
      *
-     * {@note We give to this thread a priority higher than the normal one since this thread shall
-     *        execute only tasks to be completed very shortly. Quick execution of those tasks is at
-     *        the benefit of the rest of the system, since they make more resources available sooner.}
+     * <div class="note"><b>Note:</b>
+     * We give to this thread a priority higher than the normal one since this thread shall
+     * execute only tasks to be completed very shortly. Quick execution of those tasks is at
+     * the benefit of the rest of the system, since they make more resources available sooner.</div>
      */
     private DelayedExecutor(final DaemonThread lastCreatedDaemon) {
         super("DelayedExecutor", lastCreatedDaemon);

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -78,9 +78,10 @@ public final class ReferenceQueueConsume
      * Constructs a new thread as a daemon thread. This thread will be sleeping most of the time.
      * It will run only only a few nanoseconds every time a new {@link Reference} is enqueued.
      *
-     * {@note We give to this thread a priority higher than the normal one since this thread shall
-     *        execute only tasks to be completed very shortly. Quick execution of those tasks is at
-     *        the benefit of the rest of the system, since they make more resources available sooner.}
+     * <div class="note"><b>Note:</b>
+     * We give to this thread a priority higher than the normal one since this thread shall
+     * execute only tasks to be completed very shortly. Quick execution of those tasks is at
+     * the benefit of the rest of the system, since they make more resources available sooner.</div>
      */
     private ReferenceQueueConsumer(final DaemonThread lastCreatedDaemon) {
         super("ReferenceQueueConsumer", lastCreatedDaemon);

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -255,8 +255,9 @@ public final class Citations extends Sta
      *   <li>Otherwise this method returns {@code null}.</li>
      * </ul>
      *
-     * {@note This method searches in alternate titles as a fallback because ISO specification said
-     *        that those titles are often used for abbreviations.}
+     * <div class="note"><b>Note:</b>
+     * This method searches in alternate titles as a fallback because ISO specification said
+     * that those titles are often used for abbreviations.</div>
      *
      * This method ignores leading and trailing whitespaces of every character sequences.
      * Null references, empty character sequences and sequences of whitespaces only are ignored.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -78,8 +78,9 @@ public final class CollectionsExt extend
     /**
      * Returns a {@linkplain SortedSet sorted set} which is always empty and accepts no element.
      *
-     * {@note This method exists only on the JDK6 and JDK7 branches. This method will
-     *        be removed from the JDK8 branch, since it has been added to the JDK.}
+     * <div class="note"><b>Note:</b>
+     * This method exists only on the JDK6 and JDK7 branches. This method will
+     * be removed from the JDK8 branch, since it has been added to the JDK.</div>
      *
      * @param <E> The type of elements in the empty collection.
      * @return An empty collection.
@@ -157,10 +158,11 @@ public final class CollectionsExt extend
      *   <li>Otherwise this method throws {@link IllegalArgumentException}.</li>
      * </ul>
      *
-     * {@note It would be very easy to add support for <code>value</code> argument of type <code>Object[]</code>
-     *        or collections. But we do not provide such support for now because this method is used mostly as a
-     *        helper method for constructors of <code>AbstractIdentifiedObject</code> subclasses receiving a map
-     *        of properties, and the contract of our constructors do not allow those other types for now.}
+     * <div class="note"><b>Note:</b>
+     * It would be very easy to add support for {@code value} argument of type {@code Object[]} or collections.
+     * But we do not provide such support for now because this method is used mostly as a helper method for
+     * constructors of {@code AbstractIdentifiedObject} subclasses receiving a map of properties,
+     * and the contract of our constructors do not allow those other types for now.</div>
      *
      * @param  <E>        The type of elements in the array to be returned.
      * @param  name       The parameter name, used only for formatting an error message in case of failure.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -129,36 +129,40 @@ public final class DefinitionURI {
     /**
      * The type part of a URI, or {@code null} if none (empty).
      *
-     * {@example In the <code>"urn:ogc:def:crs:EPSG:8.2:4326"</code> URN, this is <code>"crs"</code>}.
+     * <div class="note"><b>Example:</b>
+     * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "crs"}.</div>
      */
     public String type;
 
     /**
      * The authority part of a URI, or {@code null} if none (empty).
      *
-     * {@example In the <code>"urn:ogc:def:crs:EPSG:8.2:4326"</code> URN, this is <code>"EPSG"</code>}.
+     * <div class="note"><b>Example:</b>
+     * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "EPSG"}.</div>
      */
     public String authority;
 
     /**
      * The version part of a URI, or {@code null} if none (empty).
      *
-     * {@example In the <code>"urn:ogc:def:crs:EPSG:8.2:4326"</code> URN, this is <code>"8.2"</code>}.
+     * <div class="note"><b>Example:</b>
+     * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "8.2"}.</div>
      */
     public String version;
 
     /**
      * The code part of a URI, or {@code null} if none (empty).
      *
-     * {@example In the <code>"urn:ogc:def:crs:EPSG:8.2:4326"</code> URN, this is <code>"4326"</code>}.
+     * <div class="note"><b>Example:</b>
+     * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "4326"}.</div>
      */
     public String code;
 
     /**
      * The parameters, or {@code null} if none.
      *
-     * {@example In the <code>"urn:ogc:def:crs:OGC:1.3:AUTO42003:1:-100:45"</code> URN,
-     *           this is <code>{"1", "-100", "45"}</code>}.
+     * <div class="note"><b>Example:</b>
+     * In the {@code "urn:ogc:def:crs:OGC:1.3:AUTO42003:1:-100:45"} URN, this is <code>{"1", "-100", "45"}</code>}.</div>
      */
     public String[] parameters;
 

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -25,7 +25,7 @@ import org.apache.sis.util.resources.Err
 /**
  * A limited set of color and font attributes assignable to characters at formatting time.
  * Those attributes are used by SIS formatters for providing some syntax coloring,
- * for example in the <code>org.apache.sis.io.wkt</code> package.
+ * for example in the {@link org.apache.sis.io.wkt} package.
  *
  * <p>This enumeration is restricted to a subset of the <cite>ANSI escape codes</cite> (a.k.a.
  * ECMA-48, ISO/IEC 6429 and X3.64 standards) because SIS uses them mostly for syntax coloring in

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -58,12 +58,12 @@ import org.apache.sis.internal.util.Loca
  *   <li>{@link #format(Object, Appendable)} may throws {@code IOException}.</li>
  * </ul>
  *
- * {@note In the standard <code>Format</code> class, the <code>parse</code> methods either accept
- *        a <code>ParsePosition</code> argument and returns <code>null</code> on error,
- *        or does not take position argument and throws a <code>ParseException</code> on error.
- *        In this <code>CompoundFormat</code> class, the <code>parse</code> method both takes a
- *        <code>ParsePosition</code> argument and throws a <code>ParseException</code> on error.
- *        This allows both substring parsing and more accurate exception message in case of error.}
+ * <div class="note"><b>API note:</b>
+ * In the standard {@link Format} class, the {@code parse} methods either accept a {@link ParsePosition} argument
+ * and returns {@code null} on error, or does not take position argument and throws a {@link ParseException} on error.
+ * In this {@code CompoundFormat} class, the {@code parse} method both takes a {@code ParsePosition} argument and
+ * throws a {@code ParseException} on error. This allows both substring parsing and more accurate exception message
+ * in case of error.</div>
  *
  * @param <T> The base type of objects parsed and formatted by this class.
  *
@@ -143,12 +143,12 @@ public abstract class CompoundFormat<T> 
      * The returned type may be a subclass of {@code <T>} if the format is configured in a way
      * that restrict the kind value to be parsed.
      *
-     * {@example
+     * <div class="note"><b>Example:</b>
      *   <ul>
-     *     <li><code>StatisticsFormat</code> unconditionally returns <code>Statistics.class</code>.</li>
-     *     <li><code>TreeTableFormat</code> unconditionally returns <code>TreeTable.class</code>.</li>
+     *     <li>{@code StatisticsFormat} unconditionally returns {@code Statistics.class}.</li>
+     *     <li>{@code TreeTableFormat} unconditionally returns {@code TreeTable.class}.</li>
      *   </ul>
-     * }
+     * </div>
      *
      * @return The base type of values parsed and formatted by this {@code Format} instance.
      */
@@ -177,10 +177,11 @@ public abstract class CompoundFormat<T> 
      *       error index</var> + <var>{@code ParseException} error offset</var>.</li>
      * </ul>
      *
-     * {@example If parsing of the <code>"30.0 40,0"</code> coordinate fails on the coma in the last number, then the
-     * <code>pos</code> error index will be set to 5 (the beginning of the <code>"40.0"</code> character sequence)
-     * while the <code>ParseException</code> error offset will be set to 2 (the coma position relative the beginning
-     * of the <code>"40.0"</code> character sequence).}
+     * <div class="note"><b>Example:</b>
+     * If parsing of the {@code "30.0 40,0"} coordinate fails on the coma in the last number, then the {@code pos}
+     * error index will be set to 5 (the beginning of the {@code "40.0"} character sequence) while the
+     * {@link ParseException} error offset will be set to 2 (the coma position relative the beginning
+     * of the {@code "40.0"} character sequence).</div>
      *
      * This error offset policy is a consequence of the compound nature of {@code CompoundFormat},
      * since the exception may have been produced by a call to {@link Format#parseObject(String)}.
@@ -237,11 +238,11 @@ public abstract class CompoundFormat<T> 
      * {@linkplain Character#isSpaceChar(int) spaces} and
      * {@linkplain Character#isISOControl(int) ISO control characters}.
      *
-     * {@note The usual SIS policy, as documented in the <code>CharSequences</code> class,
-     * is to test for whitespaces using the <code>Characters.isWhitespace(…)</code> method.
-     * The combination of <code>isSpaceChar(…)</code> and <code>isISOControl(…)</code> done
-     * in this <code>parseObject(…)</code> method is more permissive since it encompasses
-     * all whitespace characters, plus non-breaking spaces and non-white ISO controls.}
+     * <div class="note"><b>Note:</b>
+     * The usual SIS policy, as documented in the {@link org.apache.sis.util.CharSequences} class, is to test for
+     * whitespaces using the {@code Character.isWhitespace(…)} method. The combination of {@code isSpaceChar(…)}
+     * and {@code isISOControl(…)} done in this {@code parseObject(…)} method is more permissive since it encompasses
+     * all whitespace characters, plus non-breaking spaces and non-white ISO controls.</div>
      *
      * @param  text The string representation of the object to parse.
      * @return The parsed object.
@@ -281,10 +282,10 @@ public abstract class CompoundFormat<T> 
      * without propagating {@link IOException}. The I/O exception should never
      * occur since we are writing in a {@link StringBuffer}.
      *
-     * {@note Strictly speaking, an <code>IOException</code> could still occur if a subclass
-     * overrides the above <code>format</code> method and performs some I/O operation outside
-     * the given <code>StringBuffer</code>. However this is not the intended usage of this
-     * class and implementors should avoid such unexpected I/O operation.}
+     * <div class="note"><b>Note:</b>
+     * Strictly speaking, an {@link IOException} could still occur if a subclass overrides the above {@code format}
+     * method and performs some I/O operation outside the given {@link StringBuffer}. However this is not the intended
+     * usage of this class and implementors should avoid such unexpected I/O operation.</div>
      *
      * @param  object      The object to format.
      * @param  toAppendTo  Where to format the object.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -141,7 +141,7 @@ public class TableAppender extends Appen
     /**
      * List of {@link Cell} objects, from left to right and top to bottom.
      * By convention, a {@code null} value or a {@link Cell} object with
-     * <code>{@link Cell#text} == null</code> means that we need to move
+     * <code>{@linkplain Cell#text} == null</code> means that we need to move
      * to the next line.
      */
     private final List<Cell> cells = new ArrayList<Cell>();

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -24,10 +24,11 @@
  * replaces all occurrence of {@code '\t'} by the amount of spaces needed for producing a tabular
  * output.
  *
- * {@note One of the formatter classes defined in this package is a <code>java.text.Format</code>
- * subclass. While traditionally though as part of <code>text</code> packages, that {@code Format}
- * is defined in this I/O package because it can format to an <code>Appendable</code> and for
- * consistency with the <code>org.apache.sis.io.wkt</code> package.}
+ * <div class="note"><b>Note:</b>
+ * One of the formatter classes defined in this package is a {@link java.text.Format java.text.Format} subclass.
+ * While traditionally though as part of {@code text} packages, that {@code Format} is defined in this I/O package
+ * because it can format to an {@link java.lang.Appendable} and for consistency with the {@link org.apache.sis.io.wkt}
+ * package.</div>
  *
  * {@section Unicode characters}
  * Some formatters in this package make extensive use of Unicode characters. This may produce

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -119,15 +119,14 @@ public final class DecimalFunctions exte
      * fraction digits to zero.
      * For example {@code (double) 0.1f} gives 0.10000000149011612 while {@code floatToDouble(0.1f)} returns 0.1.
      *
-     * {@note This method is <strong>not</strong> more accurate than the standard Java cast –
-     *        it should be used only when the base 10 representation of the given value may be of special interest.
-     *        If the value come from a call to <code>Float.parseFloat(String)</code> (directly or indirectly),
-     *        and if that call can not be replaced by a call to <code>Double.parseDouble(String)</code>
-     *        (for example because the original <code>String</code> is not available anymore), then this method
-     *        may be useful if one consider the <code>String</code> representation in base 10 as definitive.
-     *        But if the value come from an instrument measurement or a calculation, then there is probably
-     *        no reason to use this method because base 10 is not more "real" than base 2 or any other base
-     *        for natural phenomenon.}
+     * <div class="note"><b>Note:</b>
+     * This method is <strong>not</strong> more accurate than the standard Java cast – it should be used only when
+     * the base 10 representation of the given value may be of special interest. If the value come from a call to
+     * {@link Float#parseFloat(String)} (directly or indirectly), and if that call can not be replaced by a call to
+     * {@link Double#parseDouble(String)} (for example because the original {@code String} is not available anymore),
+     * then this method may be useful if one consider the {@code String} representation in base 10 as definitive.
+     * But if the value come from an instrument measurement or a calculation, then there is probably no reason to use
+     * this method because base 10 is not more "real" than base 2 or any other base for natural phenomenon.</div>
      *
      * This method is equivalent to the following code, except that it is potentially faster since the
      * actual implementation avoid to format and parse the value:
@@ -196,7 +195,7 @@ public final class DecimalFunctions exte
      * returned delta is always smaller than <code>{@linkplain Math#ulp(double) Math.ulp}(value) / 2</code>.
      * To see an effect, a type with more precision than the {@code double} type is necessary.
      *
-     * <blockquote><font size="-1"><b>Use case:</b>
+     * <div class="note"><b>Use case:</b>
      * Many international standards define values in base 10. For example the conversion factor from inches
      * to centimetres is defined as exactly 2.54 cm/inch. This is by an internationally accepted definition
      * since 1959, not an approximation. But the 2.54 value can not be represented exactly in the IEEE 754
@@ -205,7 +204,7 @@ public final class DecimalFunctions exte
      * (e.g. in non-linear equations where errors can grow exponentially), this method can be useful.
      * Other examples of values defined in base 10 are conversions from feet to metres and
      * map projection parameters defined by national mapping agencies.
-     * </font></blockquote>
+     * </div>
      *
      * {@section Domain of validity}
      * The current implementation can not compute delta for {@code abs(value) < 3E-8} approximatively,
@@ -325,31 +324,32 @@ public final class DecimalFunctions exte
      *   <li>If {@code accuracy} is 0, then this method returns 324 since 10<sup>-324</sup> is the first power of 10
      *       smaller than the minimal strictly positive {@code double} value ({@value java.lang.Double#MIN_VALUE}).
      *
-     *       {@note The above value can be understood in an other way: if the first 324 fraction digits are zero,
-     *              then the IEEE <code>double</code> value is guaranteed to be rounded to exactly 0 no matter
-     *              what the next fraction digits are.}</li>
+     *       <div class="note"><b>Note:</b>
+     *       The above value can be understood in an other way: if the first 324 fraction digits are zero,
+     *       then the IEEE {@code double} value is guaranteed to be rounded to exactly 0 no matter what the
+     *       next fraction digits are.</div></li>
      *
      *   <li>If {@code accuracy} is greater than 1, then this method returns
      *       the number of "unnecessary" trailing zeros as a negative number.
      *
-     *       {@example <code>fractionDigitsForDelta(100, …)</code> returns -2.}</li>
+     *       <div class="note"><b>Example:</b> {@code fractionDigitsForDelta(100, …)} returns -2.</div></li>
      *
      *   <li>If the first non-zero digits of {@code accuracy} are equal or greater than 95
      *       (e.g. 0.00099) and the {@code strict} argument is {@code true}, then this method
      *       increases the number of needed fraction digits in order to prevent the rounded
      *       number to be collapsed into the next integer value.
      *
-     *       {@example
-     *       If <code>accuracy</code> is 0.95, then a return value of 1 is not sufficient since
+     *       <div class="note"><b>Example:</b>
+     *       If {@code accuracy} is 0.95, then a return value of 1 is not sufficient since
      *       the rounded value of 0.95 with 1 fraction digit would be 1.0. Such value would be a
      *       violation of this method contract since the difference between 0 and that formatted
      *       value would be greater than the accuracy. Note that this is not an artificial rule;
-     *       this is related to the fact that 0.9999… is mathematically strictly equals to 1.}</li>
+     *       this is related to the fact that 0.9999… is mathematically strictly equals to 1.</div></li>
      * </ul>
      *
-     * <p>Invoking this method is equivalent to computing <code>(int)
+     * Invoking this method is equivalent to computing <code>(int)
      * -{@linkplain Math#floor(double) floor}({@linkplain Math#log10(double) log10}(accuracy))</code>
-     * except for the 0, {@code NaN}, infinities and {@code 0.…95} special cases.</p>
+     * except for the 0, {@code NaN}, infinities and {@code 0.…95} special cases.
      *
      * @param  accuracy The desired accuracy of numbers to format in base 10.
      * @param  strict {@code true} for checking the {@code 0.…95} special case.
@@ -388,8 +388,9 @@ public final class DecimalFunctions exte
      * For example {@code fractionDigitsForValue(1.0)} returns 16,
      * because the {@code double} format can store <i>almost</i> 16 decimal digits after 1.
      *
-     * {@note We said <i>almost</i> because the very last digit may be able to store only a subset of the
-     *        [0 … 9] digits.}
+     * <div class="note"><b>Note:</b>
+     * We said <cite>almost</cite> because the very last digit may be able to store only a subset
+     * of the [0 … 9] digits.</div>
      *
      * Invoking this method is equivalent to invoking <code>{@linkplain #fractionDigitsForDelta(double, boolean)
      * fractionDigitsForDelta}(Math.{@linkplain Math#ulp(double) ulp}(value), false)</code>, except that it is
@@ -404,9 +405,9 @@ public final class DecimalFunctions exte
      *       {@code Math.ulp(0)} = {@value java.lang.Double#MIN_VALUE}.</li>
      * </ul>
      *
-     * {@example This method is useful with <code>NumberFormat</code> for formatting all significant digits
-     *           of a <code>double</code> value, padding with trailing zeros if necessary, but no more than
-     *           necessary.}
+     * <div class="note"><b>Example:</b>
+     * This method is useful with {@link java.text.NumberFormat} for formatting all significant digits of a
+     * {@code double} value, padding with trailing zeros if necessary, but no more than necessary.</div>
      *
      * @param  value The value for which to get the number of significant fraction digits.
      * @return The number of significant fraction digits (may be negative), or 0 if {@code value} is NaN or infinity.
@@ -455,7 +456,8 @@ public final class DecimalFunctions exte
      *       results in 179.12499997000. The condition for 4 trailing zero fraction digits is not meet.</li>
      * </ul>
      *
-     * {@note The threshold of 4 trailing fraction digits is arbitrary and may change in any future SIS version.}
+     * <div class="note"><b>Note:</b>
+     * The threshold of 4 trailing fraction digits is arbitrary and may change in any future SIS version.</div>
      *
      * @param  value The value for which to get the number of significant fraction fraction digits minus rounding error.
      * @param  uncertainDigits Number of trailing fraction digits which may be rounding error artefacts.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -78,8 +78,9 @@ public enum FunctionProperty {
      * A function is <cite>injective</cite> if each value of <var>T</var> is either unrelated
      * to <var>S</var>, or is the output of exactly one value of <var>S</var>.
      *
-     * {@example A <code>ObjectConverter</code> doing conversions from <code>Integer</code> to <code>String</code>
-     * is an injective function, because no pair of integers can produce the same string.}
+     * <div class="note"><b>Example:</b>
+     * An {@link org.apache.sis.util.ObjectConverter} doing conversions from {@link Integer} to {@link String}
+     * is an injective function, because no pair of integers can produce the same string.</div>
      *
      * A function which is both injective and {@linkplain #SURJECTIVE surjective} is a
      * <cite>bijective</cite> function. In such functions, there is a one-to-one relationship
@@ -94,9 +95,10 @@ public enum FunctionProperty {
      * A function is <cite>surjective</cite> if any value of <var>T</var> can be created
      * from one or many values of <var>S</var>.
      *
-     * {@example A <code>ObjectConverter</code> doing conversions from <code>String</code> to <code>Integer</code>
+     * <div class="note"><b>Example:</b>
+     * An {@link org.apache.sis.util.ObjectConverter} doing conversions from {@link String} to {@link Integer}
      * is a surjective function, since there is always at least one string for each integer value. Note that such
-     * function can not be injective since many different strings can represent the same integer value.}
+     * function can not be injective since many different strings can represent the same integer value.</div>
      *
      * A function which is both {@linkplain #INJECTIVE injective} and surjective is a
      * <cite>bijective</cite> function. In such functions, there is a one-to-one relationship

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -107,9 +107,10 @@ public final class MathFunctions extends
      * In the current implementation, this value is {@value}. However this limit may
      * change in any future Apache SIS version.
      *
-     * {@note The current value is the highest prime number representable as an unsigned 16 bits
-     *        integer. This is enough for current needs because 16 bits prime numbers are sufficient
-     *        for finding the divisors of any 32 bits integers.}
+     * <div class="note"><b>Note:</b>
+     * The current value is the highest prime number representable as an unsigned 16 bits integer.
+     * This is enough for current needs because 16 bits prime numbers are sufficient for finding
+     * the divisors of any 32 bits integers.</div>
      *
      * @see #nextPrimeNumber(int)
      */
@@ -302,12 +303,11 @@ public final class MathFunctions extends
      * Computes 10 raised to the power of <var>x</var>. This method is faster and slightly more accurate
      * than invoking <code>{@linkplain Math#pow(double, double) Math.pow}(10, x)</code>.
      *
-     * {@note This method has been defined because the standard <code>Math.pow(10, x)</code>
-     *        method does not always return the closest IEEE floating point representation.
-     *        Slight departures (1 or 2 ULP) are often allowed in math functions for performance
-     *        reasons. The most accurate calculations are usually not necessary, but the base 10
-     *        is a special case since it is used for scaling axes or formatting human-readable
-     *        output.}
+     * <div class="note"><b>Note:</b>
+     * This method has been defined because the standard {@code Math.pow(10, x)} method does not always return
+     * the closest IEEE floating point representation. Slight departures (1 or 2 ULP) are often allowed in math
+     * functions for performance reasons. The most accurate calculations are usually not necessary, but the base
+     * 10 is a special case since it is used for scaling axes or formatting human-readable output.</div>
      *
      * Special cases:
      * <ul>

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -65,36 +65,39 @@ import org.apache.sis.internal.jdk7.Obje
  * Upper-case letters {@code D}, {@code M} and {@code S} stand for the integer parts of degrees,
  * minutes and seconds respectively. If present, they shall appear in that order.
  *
- * {@example "<code>M′D</code>" is illegal because "<code>M</code>" and "<code>S</code>" are in reverse order.
- *           "<code>D°S</code>" is also illegal because "<code>M</code>" is missing between "<code>D</code>" and
- *           "<code>S</code>".}
+ * <div class="note"><b>Example:</b>
+ * "{@code M′D}" is illegal because "{@code M}" and "{@code S}" are in reverse order.
+ * "{@code D°S}" is also illegal because "{@code M}" is missing between "{@code D}" and "{@code S}".</div>
  *
  * Lower-case letters {@code d}, {@code m} and {@code s} stand for fractional parts of degrees, minutes and
  * seconds respectively. Only one of those can appear in a pattern. If present, they must be in the last field.
  *
- * {@example "<code>D.dd°MM′</code>" is illegal because "<code>d</code>" is followed by "<code>M</code>".
- *           "<code>D.mm</code>" is also illegal because "<code>m</code>" is not the fractional part of
- *           "<code>D</code>".}
+ * <div class="note"><b>Example:</b>
+ * "{@code D.dd°MM′}" is illegal because "{@code d}" is followed by "{@code M}".
+ * "{@code D.mm}" is also illegal because "{@code m}" is not the fractional part of "{@code D}".</div>
  *
  * The number of occurrences of {@code D}, {@code M}, {@code S} and their lower-case counterpart is the number
  * of digits to format.
  *
- * {@example "<code>DD.ddd</code>" will format angles with two digits for the integer part and three digits
- *           for the fractional part (e.g. <code>4.4578</code> will be formatted as <code>"04.458"</code>).}
+ * <div class="note"><b>Example:</b>
+ * "{@code DD.ddd}" will format angles with two digits for the integer part and three digits
+ * for the fractional part (e.g. {@code 4.4578} will be formatted as {@code "04.458"}).</div>
  *
  * Separator characters like {@code °}, {@code ′} and {@code ″} are inserted "as-is" in the formatted string,
  * except the decimal separator dot ({@code .}) which is replaced by the local-dependent decimal separator.
  * Separator characters may be completely omitted; {@code AngleFormat} will still differentiate degrees,
  * minutes and seconds fields according the pattern.
  *
- * {@example "<code>0480439</code>" with the "<code>DDDMMmm</code>" pattern will be parsed as 48°04.39′.}
+ * <div class="note"><b>Example:</b>
+ * "{@code 0480439}" with the "{@code DDDMMmm}" pattern will be parsed as 48°04.39′.</div>
  *
  * The {@code ?} modifier specifies that the preceding field can be omitted if its value is zero.
  * Any field can be omitted for {@link Angle} object, but only trailing fields are omitted for
  * {@link Longitude} and {@link Latitude}.
  *
- * {@example "<code>DD°MM′?SS″?</code>" will format an angle of 12.01° as <code>12°36″</code>,
- *           but a longitude of 12.01°N as <code>12°00′36″N</code> (not <code>12°36″N</code>).}
+ * <div class="note"><b>Example:</b>
+ * "{@code DD°MM′?SS″?}" will format an angle of 12.01° as {@code 12°36″},
+ * but a longitude of 12.01°N as {@code 12°00′36″N} (not {@code 12°36″N}).</div>
  *
  * The above special case exists because some kind of angles are expected to be very small (e.g. rotation angles in
  * {@linkplain org.apache.sis.referencing.datum.BursaWolfParameters Bursa-Wolf parameters} are given in arc-seconds),
@@ -317,8 +320,9 @@ public class AngleFormat extends Format 
      * If the minutes field is declared optional but the degrees and seconds are formatted,
      * then minutes will be formatted too un order to reduce the risk of confusion
      *
-     * {@example Value 12.01 is formatted as <code>12°00′36″</code> if <code>true</code>
-     *           and as <code>12°36″</code> if <code>false</code>.}
+     * <div class="note"><b>Example:</b>
+     * Value 12.01 is formatted as {@code 12°00′36″} if this field is {@code true},
+     * and as {@code 12°36″} if this field is {@code false}.</div>
      */
     private transient boolean showLeadingFields;
 

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -24,9 +24,10 @@ import org.opengis.referencing.cs.AxisDi
  * The elevation angle is part of <cite>local topocentric coordinates</cite> together with azimuth and distance.
  * For visible objects the elevation is an angle between 0° and 90°.
  *
- * {@note <cite>Elevation angle</cite> and <cite>altitude angle</cite> may be used interchangeably.
- *        Both <cite>altitude</cite> and <cite>elevation</cite> words are also used to describe the
- *        height in meters above sea level.}
+ * <div class="note"><b>Note:</b>
+ * <cite>Elevation angle</cite> and <cite>altitude angle</cite> may be used interchangeably.
+ * Both <cite>altitude</cite> and <cite>elevation</cite> words are also used to describe the
+ * height in meters above sea level.</div>
  *
  * {@section Immutability and thread safety}
  * This final class is immutable and thus inherently thread-safe.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -159,11 +159,11 @@ public class Range<E extends Comparable<
      * Creates a new range using the same element type than this range. This method will
      * be overridden by subclasses in order to create a range of a more specific type.
      *
-     * {@note This method is invoked by all operations (union, intersection, <i>etc.</i>) that may
-     * create a new range. But despite this fact, the return type of those methods are nailed down
-     * to <code>Range</code> (i.e. subclasses shall not override the above-cited operations with
-     * covariant return type) because those operations may return the given argument directly,
-     * and we have no guarantees on the type of those arguments.}
+     * <div class="note"><b>API note:</b>
+     * This method is invoked by all operations (union, intersection, <i>etc.</i>) that may create a new range.
+     * But despite this fact, the return type of those methods are nailed down to {@code Range} (i.e. subclasses
+     * shall not override the above-cited operations with covariant return type) because those operations may return
+     * the given argument directly, and we have no guarantees on the type of those arguments.</div>
      */
     Range<E> create(final E minValue, final boolean isMinIncluded,
                     final E maxValue, final boolean isMaxIncluded)
@@ -261,8 +261,9 @@ public class Range<E extends Comparable<
      * {@linkplain #getMaxValue() maximum value}, or if they are equal while
      * at least one of them is exclusive.
      *
-     * {@note This method is final because often used by the internal implementation.
-     *        Making the method final ensures that the other methods behave consistently.}
+     * <div class="note"><b>API note:</b>
+     * This method is final because often used by the internal implementation.
+     * Making the method final ensures that the other methods behave consistently.</div>
      *
      * @return {@code true} if this range is empty.
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -1325,9 +1325,10 @@ public final class ArraysExt extends Sta
      *     array = resize(array, removeDuplicated(array));
      * }
      *
-     * {@note This method return type is not an array in order to make obvious that the given
-     *        array will be modified in-place. This behavior is different than the behavior of
-     *        many other methods in this class, which do not modify the given source array.}
+     * <div class="note"><b>API note:</b>
+     * This method return type is not an array in order to make obvious that the given array will be modified in-place.
+     * This behavior is different than the behavior of many other methods in this class, which do not modify the given
+     * source array.</div>
      *
      * @param  array Array from which to remove duplicated elements, or {@code null}.
      * @return The number of remaining elements in the given array, or 0 if the given
@@ -1717,8 +1718,9 @@ public final class ArraysExt extends Sta
     /**
      * Swaps the elements at the given indices in the given array of {@code Object} values.
      *
-     * {@note While trivial, this method is provided because its need occurs relatively often
-     *        and the availability of a <code>swap</code> method makes the code easier to read.}
+     * <div class="note"><b>Note:</b>
+     * While trivial, this method is provided because its need occurs relatively often
+     * and the availability of a {@code swap} method makes the code easier to read.</div>
      *
      * @param data The array in which to swap elements.
      * @param i0   Index of one element to be swapped.
@@ -1735,8 +1737,9 @@ public final class ArraysExt extends Sta
     /**
      * Swaps the elements at the given indices in the given array of {@code double} values.
      *
-     * {@note While trivial, this method is provided because its need occurs relatively often
-     *        and the availability of a <code>swap</code> method makes the code easier to read.}
+     * <div class="note"><b>Note:</b>
+     * While trivial, this method is provided because its need occurs relatively often
+     * and the availability of a {@code swap} method makes the code easier to read.</div>
      *
      * @param data The array in which to swap elements.
      * @param i0   Index of one element to be swapped.
@@ -1783,8 +1786,9 @@ public final class ArraysExt extends Sta
     /**
      * Swaps the elements at the given indices in the given array of {@code int} values.
      *
-     * {@note While trivial, this method is provided because its need occurs relatively often
-     *        and the availability of a <code>swap</code> method makes the code easier to read.}
+     * <div class="note"><b>Note:</b>
+     * While trivial, this method is provided because its need occurs relatively often
+     * and the availability of a {@code swap} method makes the code easier to read.</div>
      *
      * @param data The array in which to swap elements.
      * @param i0   Index of one element to be swapped.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -51,12 +51,13 @@ import static org.apache.sis.internal.jd
  *       feeds or tabulations are entity boundaries.</li>
  * </ul>
  *
- * {@example Numbers formatted in the French locale use no-break spaces as group separators. When parsing a list
- * of numbers, ordinary spaces around the numbers may need to be ignored, but no-break spaces shall be considered as
- * part of the numbers. Consequently <code>isWhitespace(…)</code> is appropriate for skipping spaces <em>between</em>
- * the numbers. But if there is spaces to skip <em>inside</em> a single number, then <code>isSpaceChar(…)</code> is a
- * good choice for accepting no-break spaces and for stopping the parse operation at tabulations or line feed character.
- * A tabulation or line feed between two characters is very likely to separate two distinct values.}
+ * <div class="note"><b>Example:</b>
+ * Numbers formatted in the French locale use no-break spaces as group separators. When parsing a list of numbers,
+ * ordinary spaces around the numbers may need to be ignored, but no-break spaces shall be considered as part of the
+ * numbers. Consequently {@code isWhitespace(…)} is appropriate for skipping spaces <em>between</em> the numbers.
+ * But if there is spaces to skip <em>inside</em> a single number, then {@code isSpaceChar(…)} is a good choice
+ * for accepting no-break spaces and for stopping the parse operation at tabulations or line feed character.
+ * A tabulation or line feed between two characters is very likely to separate two distinct values.</div>
  *
  * In practice, the {@link java.text.Format} implementations in the SIS library typically use
  * {@code isSpaceChar(…)} while most of the rest of the SIS library, including this
@@ -687,13 +688,13 @@ search:     for (; fromIndex <= toIndex;
      *       {@linkplain Characters#PARAGRAPH_SEPARATOR paragraph separator}.</li>
      * </ul>
      *
-     * {@note Prior JDK8 this method was relatively cheap because all string instances created by
-     *        <code>String.substring(int,int)</code> shared the same <code>char[]</code> internal
-     *        array. However since JDK8, the new <code>String</code> implementation copies the data
-     *        in new arrays. Consequently it is better to use index rather than this method for
-     *        splitting large <code>String</code>s. However this method still useful for other
-     *        <code>CharSequence</code> implementations providing an efficient
-     *        <code>subSequence(int,int)</code> method.}
+     * <div class="note"><b>Performance note:</b>
+     * Prior JDK8 this method was relatively cheap because all string instances created by
+     * {@link String#substring(int,int)} shared the same {@code char[]} internal array.
+     * However since JDK8, the new {@code String} implementation copies the data in new arrays.
+     * Consequently it is better to use index rather than this method for splitting large {@code String}s.
+     * However this method still useful for other {@link CharSequence} implementations providing an efficient
+     * {@code subSequence(int,int)} method.</div>
      *
      * @param  text The multi-line text from which to get the individual lines, or {@code null}.
      * @return The lines in the text, or an empty array if the given text was null.
@@ -1412,9 +1413,9 @@ searchWordBreak:    while (true) {
      * one character from the same word may appear in the acronym, but they must always
      * be the first consecutive characters. The comparison is case-insensitive.
      *
-     * {@example Given the <code>"Open Geospatial Consortium"</code> words, the following strings are
-     *           recognized as acronyms: <code>"OGC"</code>, <code>"ogc"</code>, <code>"O.G.C."</code>,
-     *           <code>"OpGeoCon"</code>.}
+     * <div class="note"><b>Example:</b>
+     * Given the {@code "Open Geospatial Consortium"} words, the following strings are recognized as acronyms:
+     * {@code "OGC"}, {@code "ogc"}, {@code "O.G.C."}, {@code "OpGeoCon"}.</div>
      *
      * If any of the given arguments is {@code null}, this method returns {@code false}.
      *
@@ -1548,8 +1549,9 @@ cmp:    while (ia < lga) {
      * Returns {@code true} if every characters in the given sequence are
      * {@linkplain Character#isUpperCase(int) upper-case} letters.
      *
-     * {@note The behavior of this method regarding digits and punctuation is unspecified
-     *        and may change in future versions.}
+     * <div class="note"><b>Note:</b>
+     * The behavior of this method regarding digits and punctuation is unspecified
+     * and may change in future versions.</div>
      *
      * @param  text The character sequence to test.
      * @return {@code true} if every character are upper-case.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -113,11 +113,11 @@ public enum ComparisonMode {
      * those objects as equivalent despite difference in the set of parameters, as long as coordinate
      * transformations still produce the same results.</p>
      *
-     * <blockquote><font size="-1"><b>Example:</b> A {@code "Mercator (2SP)"} projection with a
+     * <div class="note"><b>Example:</b> A {@code "Mercator (2SP)"} projection with a
      * {@linkplain org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#standardParallels
      * standard parallel} value of 60° produces the same results than a {@code "Mercator (1SP)"} projection with a
      * {@linkplain org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#scaleFactor scale
-     * factor} value of 0.5.</font></blockquote>
+     * factor} value of 0.5.</div>
      *
      * @see org.apache.sis.util.Utilities#equalsIgnoreMetadata(Object, Object)
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -24,11 +24,12 @@ import org.opengis.util.InternationalStr
  * by this interface are unrelated to the entities deprecated by the Java {@link Deprecated} annotation.
  * This interface is for identifying deprecated <em>data</em> rather than language constructs.
  *
- * {@example When an error is discovered in the definition of a Coordinate Reference System (CRS) in the EPSG
- * database, the EPSG maintainers do not change the data. Instead, they deprecate the erroneous definition
- * and create a new one with a new EPSG code. The <code>isDeprecated()</code> method in this interface allows
- * users to identify CRS instances created from such deprecated database records, for example in order to log
- * a warning when data are projected to a deprecated CRS.}
+ * <div class="note"><b>Example:</b>
+ * When an error is discovered in the definition of a Coordinate Reference System (CRS) in the EPSG database,
+ * the EPSG maintainers do not change the data. Instead, they deprecate the erroneous definition and create a
+ * new one with a new EPSG code. The {@link #isDeprecated()} method in this interface allows users to identify
+ * CRS instances created from such deprecated database records, for example in order to log a warning when data
+ * are projected to a deprecated CRS.</div>
  *
  * Some examples of deprecated instances are:
  *

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -110,7 +110,7 @@ public interface LenientComparable {
      * 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>All attributes of the compared objects shall be strictly equal.</td></tr>
      *   <tr><td>{@link ComparisonMode#BY_CONTRACT BY_CONTRACT}:</td>
@@ -122,7 +122,7 @@ public interface LenientComparable {
      *           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>
      *
      * {@section Conformance to the <code>equals(Object)</code> method contract}
      * {@link ComparisonMode#STRICT} is the only mode compliant with the {@link Object#equals(Object)} contract.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -94,10 +94,11 @@ public final class Locales extends Stati
      * for compactness (conversions is done by {@link #toNumber(String, int)}) and for avoiding references
      * to {@code String} instances.
      *
-     * {@note Oracle JDK8 implementation computes the 3-letters codes on-the-fly instead of holding references
-     *        to pre-existing strings. If we were holding string references here, we would prevent the garbage
-     *        collector to collect the strings for all languages and countries. This would probably be a waste
-     *        of resources.}
+     * <div class="note"><b>Implementation note:</b>
+     * Oracle JDK8 implementation computes the 3-letters codes on-the-fly instead of holding references
+     * to pre-existing strings. If we were holding string references here, we would prevent the garbage
+     * collector to collect the strings for all languages and countries. This would probably be a waste
+     * of resources.</div>
      */
     private static final short[] ISO3, ISO2;
     static {
@@ -269,10 +270,10 @@ filter: for (final Locale locale : local
      * string are parsed as documented in the {@link #parse(String)} method. In particular, this method tries to
      * convert 3-letters codes to 2-letters code on a <cite>best effort</cite> basis.
      *
-     * {@example This method is useful when language codes are appended to a base property or resource name.
-     *           For example a dictionary may define the <code>"remarks"</code> property by values associated
-     *           to the <code>"remarks_en"</code> and <code>"remarks_fr"</code> keys, for English and French
-     *           locales respectively.}
+     * <div class="note"><b>Example:</b>
+     * This method is useful when language codes are appended to a base property or resource name.
+     * For example a dictionary may define the {@code "remarks"} property by values associated to the
+     * {@code "remarks_en"} and {@code "remarks_fr"} keys, for English and French locales respectively.</div>
      *
      * @param  code The language code, which may be followed by country code.
      * @param  fromIndex Index of the first character to parse.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -23,9 +23,10 @@ package org.apache.sis.util;
  * the error is an illegal argument rather than an unexpected usage of a null pointer
  * inside a method body.
  *
- * {@note We could argue that this exception should extend <code>IllegalArgumentException</code>.
- *        However <code>NullPointerException</code> has become a more widely adopted practice and
- *        is now the recommended one in the <cite>Effective Java</cite> book.}
+ * <div class="note"><b>API note:</b>
+ * We could argue that this exception should extend {@link IllegalArgumentException}.
+ * However {@link NullPointerException} has become a more widely adopted practice and
+ * is now the recommended one in the <cite>Effective Java</cite> book.</div>
  *
  * @author Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-3.00)



Mime
View raw message