sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1572517 [1/2] - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-build-helper/src/site/apt/ core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ core/sis-metadata/src/main/java/org/ap...
Date Thu, 27 Feb 2014 11:16:15 GMT
Author: desruisseaux
Date: Thu Feb 27 11:16:13 2014
New Revision: 1572517

URL: http://svn.apache.org/r1572517
Log:
Complete the replacement of {@note} and {@example} custom taglets by CSS.

Removed:
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Example.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Note.java
Modified:
    sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java

Modified: sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Thu Feb 27 11:16:13 2014
@@ -39,14 +39,8 @@ Building Apache SIS
 *----------------------+-------------------------------------------------------------------------------------------+
 || Javadoc tag         || Description                                                                             ||
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@example\}>>>   | An inline taglet for an example.                                                          |
-|                      | Examples appear as indented paragraphs with a smaller font.                               |
-*----------------------+-------------------------------------------------------------------------------------------+
 | <<<@module>>>        | Create links to the module where the class is defined, source code and Maven artifacts.   |
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@note\}>>>      | An inline taglet for a remark that readers can safely ignore.                             |
-|                      | Notes appear as indented paragraphs with a smaller font.                                  |
-*----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@preformat\}>>> | An inline taglet for pre-formatted text. The first word inside the taglet shall be one of |
 |                      | <<<java>>>, <<<xml>>>, <<<sql>>>, <<<wkt>>>, <<<text>>>, <<<math>>> or <<<shell>>>.       |
 *----------------------+-------------------------------------------------------------------------------------------+

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -232,14 +232,15 @@ public enum Convention {
      * The difference between various authorities are most easily seen in projection and parameter names.
      * The value returned by this method can be overwritten by {@link WKTFormat#setNameAuthority(Citation)}.
      *
-     * {@example The following table shows the names given by various organizations or projects for the same projection:
+     * <div class="note"><b>Example:</b>
+     * The following table shows the names given by various organizations or projects for the same projection:
      *
      * <table class="sis">
      *   <tr><th>Authority</th> <th>Projection name</th></tr>
      *   <tr><td>EPSG</td>      <td>Mercator (variant A)</td></tr>
      *   <tr><td>OGC</td>       <td>Mercator_1SP</td></tr>
      *   <tr><td>GEOTIFF</td>   <td>CT_Mercator</td></tr>
-     * </table>}
+     * </table></div>
      *
      * @return The organization, standard or project to look for when fetching Map Projection parameter names.
      *

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -386,9 +386,10 @@ public class Formatter implements Locali
      * <p>The preferred authority can be set by the {@link WKTFormat#setNameAuthority(Citation)} method.
      * This is not necessarily the authority who created the object to format.</p>
      *
-     * {@example The EPSG name of the <code>EPSG:6326</code> datum is "<cite>World Geodetic System 1984</cite>".
-     *           However if the preferred authority is OGC, then the formatted datum name will rather look like
-     *           "<cite>WGS84</cite>" (the exact string depends on the object aliases).}
+     * <div class="note"><b>Example:</b>
+     * The EPSG name of the {@code EPSG:6326} datum is "<cite>World Geodetic System 1984</cite>".
+     * However if the preferred authority is OGC, then the formatted datum name will rather look like
+     * "<cite>WGS84</cite>" (the exact string depends on the object aliases).</div>
      *
      * @return The authority for projection and parameter names.
      *
@@ -849,12 +850,12 @@ public class Formatter implements Locali
      * Appends an international text in an element having the given keyword. Since this method
      * is typically invoked for long descriptions, the element will be written on its own line.
      *
-     * {@example
+     * <div class="note"><b>Example:</b>
      *   <ul>
-     *     <li><code>Scope["Large scale topographic mapping and cadastre."]</code></li>
-     *     <li><code>Area["Netherlands offshore."]</code></li>
+     *     <li>{@code Scope["Large scale topographic mapping and cadastre."]}</li>
+     *     <li>{@code Area["Netherlands offshore."]}</li>
      *   </ul>
-     * }
+     * </div>
      *
      * @param keyword The {@linkplain KeywordCase#CAMEL_CASE camel-case} keyword.
      *                Example: {@code "Scope"}, {@code "Area"} or {@code "Remarks"}.
@@ -1048,7 +1049,8 @@ public class Formatter implements Locali
      * {@code ANGLEUNIT}, {@code LENGTHUNIT}, {@code SCALEUNIT}, {@code PARAMETRICUNIT} and {@code TIMEUNIT}.
      * Specialization is used in WKT 2 format except the <cite>simplified WKT 2</cite> one.
      *
-     * {@example <code>append(SI.KILOMETRE)</code> will append "<code>LENGTHUNIT["km", 1000]</code>" to the WKT.}
+     * <div class="note"><b>Example:</b>
+     * {@code append(SI.KILOMETRE)} will append "{@code LENGTHUNIT["km", 1000]}" to the WKT.</div>
      *
      * @param unit The unit to append to the WKT, or {@code null} if none.
      */

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -307,11 +307,13 @@ public class Symbols implements Localize
      * Each string shall contain exactly two code points (usually two characters).
      * The first code point is taken as the opening bracket, and the second code point as the closing bracket.
      *
-     * {@example The following code will instruct the WKT formatter to use the <code>(…)</code> pair of brackets
-     *           at formatting time, but still accept the more common <code>[…]</code> pair of brackets at parsing
-     *           time:
-     *
-     *           <pre>setPairedBrackets("()", "[]");</pre>}
+     * <div class="note"><b>Example:</b>
+     * The following code will instruct the WKT formatter to use the (…) pair of brackets at formatting time,
+     * but still accept the more common […] pair of brackets at parsing time:
+     *
+     * {@preformat java
+     *   symbols.setPairedBrackets("()", "[]");
+     * }</div>
      *
      * @param preferred The preferred pair of opening and closing quotes, used at formatting time.
      * @param alternatives Alternative pairs of opening and closing quotes accepted at parsing time.
@@ -374,12 +376,14 @@ public class Symbols implements Localize
      * Each string shall contain exactly two code points (usually two characters).
      * The first code point is taken as the opening quote, and the second code point as the closing quote.
      *
-     * {@example The following code will instruct the WKT formatter to use the prettier <code>“…”</code>
-     *           quotation marks at formatting time (especially useful for <code>String</code> constants
-     *           in Java code), but still accept the standard <code>"…"</code> quotation marks at parsing
-     *           time:
-     *
-     *           <pre>setPairedQuotes("“”", "\"\"");</pre>}
+     * <div class="note"><b>Example:</b>
+     * The following code will instruct the WKT formatter to use the prettier “…” quotation marks at formatting time
+     * (especially useful for {@code String} constants in Java code), but still accept the standard "…" quotation marks
+     * at parsing time:
+     *
+     * {@preformat java
+     *   symbols.setPairedQuotes("“”", "\"\"");
+     * }</div>
      *
      * @param preferred The preferred pair of opening and closing quotes, used at formatting time.
      * @param alternatives Alternative pairs of opening and closing quotes accepted at parsing time.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -24,9 +24,9 @@ import org.opengis.referencing.Identifie
  * A formatting may fail because an object contains properties which can not be represented
  * by the standard WKT elements.
  *
- * {@example An engineering CRS can not be represented in the WKT 1 format if all axes
- *           do not use the same unit of measurement. However such CRS can be represented
- *           in the WKT 2 format.}
+ * <div class="note"><b>Example:</b>
+ * An engineering CRS can not be represented in the WKT 1 format if all axes do not use the same
+ * unit of measurement. However such CRS can be represented in the WKT 2 format.</div>
  *
  * This exception may also be thrown by {@link Formatter} if the object given to an
  * {@code append(…)} method is an instance of an unsupported class.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -61,7 +61,7 @@ import org.apache.sis.util.resources.Err
  * Note however that this class doesn't replace occurrences between quoted text, so string
  * expansion still relatively safe even when used with non-prefixed identifiers.</p>
  *
- * <blockquote><font size="-1"><b>Example:</b>
+ * <div class="note"><b>Example:</b>
  * In the example below, the {@code $WGS84} substring which appear in the argument given to the
  * {@code parseObject(…)} method will be expanded into the full {@code GEOGCS["WGS84", …]} string
  * before the parsing proceed.
@@ -69,7 +69,7 @@ import org.apache.sis.util.resources.Err
  * <blockquote><code>{@linkplain #definitions()}.put("$WGS84", "GEOGCS[\"WGS84\", DATUM[</code> <i>…etc…</i> <code>]]);<br>
  * Object crs = {@linkplain #parseObject(String) parseObject}("PROJCS[\"Mercator_1SP\", <strong>$WGS84</strong>,
  * PROJECTION[</code> <i>…etc…</i> <code>]]");</code></blockquote>
- * </font></blockquote>
+ * </div>
  *
  * {@section Thread safety}
  * {@code WKTFormat}s are not synchronized. It is recommended to create separated format instances for each thread.
@@ -282,14 +282,15 @@ public class WKTFormat extends CompoundF
      * Returns the preferred authority to look for when fetching identified object names and identifiers.
      * The difference between various authorities are most easily seen in projection and parameter names.
      *
-     * {@example The following table shows the names given by various organizations or projects for the same projection:
+     * <div class="note"><b>Example:</b>
+     * The following table shows the names given by various organizations or projects for the same projection:
      *
      * <table class="sis">
      *   <tr><th>Authority</th> <th>Projection name</th></tr>
      *   <tr><td>EPSG</td>      <td>Mercator (variant A)</td></tr>
      *   <tr><td>OGC</td>       <td>Mercator_1SP</td></tr>
      *   <tr><td>GEOTIFF</td>   <td>CT_Mercator</td></tr>
-     * </table>}
+     * </table></div>
      *
      * If no authority has been {@link #setNameAuthority(Citation) explicitly set}, then this
      * method returns the default authority for the current {@linkplain #getConvention() convention}.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -455,7 +455,8 @@ public class MetadataStandard implements
      * {@linkplain KeyNamePolicy#METHOD_NAME method names} or {@linkplain KeyNamePolicy#SENTENCE
      * sentences} (usually in English).
      *
-     * <p><b>Example:</b> the following code prints <code>"alternateTitle<u>s</u>"</code> (note the plural):</p>
+     * <div class="note"><b>Example:</b>
+     * The following code prints <code>"alternateTitle<u>s</u>"</code> (note the plural):
      *
      * {@preformat java
      *   MetadataStandard standard = MetadataStandard.ISO_19115;
@@ -463,6 +464,7 @@ public class MetadataStandard implements
      *   String value = names.get("alternateTitle");
      *   System.out.println(value); // alternateTitles
      * }
+     * </div>
      *
      * The {@code keyPolicy} argument specify only the string representation of keys returned by the iterators.
      * No matter the key name policy, the {@code key} argument given to any {@link Map} method can be any of the

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -71,7 +71,7 @@ import java.util.Objects;
  * {@linkplain #getEastBoundLongitude() east bound longitude}, then the box spans the anti-meridian.
  * See {@linkplain org.apache.sis.geometry.GeneralEnvelope} for more information on anti-meridian spanning.
  *
- * <blockquote><font size="-1"><b>Note: relationship with Envelope classes</b><br>
+ * <div class="note"><b>Note: relationship with Envelope classes</b><br>
  * The {@link org.apache.sis.geometry} package provides various {@code Envelope} classes serving a simular purpose.
  * The main difference is that envelopes can be expressed in any {@linkplain org.apache.sis.referencing.crs.AbstractCRS
  * Coordinate Reference System} (for example using any map projection), may have any number of dimensions, axes may have
@@ -84,7 +84,7 @@ import java.util.Objects;
  * box should be used only as a convenient way to give an <em>approximate</em> description of a location.
  * Users can assume a precision of about 0.01° for the latitude and longitude values in this class.
  * If more precision is desired, an {@code Envelope} should be considered instead.
- * </font></blockquote>
+ * </div>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -149,13 +149,14 @@ public final class Extents extends Stati
      *   </ul></li>
      * </ul>
      *
-     * {@example Heights or depths are often measured using some pressure units, for example hectopascals (hPa).
-     *           An <code>Extent</code> could contain two vertical elements: one with the height measurements
-     *           in hPa, and the other element with heights transformed to metres using an empirical formula.
-     *           In such case this method will select the first vertical element on the assumption that it is
-     *           the "main" one that the metadata producer intended to show. Then this method will search for
-     *           other vertical elements using pressure unit. In our example there is none. But if any were
-     *           found, this method would compute their union.}
+     * <div class="note"><b>Example:</b>
+     * Heights or depths are often measured using some pressure units, for example hectopascals (hPa).
+     * An {@code Extent} could contain two vertical elements: one with the height measurements in hPa,
+     * and the other element with heights transformed to metres using an empirical formula.
+     * In such case this method will select the first vertical element on the assumption that it is
+     * the "main" one that the metadata producer intended to show. Next, this method will search for
+     * other vertical elements using pressure unit. In our example there is none, but if such elements
+     * were found, this method would compute their union.</div>
      *
      * @param  extent The extent to convert to a vertical measurement range, or {@code null}.
      * @return A vertical measurement range created from the given extent, or {@code null} if none.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -985,9 +985,8 @@ public abstract class AbstractEnvelope i
      * with equals coordinates and {@linkplain #getCoordinateReferenceSystem() CRS}.
      *
      * <div class="note"><b>Implementation note:</b>
-     * This implementation requires that the provided <code>object</code> argument is of the same class
-     * than this envelope. We do not relax this rule since not every implementations in the SIS code base
-     * follow the same contract.</div>
+     * This implementation requires that the provided {@code object} argument is of the same class than this envelope.
+     * We do not relax this rule since not every implementations in the SIS code base follow the same contract.</div>
      *
      * @param object The object to compare with this envelope.
      * @return {@code true} if the given object is equal to this envelope.
@@ -1044,12 +1043,12 @@ public abstract class AbstractEnvelope i
      * where <var>n</var> is the {@linkplain #getDimension() number of dimensions}.
      * The number of dimension is written only if different than 2.
      *
-     * {@example
+     * <div class="note"><b>Example:</b>
      *   <ul>
-     *     <li><code>BOX(-90 -180, 90 180)</code></li>
-     *     <li><code>BOX3D(-90 -180 0, 90 180 1)</code></li>
+     *     <li>{@code BOX(-90 -180, 90 180)}</li>
+     *     <li>{@code BOX3D(-90 -180 0, 90 180 1)}</li>
      *   </ul>
-     * }
+     * </div>
      *
      * <div class="note"><b>Note:</b>
      * The {@code BOX} element is not part of the standard <cite>Well Known Text</cite> (WKT) format.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -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.
      */

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -89,10 +89,11 @@ import java.util.Objects;
  * 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:
  *

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -223,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
@@ -250,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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -204,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
@@ -234,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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Thu Feb 27 11:16:13 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,7 +427,7 @@ public class AbstractCS extends Abstract
      *   Axis["latitude", north],
      *   Axis["longitude", east]
      * }
-     * </font></blockquote>
+     * </div>
      *
      * <div class="note"><b>Compatibility note:</b>
      * {@code CS} is defined in the WKT 2 specification only.</div>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] Thu Feb 27 11:16:13 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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] Thu Feb 27 11:16:13 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)) {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -221,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;
 

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -500,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",
@@ -515,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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -311,7 +311,7 @@ public class DefaultVerticalDatum extend
      *
      * <div class="note"><b>Compatibility note:</b>
      * OGC 01-009 defined numerical codes for various vertical datum types, for example 2005 for geoidal height
-     * and 2002 for ellipsoidal height. Such codes were formatted for all <code>Datum</code> subtypes in WKT 1.
+     * and 2002 for ellipsoidal height. Such codes were formatted for all {@code Datum} subtypes in WKT 1.
      * Datum types became provided only for vertical datum in the ISO 19111:2003 specification, then removed
      * completely in ISO 19111:2007.</div>
      *

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -365,9 +365,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:

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -257,8 +257,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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -77,8 +77,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.
@@ -156,10 +157,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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java [UTF-8] Thu Feb 27 11:16:13 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.
  *
@@ -139,11 +139,11 @@ public abstract class CompoundFormat<T> 
      *       and {@link org.opengis.util.InternationalString} contents.</li>
      * </ul>
      *
-     * {@example The ISO 19162 (<cite>Well Known Text</cite>) standard requires a number format similar to the one
-     *           defined by <code>Locale.ROOT</code> while it allows informative texts (remarks, <i>etc.</i>) to be
-     *           formatted in the user's locale. Consequently <code>WKTFormat</code> fixes (usually) the locale for
-     *           <code>Category.FORMAT</code> to <code>Locale.ROOT</code> and let <code>Category.DISPLAY</code> be
-     *           any locale.}
+     * <div class="note"><b>Example:</b>
+     * The ISO 19162 (<cite>Well Known Text</cite>) standard requires a number format similar to the one defined by
+     * {@code Locale.ROOT} while it allows informative texts (remarks, <i>etc.</i>) to be formatted according the
+     * user's locale. Consequently {@code WKTFormat} fixes (usually) the locale for {@code Category.FORMAT} to
+     * {@code Locale.ROOT} and let {@code Category.DISPLAY} be any locale.</div>
      *
      * For subclasses that do not override this method, the default implementation returns {@link #getLocale()}.
      *
@@ -171,12 +171,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.
      */
@@ -205,10 +205,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)}.
@@ -265,11 +266,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.
@@ -309,10 +310,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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] Thu Feb 27 11:16:13 2014
@@ -138,7 +138,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<>();

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] Thu Feb 27 11:16:13 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java?rev=1572517&r1=1572516&r2=1572517&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] Thu Feb 27 11:16:13 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



Mime
View raw message