sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1572725 [1/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
Author: desruisseaux
Date: Thu Feb 27 20:40:01 2014
New Revision: 1572725

URL: http://svn.apache.org/r1572725
Log:
Merge from the JDK6 branch. Mostly javadoc styling and Maven site simplification.
No significant code change.

Removed:
    sis/trunk/application/sis-console/src/site/
    sis/trunk/application/sis-webapp/src/site/
    sis/trunk/application/src/
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Example.java
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Note.java
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
    sis/trunk/core/sis-build-helper/src/site/resources/
    sis/trunk/core/sis-build-helper/src/site/site.xml
    sis/trunk/core/sis-feature/src/site/
    sis/trunk/core/sis-metadata/src/site/
    sis/trunk/core/sis-referencing/src/site/
    sis/trunk/core/sis-utility/src/site/resources/
    sis/trunk/core/sis-utility/src/site/site.xml
    sis/trunk/core/src/
    sis/trunk/profiles/sis-french-profile/src/site/
    sis/trunk/profiles/src/
    sis/trunk/src/main/link-target/
    sis/trunk/storage/sis-netcdf/src/site/
    sis/trunk/storage/sis-shapefile/src/site/
    sis/trunk/storage/sis-storage/src/site/
    sis/trunk/storage/src/
Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
    sis/trunk/core/sis-build-helper/src/main/javadoc/overview.html
    sis/trunk/core/sis-build-helper/src/site/apt/index.apt
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
    sis/trunk/core/sis-metadata/src/main/javadoc/overview.html
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java
    sis/trunk/core/sis-referencing/src/main/javadoc/overview.html
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
    sis/trunk/core/sis-utility/src/main/javadoc/overview.html
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/trunk/pom.xml
    sis/trunk/src/main/javadoc/stylesheet.css
    sis/trunk/src/site/apt/index.apt
    sis/trunk/src/site/site.xml
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1570733-1572717
  Merged /sis/branches/JDK6:r1570734-1572721

Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -27,7 +27,7 @@ import com.sun.tools.doclets.Taglet;
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3 (derived from geotk-2.2)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final class Module implements Taglet {
@@ -42,11 +42,6 @@ public final class Module implements Tag
     }
 
     /**
-     * The base URL for Maven reports, with a trailing slash.
-     */
-    private static final String MAVEN_REPORTS_BASE_URL = WebSite.URL + '/';
-
-    /**
      * The SIS module in which the <code>@module</code> taglet has been found.
      */
     private String module;
@@ -180,8 +175,7 @@ public final class Module implements Tag
             /*
              * Appends the module link.
              */
-            buffer.append("Defined in the <a href=\"").append(MAVEN_REPORTS_BASE_URL).append(module)
-                  .append("/index.html\">").append(module).append("</a> module");
+            buffer.append("Defined in the <code>").append(module).append("</code> module");
         }
         return buffer.append("</font></p>\n").toString();
     }

Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -30,8 +30,7 @@ import org.sonatype.plexus.build.increme
 
 /**
  * Compiles the international resources that are found in the module from which this mojo is invoked.
- * See the <code><a href="{@website}/sis-build-helper/index.html">sis-build-helper</a></code> module
- * for more information.
+ * See the <code>sis-build-helper</code> module for more information.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Olivier Nouguier (Geomatys)

Modified: sis/trunk/core/sis-build-helper/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/javadoc/overview.html?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/javadoc/overview.html (original)
+++ sis/trunk/core/sis-build-helper/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-build-helper">sis-build-helper</a> module.
+    Overview of Apache <code>sis-build-helper</code> module.
     This module is for internal use by Apache SIS only and may change in incompatible way
     in any SIS version.
   </body>

Modified: sis/trunk/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/site/apt/index.apt?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Thu Feb 27 20:40:01 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>>>.       |
 *----------------------+-------------------------------------------------------------------------------------------+
@@ -55,8 +49,6 @@ Building Apache SIS
 *----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@section\}>>>   | An inline taglet for the title of a new section in the javadoc.                           |
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@website\}>>>   | An inline taglet for the URL to the Apache SIS web site (Maven reports).                  |
-*----------------------+-------------------------------------------------------------------------------------------+
 
 
 * Localized resources compiler

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -127,8 +127,8 @@ public final class PT_Locale extends Xml
          * Invoked by JAXB {@link javax.xml.bind.Marshaller} before this object is marshalled to XML.
          * This method sets the {@link #characterEncoding} to the XML encoding.
          *
-         * {@note This is totally redundant with the encoding declared in the XML header. Unfortunately,
-         *        the <code>gmd:characterEncoding</code> element is mandatory according OGC/ISO schemas.}
+         * <div class="note"><b>Note:</b> This is totally redundant with the encoding declared in the XML header.
+         * Unfortunately, the {@code <gmd:characterEncoding>} element is mandatory according OGC/ISO schemas.</div>
          */
         public void beforeMarshal(final Marshaller marshaller) {
             final String encoding;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -30,8 +30,9 @@ import org.apache.sis.xml.IdentifiedObje
  * Every GML object to be marshalled have an ID attribute, which is mandatory.
  * If no ID is explicitely set, a default one will be created from the wrapped object.
  *
- * {@note This class is somewhat temporary. It assign the ID to the <em>wrapped</em> object.
- *        In a future SIS version, we should assign the ID to the object itself.}
+ * <div class="note"><b>Note:</b>
+ * This class is somewhat temporary. It assigns the ID to the <em>wrapped</em> object.
+ * In a future SIS version, we should assign the ID to the object itself.</div>
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Thu Feb 27 20:40:01 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -68,15 +68,16 @@ public abstract class FormattableObject 
      * The formatter for the {@link #toWKT()} and {@link #toString()} methods. Formatters are not
      * thread-safe, consequently we must make sure that only one thread uses a given instance.
      *
-     * {@note We do not use synchronization because the formatter will call back user's code, which
-     *        introduce a risk of thread lock if the user performs his own synchronization.}
-     *
-     * {@note We do not use <code>ThreadLocal</code> because <code>Formatter</code> is not reentrant
-     *        neither, so it may produce very confusing behavior when debugging a code that perform
-     *        WKT formatting (some debuggers seem to invoke <code>toString()</code> for their own
-     *        purpose in the same thread). Since <code>toString()</code> is typically invoked for
-     *        debugging purpose, a single formatter for any thread is presumed sufficient.}
-     *
+     * <div class="note"><b>Note 1:</b>
+     * We do not use synchronization because the formatter will call back user's code, which
+     * introduce a risk of thread lock if the user performs his own synchronization.</div>
+     *
+     * <div class="note"><b>Note 2:</b>
+     * We do not use {@link ThreadLocal} because {@code Formatter} is not reentrant neither,
+     * so it may produce very confusing behavior when debugging a code that perform WKT formatting
+     * (some debuggers seem to invoke {@code toString()} for their own purpose in the same thread).
+     * Since {@code toString()} is typically invoked for debugging purpose, a single formatter for
+     * any thread is presumed sufficient.</div>
      */
     private static final AtomicReference<Formatter> FORMATTER = new AtomicReference<Formatter>();
 

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Thu Feb 27 20:40:01 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.
      */
@@ -1188,8 +1190,9 @@ public class Formatter implements Locali
      * This method returns {@code true} if the formattable object given by {@code getEnclosingElement(depth)}
      * has invoked {@link #addContextualUnit(Unit)} with a non-null unit at least once.
      *
-     * {@note The main purpose of this method is to allow <code>AXIS[…]</code> elements to determine if they should
-     *        inherit the unit specified by the enclosing CRS, or if they should specify their unit explicitly.}
+     * <div class="note"><b>Note:</b>
+     * The main purpose of this method is to allow {@code AXIS[…]} elements to determine if they should
+     * inherit the unit specified by the enclosing CRS, or if they should specify their unit explicitly.</div>
      *
      * @param  depth 1 for the immediate parent, 2 for the parent of the parent, <i>etc.</i>
      * @return Whether the parent element at the given depth has invoked {@code addContextualUnit(…)} at least once.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -32,8 +32,9 @@ package org.apache.sis.io.wkt;
  *   <tr><td>{@code ENGINEERINGDATUM}</td>   <td>{@code EngineeringDatum}</td></td>
  * </table>
  *
- * {@note Well-Known Text keywords are case insensitive at parsing time. <code>KEYWORD</code> is equivalent
- *        to <code>keyword</code> is equivalent to <code>KeyWord</code> and to <code>kEYwORd</code>.}
+ * <div class="note"><b>Note:</b>
+ * Well-Known Text keywords are case insensitive at parsing time. {@code KEYWORD} is equivalent to
+ * {@code keyword} is equivalent to {@code KeyWord} and to {@code kEYwORd}.</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -310,11 +310,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.
@@ -377,12 +379,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/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Thu Feb 27 20:40:01 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] Thu Feb 27 20:40:01 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.
@@ -261,14 +261,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/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -94,8 +94,9 @@ public abstract class AbstractMetadata i
      * Subclasses will typically return a hard-coded constant such as
      * {@link MetadataStandard#ISO_19115}.
      *
-     * {@note Implementation of this method shall not depend on the object state,
-     *        since this method may be indirectly invoked by copy constructors.}
+     * {@section Note for implementors}
+     * Implementation of this method shall not depend on the object state,
+     * since this method may be indirectly invoked by copy constructors.
      *
      * @return The metadata standard implemented.
      */
@@ -216,9 +217,10 @@ public abstract class AbstractMetadata i
      *       {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
      *       for the first element and an other node with index 1 for the second element.</p>
      *
-     *       {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
-     *              a node in a list of children. That uniqueness is guaranteed only for the children of a given
-     *              node; the same keys may appear in the children of any other nodes.}</li>
+     *       <div class="note"><b>Note:</b>
+     *       The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying a node
+     *       in a list of children. That uniqueness is guaranteed only for the children of a given node;
+     *       the same keys may appear in the children of any other nodes.</div></li>
      *
      *   <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
      *       A human-readable name for the node, derived from the identifier and the index.
@@ -324,10 +326,10 @@ public abstract class AbstractMetadata i
      * the {@link java.util.Set#hashCode()} one and ensures that the hash code value is
      * insensitive to the ordering of properties.
      *
-     * {@note This method does not cache the value because current implementation has no notification
-     *        mechanism for tracking changes in children properties. If this metadata is known to be
-     *        immutable, then subclasses may consider caching the hash code value if performance is
-     *        important.}
+     * <div class="note"><b>Implementation note:</b>
+     * This method does not cache the value because current implementation has no notification mechanism
+     * for tracking changes in children properties. If this metadata is known to be immutable,
+     * then subclasses may consider caching the hash code value if performance is important.</div>
      *
      * @see MetadataStandard#hashCode(Object)
      */

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -404,10 +404,11 @@ public class MetadataStandard implements
      * If the given type is already an interface from this standard, then it is returned
      * unchanged.
      *
-     * {@note The word "interface" may be taken in a looser sense than the usual Java sense
-     *        because if the given type is defined in this standard package, then it is returned
-     *        unchanged. The standard package is usually made of interfaces and code lists only,
-     *        but this is not verified by this method.}
+     * <div class="note"><b>Note:</b>
+     * The word "interface" may be taken in a looser sense than the usual Java sense because
+     * if the given type is defined in this standard package, then it is returned unchanged.
+     * The standard package is usually made of interfaces and code lists only, but this is
+     * not verified by this method.</div>
      *
      * @param  type The implementation class.
      * @return The interface implemented by the given implementation class.
@@ -455,7 +456,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 +465,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
@@ -551,10 +554,10 @@ public class MetadataStandard implements
      *   </li>
      * </ul>
      *
-     * {@note The rational for implementing <code>CheckedContainer</code> is to consider each
-     * <code>ExtendedElementInformation</code> instance as the set of all possible values for
-     * the property. If the information had a <code>contains(E)</code> method, it would return
-     * <code>true</code> if the given value is valid for that property.}
+     * <div class="note"><b>Note:</b>
+     * The rational for implementing {@code CheckedContainer} is to consider each {@code ExtendedElementInformation}
+     * instance as the set of all possible values for the property. If the information had a {@code contains(E)} method,
+     * it would return {@code true} if the given value is valid for that property.</div>
      *
      * In addition, for each map entry the value returned by {@link ExtendedElementInformation#getDomainValue()}
      * may optionally be an instance of any of the following classes:
@@ -654,9 +657,10 @@ public class MetadataStandard implements
      *       {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
      *       for the first element and an other node with index 1 for the second element.</p>
      *
-     *       {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
-     *              a node in a list of children. That uniqueness is guaranteed only for the children of a given
-     *              node; the same keys may appear in the children of any other nodes.}</li>
+     *       <div class="note"><b>Note:</b>
+     *       The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying a node
+     *       in a list of children. That uniqueness is guaranteed only for the children of a given node;
+     *       the same keys may appear in the children of any other nodes.</div></li>
      *
      *   <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
      *       A human-readable name for the node, derived from the identifier and the index.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -91,13 +91,12 @@ class PropertyAccessor {
      * Getters shared between many instances of this class. Two different implementations
      * may share the same getters but different setters.
      *
-     * {@note In the particular case of <code>Class</code> keys, <code>IdentityHashMap</code> and
-     *        <code>HashMap</code> have identical behavior since <code>Class</code> is final and
-     *        does not override the <code>equals(Object)</code> and <code>hashCode()</code> methods.
-     *        The <code>IdentityHashMap</code> Javadoc claims that it is faster than the regular
-     *        <code>HashMap</code>. But maybe the most interesting property is that it allocates
-     *        less objects since <code>IdentityHashMap</code> implementation doesn't need the chain
-     *        of objects created by <code>HashMap</code>.}
+     * <div class="note"><b>Implementation note:</b>
+     * In the particular case of {@code Class} keys, {@code IdentityHashMap} and {@code HashMap} have identical
+     * behavior since {@code Class} is final and does not override the {@code equals(Object)} and {@code hashCode()}
+     * methods. The {@code IdentityHashMap} Javadoc claims that it is faster than the regular {@code HashMap}.
+     * But maybe the most interesting property is that it allocates less objects since {@code IdentityHashMap}
+     * implementation doesn't need the chain of objects created by {@code HashMap}.</div>
      */
     private static final Map<Class<?>, Method[]> SHARED_GETTERS = new IdentityHashMap<Class<?>, Method[]>();
 

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -42,10 +42,10 @@ import org.apache.sis.util.logging.Loggi
  * but other types are allowed), instances of {@code PropertyInformation} are obtained
  * indirectly by the {@link MetadataStandard#asInformationMap(Class, KeyNamePolicy)} method.
  *
- * {@note The rational for implementing <code>CheckedContainer</code> is to consider each
- *        <code>ExtendedElementInformation</code> instance as the set of all possible values
- *        for the property. If the information had a <code>contains(E)</code> method, it would
- *        return <code>true</code> if the given value is valid for that property.}
+ * <div class="note"><b>API note:</b>
+ * The rational for implementing {@code CheckedContainer} is to consider each {@code ExtendedElementInformation}
+ * instance as the set of all possible values for the property. If the information had a {@code contains(E)} method,
+ * it would return {@code true} if the given value is valid for that property.</div>
  *
  * {@section Immutability and thread safety}
  * This final class is immutable and thus thread-safe.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -60,13 +60,12 @@ final class StandardImplementation exten
     /**
      * Implementations for a given interface, computed when first needed then cached.
      *
-     * {@note In the particular case of <code>Class</code> keys, <code>IdentityHashMap</code> and
-     *        <code>HashMap</code> have identical behavior since <code>Class</code> is final and
-     *        does not override the <code>equals(Object)</code> and <code>hashCode()</code> methods.
-     *        The <code>IdentityHashMap</code> Javadoc claims that it is faster than the regular
-     *        <code>HashMap</code>. But maybe the most interesting property is that it allocates
-     *        less objects since <code>IdentityHashMap</code> implementation doesn't need the chain
-     *        of objects created by <code>HashMap</code>.}
+     * <div class="note"><b>Implementation note:</b>
+     * In the particular case of {@code Class} keys, {@code IdentityHashMap} and {@code HashMap} have identical
+     * behavior since {@code Class} is final and does not override the {@code equals(Object)} and {@code hashCode()}
+     * methods. The {@code IdentityHashMap} Javadoc claims that it is faster than the regular {@code HashMap}.
+     * But maybe the most interesting property is that it allocates less objects since {@code IdentityHashMap}
+     * implementation doesn't need the chain of objects created by {@code HashMap}.</div>
      */
     private final transient Map<Class<?>,Class<?>> implementations; // written by reflection on deserialization.
 

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -50,12 +50,12 @@ import org.apache.sis.util.resources.Voc
  * set the identifier and the value, in that order, before any other operation on the new child.
  * See {@code newChild()} javadoc for an example.</p>
  *
- * {@note This class is not serializable because the values of the <code>indexInData</code> and
- *        <code>indexInList</code> fields may not be stable. The former may be invalid if the node
- *        is serialized and deserialized by two different versions of Apache SIS having properties
- *        in different order. The second may be invalid if the collection is not guaranteed to
- *        preserve order on serialization (e.g. <code>CodeListSet</code> with user-supplied elements,
- *        in which case the elements order depends on the instantiation order).}
+ * <div class="note"><b>API note:</b>
+ * This class is not serializable because the values of the {@link #indexInData} and {@link #indexInList} fields
+ * may not be stable. The former may be invalid if the node is serialized and deserialized by two different versions
+ * of Apache SIS having properties in different order. The second may be invalid if the collection is not guaranteed
+ * to preserve order on serialization (e.g. {@code CodeListSet} with user-supplied elements, in which case the elements
+ * order depends on the instantiation order).</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -157,9 +157,9 @@ final class TreeNodeChildren extends Abs
      * {@code index} is relative to the {@link #accessor} indexing, <strong>not</strong>
      * to this collection.
      *
-     * {@note We do not test <code>(value instanceof Collection)</code> because the value
-     *        could be any user's implementation. Nothing prevent users from implementing
-     *        the collection interface even for singleton elements if they wish.}
+     * <div class="note"><b>Implementation note:</b>
+     * We do not test {@code (value instanceof Collection)} because the value could be any user's implementation.
+     * Nothing prevent users from implementing the collection interface even for singleton elements if they wish.</div>
      *
      * @param  index The index in the accessor (<em>not</em> the index in this collection).
      * @return {@code true} if the value at the given index is a collection.
@@ -306,9 +306,10 @@ final class TreeNodeChildren extends Abs
          * ahead of time by {@link #hasNext()} since we need that information in order to determine
          * if the value needs to be skipped or not.
          *
-         * {@note Actually we don't really need to keep this value, since it is not used outside the
-         *        <code>hasNext()</code> method. But we keep it for allowing the <code>next()</code>
-         *        method to opportunistically update the <code>TreeNode.cachedValue</code> field.}
+         * <div class="note"><b>Note:</b>
+         * Actually we don't really need to keep this value, since it is not used outside the {@link #hasNext()}
+         * method. But we keep it for allowing the {@link #next()} method to opportunistically update the
+         * {@link TreeNode#cachedValue} field.</div>
          */
         private Object nextValue;
 
@@ -331,9 +332,10 @@ final class TreeNodeChildren extends Abs
          * The value of {@link TreeNodeChildren#modCount} at construction time or after
          * the last change done by this iterator. Used for concurrent modification checks.
          *
-         * {@note Actually this iterator should be robust to most concurrent modifications.
-         *        But we check anyway in order to prevent concurrent modifications in user
-         *        code, in case a future SIS version become more sensitive to such changes.}
+         * <div class="note"><b>Note:</b>
+         * Actually this iterator should be robust to most concurrent modifications.
+         * But we check anyway in order to prevent concurrent modifications in user
+         * code, in case a future SIS version become more sensitive to such changes.</div>
          */
         private int modCountCheck;
 

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -90,9 +90,10 @@ public class ISOMetadata extends Modifia
      * Returns the metadata standard implemented by subclasses,
      * which is {@linkplain MetadataStandard#ISO_19115 ISO 19115}.
      *
-     * {@note Subclasses shall not override this method in a way that depends on the object state,
-     *        since this method may be indirectly invoked by copy constructors (i.e. is may be
-     *        invoked before this metadata object is fully constructed).}
+     * {@section Note for implementors}
+     * Subclasses shall not override this method in a way that depends on the object state,
+     * since this method may be indirectly invoked by copy constructors (i.e. is may be
+     * invoked before this metadata object is fully constructed).
      *
      * @return The metadata standard, which is {@linkplain MetadataStandard#ISO_19115 ISO 19115} by default.
      */

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -596,8 +596,9 @@ public class ImmutableIdentifier extends
     /**
      * Appends the given code or version number as an integer if possible, or as a text otherwise.
      *
-     * {@note ISO 19162 specifies "number or text". In Apache SIS, we restrict the numbers to integers
-     *        because handling version numbers like "8.2" as floating point numbers can be confusing.}
+     * <div class="note"><b>Implementation note:</b>
+     * ISO 19162 specifies "number or text". In Apache SIS, we restrict the numbers to integers
+     * because handling version numbers like "8.2" as floating point numbers can be confusing.</div>
      */
     private static void appendCode(final Formatter formatter, final String text) {
         if (text != null) {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -157,9 +157,9 @@ public class DefaultObjective extends IS
      * ({@linkplain IdentifierSpace#ID ID}, {@linkplain IdentifierSpace#UUID UUID}, <i>etc.</i>),
      * thus providing a unified view of every kind of identifiers associated to this objective.
      *
-     * {@note The <code>&lt:gmd:identifier&gt;</code> element marshalled to XML will exclude
-     *        all the above cited identifiers, for ISO 19139 compliance. Those identifiers
-     *        will appear in other XML elements or attributes.}
+     * <div class="note"><b>XML note:</b>
+     * The {@code <gmd:identifier>} element marshalled to XML will exclude all the above cited identifiers,
+     * for ISO 19139 compliance. Those identifiers will appear in other XML elements or attributes.</div>
      *
      * @return Identify the objective.
      */

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -290,8 +290,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-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -80,20 +80,20 @@ public class DefaultCitation extends ISO
     /**
      * The authority for International Standard Book Number.
      *
-     * <p><b>Implementation note:</b> This field is read by reflection in
+     * <div class="note"><b>Implementation note:</b> This field is read by reflection in
      * {@link org.apache.sis.internal.jaxb.NonMarshalledAuthority#getCitation(String)}.
      * If this field is renamed or moved, then {@code NonMarshalledAuthority} needs
-     * to be updated.</p>
+     * to be updated.</div>
      */
     static final IdentifierSpace<String> ISBN = new NonMarshalledAuthority<String>("ISBN", NonMarshalledAuthority.ISBN);
 
     /**
      * The authority for International Standard Serial Number.
      *
-     * <p><b>Implementation note:</b> This field is read by reflection in
+     * <div class="note"><b>Implementation note:</b> This field is read by reflection in
      * {@link org.apache.sis.internal.jaxb.NonMarshalledAuthority#getCitation(String)}.
      * If this field is renamed or moved, then {@code NonMarshalledAuthority} needs
-     * to be updated.</p>
+     * to be updated.</div>
      */
     static final IdentifierSpace<String> ISSN = new NonMarshalledAuthority<String>("ISSN", NonMarshalledAuthority.ISSN);
 
@@ -369,9 +369,9 @@ public class DefaultCitation extends ISO
      * as well as the {@linkplain #getISBN() ISBN} and {@linkplain #getISSN() ISSN} codes, thus
      * providing a unified view of every kind of identifiers associated to this citation.
      *
-     * {@note The <code>&lt:gmd:identifier&gt;</code> element marshalled to XML will exclude
-     *        all the above cited identifiers, for ISO 19139 compliance. Those identifiers
-     *        will appear in other XML elements or attributes.}
+     * <div class="note"><b>XML note:</b>
+     * The {@code <gmd:identifier>} element marshalled to XML will exclude all the above cited identifiers,
+     * for ISO 19139 compliance. Those identifiers will appear in other XML elements or attributes.</div>
      *
      * @return The identifiers, or an empty collection if none.
      *

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -71,7 +71,7 @@ import org.apache.sis.internal.jdk7.Obje
  * {@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 org.apache.sis.internal.jdk7.Obje
  * 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] Thu Feb 27 20:40:01 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -174,6 +174,8 @@ public class DefaultRepresentativeFracti
 
     /**
      * Returns the scale as a {@code float} type.
+     *
+     * @return The scale.
      */
     @Override
     public float floatValue() {
@@ -183,8 +185,11 @@ public class DefaultRepresentativeFracti
     /**
      * Returns 1 if the {@linkplain #getDenominator() denominator} is equals to 1, or 0 otherwise.
      *
-     * {@note This method is defined that way because scales smaller than 1 can
-     *        only be casted to 0, and NaN values are also represented by 0.}
+     * <div class="note"><b>Rational:</b>
+     * This method is defined that way because scales smaller than 1 can
+     * only be casted to 0, and NaN values are also represented by 0.</div>
+     *
+     * @return 1 if the denominator is 1, or 0 otherwise.
      */
     @Override
     public long longValue() {
@@ -194,8 +199,11 @@ public class DefaultRepresentativeFracti
     /**
      * Returns 1 if the {@linkplain #getDenominator() denominator} is equals to 1, or 0 otherwise.
      *
-     * {@note This method is defined that way because scales smaller than 1 can
-     *        only be casted to 0, and NaN values are also represented by 0.}
+     * <div class="note"><b>Rational:</b>
+     * This method is defined that way because scales smaller than 1 can
+     * only be casted to 0, and NaN values are also represented by 0.</div>
+     *
+     * @return 1 if the denominator is 1, or 0 otherwise.
      */
     @Override
     public int intValue() {

Modified: sis/trunk/core/sis-metadata/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/javadoc/overview.html?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/javadoc/overview.html (original)
+++ sis/trunk/core/sis-metadata/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-metadata">sis-metadata</a> module.
+    Overview of Apache <code>sis-metadata</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/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -255,13 +255,13 @@ public abstract class AbstractEnvelope i
      * supports also {@linkplain DirectPosition#setOrdinate(int, double) write operations},
      * so changes in the position are reflected back in the envelope.
      *
-     * {@note The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended
-     * interpretation of the bounding box definition. In a WCS 1.1 data structure, the lower
-     * corner defines the edges region in the directions of <em>decreasing</em> coordinate
-     * values in the envelope CRS. This is usually the algebraic minimum coordinates, but not
-     * always. For example, an envelope crossing the anti-meridian could have a lower corner
-     * longitude greater than the upper corner longitude. Such extended interpretation applies
-     * mostly to axes having <code>WRAPAROUND</code> range meaning.}
+     * <div class="note"><b>Note:</b>
+     * The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended interpretation of the
+     * bounding box definition. In a WCS 1.1 data structure, the lower corner defines the edges region in the
+     * directions of <em>decreasing</em> coordinate values in the envelope CRS. This is usually the algebraic
+     * minimum coordinates, but not always. For example, an envelope crossing the anti-meridian could have a
+     * lower corner longitude greater than the upper corner longitude. Such extended interpretation applies
+     * mostly to axes having {@code WRAPAROUND} range meaning.</div>
      *
      * @return A view over the lower corner, typically (but not necessarily) containing minimal ordinate values.
      */
@@ -280,13 +280,13 @@ public abstract class AbstractEnvelope i
      * supports also {@linkplain DirectPosition#setOrdinate(int, double) write operations},
      * so changes in the position are reflected back in the envelope.
      *
-     * {@note The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended
-     * interpretation of the bounding box definition. In a WCS 1.1 data structure, the upper
-     * corner defines the edges region in the directions of <em>increasing</em> coordinate
-     * values in the envelope CRS. This is usually the algebraic maximum coordinates, but not
-     * always. For example, an envelope crossing the anti-meridian could have an upper corner
-     * longitude less than the lower corner longitude. Such extended interpretation applies
-     * mostly to axes having <code>WRAPAROUND</code> range meaning.}
+     * <div class="note"><b>Note:</b>
+     * The <cite>Web Coverage Service</cite> (WCS) 1.1 specification uses an extended interpretation of the
+     * bounding box definition. In a WCS 1.1 data structure, the upper corner defines the edges region in the
+     * directions of <em>increasing</em> coordinate values in the envelope CRS. This is usually the algebraic
+     * maximum coordinates, but not always. For example, an envelope crossing the anti-meridian could have an
+     * upper corner longitude less than the lower corner longitude. Such extended interpretation applies
+     * mostly to axes having {@code WRAPAROUND} range meaning.</div>
      *
      * @return A view over the upper corner, typically (but not necessarily) containing maximal ordinate values.
      */
@@ -613,9 +613,10 @@ public abstract class AbstractEnvelope i
      * {@linkplain #getDimension() dimension}, or if the {@linkplain #getSpan(int) span} of
      * at least one axis is negative, 0 or {@link Double#NaN NaN}.
      *
-     * {@note Strictly speaking, there is an ambiguity if a span is <code>NaN</code> or if the envelope
-     *        contains both 0 and infinite spans (since 0⋅∞ = <code>NaN</code>). In such cases, this method
-     *        arbitrarily ignores the infinite values and returns <code>true</code>.}
+     * <div class="note"><b>Note:</b>
+     * Strictly speaking, there is an ambiguity if a span is {@code NaN} or if the envelope contains
+     * both 0 and infinite spans (since 0⋅∞ = {@code NaN}). In such cases, this method arbitrarily
+     * ignores the infinite values and returns {@code true}.</div>
      *
      * If {@code isEmpty()} returns {@code false}, then {@link #isAllNaN()} is guaranteed to
      * also return {@code false}. However the converse is not always true.
@@ -677,8 +678,9 @@ public abstract class AbstractEnvelope i
      * If it least one ordinate value in the given point is {@link Double#NaN NaN},
      * then this method returns {@code false}.
      *
-     * {@note This method assumes that the specified point uses the same CRS than this envelope.
-     *        For performance raisons, it will no be verified unless Java assertions are enabled.}
+     * {@section Pre-conditions}
+     * This method assumes that the specified point uses the same CRS than this envelope.
+     * For performance reasons, it will no be verified unless Java assertions are enabled.
      *
      * {@section Spanning the anti-meridian of a Geographic CRS}
      * For any dimension, if <var>upper</var> &lt; <var>lower</var> then this method uses an
@@ -728,8 +730,9 @@ public abstract class AbstractEnvelope i
      * envelope, then this method returns {@code true} only if {@code edgesInclusive}
      * is {@code true}.
      *
-     * {@note This method assumes that the specified envelope uses the same CRS than this envelope.
-     *        For performance raisons, it will no be verified unless Java assertions are enabled.}
+     * {@section Pre-conditions}
+     * This method assumes that the specified envelope uses the same CRS than this envelope.
+     * For performance reasons, it will no be verified unless Java assertions are enabled.
      *
      * {@section Spanning the anti-meridian of a Geographic CRS}
      * For every cases illustrated below, the yellow box is considered completely enclosed
@@ -822,8 +825,9 @@ public abstract class AbstractEnvelope i
      * If one or more edges from the specified envelope coincide with an edge from this envelope,
      * then this method returns {@code true} only if {@code edgesInclusive} is {@code true}.
      *
-     * {@note This method assumes that the specified envelope uses the same CRS than this envelope.
-     *        For performance raisons, it will no be verified unless Java assertions are enabled.}
+     * {@section Pre-conditions}
+     * This method assumes that the specified envelope uses the same CRS than this envelope.
+     * For performance reasons, it will no be verified unless Java assertions are enabled.
      *
      * {@section Spanning the anti-meridian of a Geographic CRS}
      * This method can handle envelopes spanning the anti-meridian.
@@ -926,10 +930,11 @@ public abstract class AbstractEnvelope i
      *       given dimension <var>i</var> is {@code eps}.</li>
      * </ul>
      *
-     * {@note Relative tolerance value (as opposed to absolute tolerance value) help to workaround
-     * the fact that tolerance value are CRS dependent. For example the tolerance value need to be
+     * <div class="note"><b>Note:</b>
+     * Relative tolerance values (as opposed to absolute tolerance values) help to workaround the
+     * fact that tolerance value are CRS dependent. For example the tolerance value need to be
      * smaller for geographic CRS than for UTM projections, because the former typically has a
-     * [-180…180]° range while the later can have a range of thousands of meters.}
+     * [-180…180]° range while the later can have a range of thousands of meters.</div>
      *
      * {@section Coordinate Reference System}
      * To be considered equal, the two envelopes must have the same {@linkplain #getDimension() dimension}
@@ -977,9 +982,9 @@ public abstract class AbstractEnvelope i
      * Returns {@code true} if the specified object is an envelope of the same class
      * with equals coordinates and {@linkplain #getCoordinateReferenceSystem() CRS}.
      *
-     * {@note 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 class="note"><b>Implementation note:</b>
+     * 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.
@@ -1036,15 +1041,16 @@ 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>
      *
-     * {@note The <code>BOX</code> element is not part of the standard <cite>Well Known Text</cite>
-     *        (WKT) format. However it is understood by many softwares, for example GDAL and PostGIS.}
+     * <div class="note"><b>Note:</b>
+     * The {@code BOX} element is not part of the standard <cite>Well Known Text</cite> (WKT) format.
+     * However it is understood by many softwares, for example GDAL and PostGIS.</div>
      *
      * The string returned by this method can be {@linkplain GeneralEnvelope#GeneralEnvelope(CharSequence) parsed}
      * by the {@code GeneralEnvelope} constructor.

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -147,11 +147,10 @@ public class DirectPosition1D extends Ab
     }
 
     /**
-     * Returns a sequence of numbers that hold the coordinate of this position in its
-     * reference system.
+     * Returns a sequence of numbers that hold the coordinate of this position in its reference system.
      *
-     * {@note This method is final for ensuring consistency with the <code>ordinate</code> field,
-     *        which is public.}
+     * <div class="note"><b>API note:</b>
+     * This method is final for ensuring consistency with the {@link #ordinate} field, which is public.</div>
      *
      * @return The coordinates.
      */
@@ -163,8 +162,8 @@ public class DirectPosition1D extends Ab
     /**
      * Returns the ordinate at the specified dimension.
      *
-     * {@note This method is final for ensuring consistency with the <code>ordinate</code> field,
-     *        which is public.}
+     * <div class="note"><b>API note:</b>
+     * This method is final for ensuring consistency with the {@link #ordinate} field, which is public.</div>
      *
      * @param  dimension The dimension, which must be 0.
      * @return The {@linkplain #ordinate}.

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java?rev=1572725&r1=1572724&r2=1572725&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java [UTF-8] Thu Feb 27 20:40:01 2014
@@ -43,9 +43,10 @@ import org.apache.sis.internal.jdk7.Obje
  * This is not specific to this implementation; in Java2D too, the visual axis orientation depend
  * on the {@linkplain java.awt.Graphics2D#getTransform() affine transform in the graphics context}.</p>
  *
- * {@note The rational for avoiding axis orientation restriction is that other <code>DirectPosition</code>
- *        implementations do not have such restriction, and it would be hard to generalize.
- *        For example there is no clear "x" or "y" classification for North-East direction.}
+ * <div class="note"><b>Note:</b>
+ * The rational for avoiding axis orientation restriction is that other {@code DirectPosition} implementations
+ * do not have such restriction, and it would be hard to generalize. For example there is no clear "x" or "y"
+ * classification for North-East direction.</div>
  *
  * {@section Caution when used in collections}
  * Do not mix instances of this class with ordinary {@link Point2D} instances
@@ -213,11 +214,10 @@ public class DirectPosition2D extends Po
     }
 
     /**
-     * Returns a sequence of numbers that hold the coordinate of this position in its
-     * reference system.
+     * Returns a sequence of numbers that hold the coordinate of this position in its reference system.
      *
-     * {@note This method is final for ensuring consistency with the <code>x</code>
-     *        and <code>y</code> fields, which are public.}
+     * <div class="note"><b>API note:</b>
+     * This method is final for ensuring consistency with the {@code x} and {@code y} fields, which are public.</div>
      *
      * @return The coordinate.
      */
@@ -229,8 +229,8 @@ public class DirectPosition2D extends Po
     /**
      * Returns the ordinate at the specified dimension.
      *
-     * {@note This method is final for ensuring consistency with the <code>x</code>
-     *        and <code>y</code> fields, which are public.}
+     * <div class="note"><b>API note:</b>
+     * This method is final for ensuring consistency with the {@code x} and {@code y} fields, which are public.</div>
      *
      * @param  dimension The dimension in the range 0 to 1 inclusive.
      * @return The coordinate at the specified dimension.



Mime
View raw message