sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1591900 - in /sis/branches/JDK8: ./ core/sis-referencing/src/main/java/org/apache/sis/referencing/ core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/ storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/
Date Fri, 02 May 2014 13:30:58 GMT
Author: desruisseaux
Date: Fri May  2 13:30:57 2014
New Revision: 1591900

URL: http://svn.apache.org/r1591900
Log:
Enable javac and javadoc HTML checks. This implies:
- Moving MathML formulas in a separated file
- Avoid using the <s> tag in CommonCRS
- Fix misplaced <p> tags in NetCDF AttributeNames

Added:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html   (with props)
Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
    sis/branches/JDK8/pom.xml
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java?rev=1591900&r1=1591899&r2=1591900&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] Fri May  2 13:30:57 2014
@@ -780,7 +780,7 @@ public enum CommonCRS {
      *   <caption>Geodetic objects accessible by enumeration constants</caption>
      *   <tr><th>Name or alias</th>             <th>Object type</th> <th>Enumeration value</th></tr>
      *   <tr><td>Barometric altitude</td>       <td>CRS, Datum</td>  <td>{@link #BAROMETRIC}</td></tr>
-     *   <tr><td><s>Ellipsoidal height</s></td> <td>CRS, Datum</td>  <td><s>{@link #ELLIPSOIDAL}</s></td></tr>
+     *   <!-- <s>Ellipsoidal height</s> intentionally omitted        <td><s>{@link #ELLIPSOIDAL}</s></td> -->
      *   <tr><td>Mean Sea Level</td>            <td>Datum</td>       <td>{@link #MEAN_SEA_LEVEL}</td></tr>
      *   <tr><td>Mean Sea Level depth</td>      <td>CRS</td>         <td>{@link #DEPTH}</td></tr>
      *   <tr><td>Mean Sea Level height</td>     <td>CRS</td>         <td>{@link #MEAN_SEA_LEVEL}</td></tr>
@@ -925,7 +925,7 @@ public enum CommonCRS {
          *   <caption>Commonly used vertical CRS</caption>
          *   <tr><th>Name or alias</th>             <th>Enum</th>                        <th>EPSG</th></tr>
          *   <tr><td>Barometric altitude</td>       <td>{@link #BAROMETRIC}</td>         <td></td></tr>
-         *   <tr><td><s>Ellipsoidal height</s></td> <td><s>{@link #ELLIPSOIDAL}</s></td> <td></td></tr>
+         *   <!-- <s>Ellipsoidal height</s> intentionally omitted -->
          *   <tr><td>Mean Sea Level depth</td>      <td>{@link #DEPTH}</td>              <td>5715</td></tr>
          *   <tr><td>Mean Sea Level height</td>     <td>{@link #MEAN_SEA_LEVEL}</td>     <td>5714</td></tr>
          *   <tr><td>Other surface</td>             <td>{@link #OTHER_SURFACE}</td>      <td></td></tr>
@@ -991,7 +991,7 @@ public enum CommonCRS {
          *   <caption>Commonly used vertical datum</caption>
          *   <tr><th>Name or alias</th>             <th>Enum</th>                        <th>EPSG</th></tr>
          *   <tr><td>Barometric altitude</td>       <td>{@link #BAROMETRIC}</td>         <td></td></tr>
-         *   <tr><td><s>Ellipsoidal height</s></td> <td><s>{@link #ELLIPSOIDAL}</s></td> <td></td></tr>
+         *   <!-- <s>Ellipsoidal height</s> intentionally omitted -->
          *   <tr><td>Mean Sea Level</td>            <td>{@link #MEAN_SEA_LEVEL}</td>     <td>5100</td></tr>
          *   <tr><td>Other surface</td>             <td>{@link #OTHER_SURFACE}</td>      <td></td></tr>
          * </table></blockquote>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1591900&r1=1591899&r2=1591900&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Fri May  2 13:30:57 2014
@@ -79,54 +79,8 @@ import java.util.Objects;
  *           to (<var>X</var><sub>t</sub>, <var>Y</var><sub>t</sub>, <var>Z</var><sub>t</sub>)</center>
  * <center style="font-size: small">(ignoring unit conversions)</center>
  *
- * <p><math display="block" alttext="MathML capable browser required">
- *   <mfenced open="[" close="]">
- *     <mtable>
- *       <mtr><mtd><msub><mi>X</mi><mi>t</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>Y</mi><mi>t</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>Z</mi><mi>t</mi></msub></mtd></mtr>
- *     </mtable>
- *   </mfenced>
- *   <mo>=</mo>
- *   <mo>(</mo><mn>1</mn><mo>+</mo><mi>dS</mi><mo>)</mo>
- *   <mo>⋅</mo>
- *   <mfenced open="[" close="]">
- *     <mtable>
- *       <mtr>
- *         <mtd><mn>1</mn></mtd>
- *         <mtd><mo>-</mo><msub><mi>r</mi><mi>z</mi></msub></mtd>
- *         <mtd><mo>+</mo><msub><mi>r</mi><mi>y</mi></msub></mtd>
- *       </mtr>
- *       <mtr>
- *         <mtd><mo>+</mo><msub><mi>r</mi><mi>z</mi></msub></mtd>
- *         <mtd><mn>1</mn></mtd>
- *         <mtd><mo>-</mo><msub><mi>r</mi><mi>x</mi></msub></mtd>
- *       </mtr>
- *       <mtr>
- *         <mtd><mo>-</mo><msub><mi>r</mi><mi>y</mi></msub></mtd>
- *         <mtd><mo>+</mo><msub><mi>r</mi><mi>x</mi></msub></mtd>
- *         <mtd><mn>1</mn></mtd>
- *       </mtr>
- *     </mtable>
- *   </mfenced>
- *   <mo>×</mo>
- *   <mfenced open="[" close="]">
- *     <mtable>
- *       <mtr><mtd><msub><mi>X</mi><mi>s</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>Y</mi><mi>s</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>Z</mi><mi>s</mi></msub></mtd></mtr>
- *     </mtable>
- *   </mfenced>
- *   <mo>+</mo>
- *   <mfenced open="[" close="]">
- *     <mtable>
- *       <mtr><mtd><msub><mi>t</mi><mi>x</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>t</mi><mi>y</mi></msub></mtd></mtr>
- *       <mtr><mtd><msub><mi>t</mi><mi>z</mi></msub></mtd></mtr>
- *     </mtable>
- *   </mfenced>
- * </math></p>
- * </tr></td></table>
+ * <p>{@include formulas.html#Bursa-Wolf}</p>
+ * </td></tr></table>
  *
  * The numerical fields in this {@code BursaWolfParameters} class use the EPSG abbreviations
  * with 4 additional constraints compared to the EPSG definitions:

Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html?rev=1591900&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html (added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html Fri May  2 13:30:57 2014
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<html>
+  <head>
+    <title>Datum formulas</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  </head>
+  <body>
+    <h1>Datum formulas</h1>
+    <div>This file contains formulas written in MathML for inclusion in the Javadoc of some classes in the
+    <code>org.apache.sis.referencing.datum</code> package.
+    Those formulas are provided in separated files for easier edition and for avoiding <code>javac</code> or
+    <code>javadoc</code> “<cite>unknown HTML tag</cite>” errors with JDK 8.
+    Fragment of this files are inserted in the Javadoc by the following tag:
+
+    <blockquote><pre>{@include formulas.html#<var>title</var>}</pre></blockquote>
+
+    where <var>title</var> is the text inside <code>&lt;h2&gt;…&lt;/h2&gt;</code> elements just before
+    the parts to copy in the javadoc.
+    The <code>{@include}</code> taglet is defined in the <code>sis-build-helper</code> module.</div>
+
+    <h2>Bursa-Wolf</h2>
+    <math display="block" alttext="MathML capable browser required">
+      <mfenced open="[" close="]">
+        <mtable>
+          <mtr><mtd><msub><mi>X</mi><mi>t</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>Y</mi><mi>t</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>Z</mi><mi>t</mi></msub></mtd></mtr>
+        </mtable>
+      </mfenced>
+      <mo>=</mo>
+      <mo>(</mo><mn>1</mn><mo>+</mo><mi>dS</mi><mo>)</mo>
+      <mo>⋅</mo>
+      <mfenced open="[" close="]">
+        <mtable>
+          <mtr>
+            <mtd><mn>1</mn></mtd>
+            <mtd><mo>-</mo><msub><mi>r</mi><mi>z</mi></msub></mtd>
+            <mtd><mo>+</mo><msub><mi>r</mi><mi>y</mi></msub></mtd>
+          </mtr>
+          <mtr>
+            <mtd><mo>+</mo><msub><mi>r</mi><mi>z</mi></msub></mtd>
+            <mtd><mn>1</mn></mtd>
+            <mtd><mo>-</mo><msub><mi>r</mi><mi>x</mi></msub></mtd>
+          </mtr>
+          <mtr>
+            <mtd><mo>-</mo><msub><mi>r</mi><mi>y</mi></msub></mtd>
+            <mtd><mo>+</mo><msub><mi>r</mi><mi>x</mi></msub></mtd>
+            <mtd><mn>1</mn></mtd>
+          </mtr>
+        </mtable>
+      </mfenced>
+      <mo>×</mo>
+      <mfenced open="[" close="]">
+        <mtable>
+          <mtr><mtd><msub><mi>X</mi><mi>s</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>Y</mi><mi>s</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>Z</mi><mi>s</mi></msub></mtd></mtr>
+        </mtable>
+      </mfenced>
+      <mo>+</mo>
+      <mfenced open="[" close="]">
+        <mtable>
+          <mtr><mtd><msub><mi>t</mi><mi>x</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>t</mi><mi>y</mi></msub></mtd></mtr>
+          <mtr><mtd><msub><mi>t</mi><mi>z</mi></msub></mtd></mtr>
+        </mtable>
+      </mfenced>
+    </math>
+  </body>
+</html>

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/formulas.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1591900&r1=1591899&r2=1591900&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Fri May  2 13:30:57 2014
@@ -437,7 +437,7 @@ Apache SIS is a free software, Java lang
           <encoding>${project.build.sourceEncoding}</encoding>
           <compilerArgs>
             <arg>-Xlint:all</arg>
-            <arg>-Xdoclint:syntax,missing,accessibility/private</arg>
+            <arg>-Xdoclint:syntax,html,missing,accessibility/private</arg>
           </compilerArgs>
         </configuration>
       </plugin>
@@ -597,7 +597,7 @@ Apache SIS is a free software, Java lang
           <additionalparam>
               -link http://www.geoapi.org/snapshot/javadoc/
               -link http://www.geoapi.org/snapshot/pending/
-              -Xdoclint:syntax -Xdoclint:missing -Xdoclint:accessibility
+              -Xdoclint:syntax -Xdoclint:html -Xdoclint:missing -Xdoclint:accessibility
           </additionalparam>
 
           <!-- Separates packages on the overview page into the groups specified. -->
@@ -649,6 +649,7 @@ Apache SIS is a free software, Java lang
           <taglets>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Section</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.taglet.Include</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.SourceRepositoryURL</tagletClass></taglet>
           </taglets>

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java?rev=1591900&r1=1591899&r2=1591900&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java [UTF-8] Fri May  2 13:30:57 2014
@@ -137,10 +137,10 @@ public class AttributeNames {
      * (<em>Highly Recommended</em>). If no {@value} attribute is provided,
      * then {@code AttributeNames} will look for "full_name" and "name".
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
-     * {@link Citation#getTitle() title}</li></ul></p>
+     * {@link Citation#getTitle() title}</li></ul>
      *
      * @see NetcdfFile#getTitle()
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#title_Attribute">UCAR reference</a>
@@ -151,9 +151,9 @@ public class AttributeNames {
      * The {@value} attribute name for a paragraph describing the dataset
      * (<em>Highly Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getAbstract() abstract}</li></ul></p>
+     * {@link DataIdentification#getAbstract() abstract}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#summary_Attribute">UCAR reference</a>
      */
@@ -164,13 +164,13 @@ public class AttributeNames {
      * The combination of the {@value #NAMING_AUTHORITY} and the {@value}
      * should be a globally unique identifier for the dataset.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getFileIdentifier() fileIdentifier}</li>
      * <li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
      * {@link Citation#getIdentifiers() identifier} /
-     * {@link Identifier#getCode() code}</li></ul></p>
+     * {@link Identifier#getCode() code}</li></ul>
      *
      * @see MetadataReader#getFileIdentifier()
      * @see NetcdfFile#getId()
@@ -183,13 +183,13 @@ public class AttributeNames {
      * The combination of the {@value} and the {@value #IDENTIFIER} should be a globally
      * unique identifier for the dataset.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getFileIdentifier() fileIdentifier}</li>
      * <li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
      * {@link Citation#getIdentifiers() identifier} /
-     * {@link Identifier#getAuthority() authority}</li></ul></p>
+     * {@link Identifier#getAuthority() authority}</li></ul>
      *
      * @see #IDENTIFIER
      * @see MetadataReader#getFileIdentifier()
@@ -202,10 +202,10 @@ public class AttributeNames {
      * vocabulary of variable names. This is actually a {@linkplain VariableSimpleIF variable} attribute,
      * but sometime appears also in {@linkplain NetcdfFile#findGlobalAttribute(String) global attributes}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
-     * {@link Keywords#getKeywords() keyword} with {@link KeywordType#THEME}</li></ul></p>
+     * {@link Keywords#getKeywords() keyword} with {@link KeywordType#THEME}</li></ul>
      *
      * @see #STANDARD_NAME_VOCABULARY
      * @see #KEYWORDS
@@ -217,11 +217,11 @@ public class AttributeNames {
      * The {@value} attribute name for indicating which controlled list of variable names has been
      * used in the {@value #STANDARD_NAME} attribute.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
      * {@link Keywords#getThesaurusName() thesaurusName} /
-     * {@link Citation#getTitle() title}</li></ul></p>
+     * {@link Citation#getTitle() title}</li></ul>
      *
      * @see #STANDARD_NAME
      * @see #VOCABULARY
@@ -233,10 +233,10 @@ public class AttributeNames {
      * The {@value} attribute name for a comma separated list of key words and phrases
      * (<em>Highly Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
-     * {@link Keywords#getKeywords() keyword} with {@link KeywordType#THEME}</li></ul></p>
+     * {@link Keywords#getKeywords() keyword} with {@link KeywordType#THEME}</li></ul>
      *
      * @see #VOCABULARY
      * @see #STANDARD_NAME
@@ -248,11 +248,11 @@ public class AttributeNames {
      * The {@value} attribute name for the guideline for the words/phrases in the
      * {@value #KEYWORDS} attribute (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
      * {@link Keywords#getThesaurusName() thesaurusName} /
-     * {@link Citation#getTitle() title}</li></ul></p>
+     * {@link Citation#getTitle() title}</li></ul>
      *
      * @see #KEYWORDS
      * @see #STANDARD_NAME_VOCABULARY
@@ -270,9 +270,9 @@ public class AttributeNames {
      * {@code "society"}, {@code "structure"}, {@code "transportation"} and
      * {@code "utilitiesCommunication"}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getTopicCategories() topicCategory}</li></ul></p>
+     * {@link DataIdentification#getTopicCategories() topicCategory}</li></ul>
      *
      * @see TopicCategory
      */
@@ -284,9 +284,9 @@ public class AttributeNames {
      * {@code "Image"}, {@code "Video"}, {@code "Tin"}, {@code "StereoModel"}, {@code "Station"},
      * {@code "Swath"} or {@code "Trajectory"}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getSpatialRepresentationTypes() spatialRepresentationType}</li></ul></p>
+     * {@link DataIdentification#getSpatialRepresentationTypes() spatialRepresentationType}</li></ul>
      *
      * @see SpatialRepresentationType
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#cdm_data_type_Attribute">UCAR reference</a>
@@ -297,10 +297,10 @@ public class AttributeNames {
      * The {@value} attribute name for providing an audit trail for modifications to the
      * original data (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getDataQualityInfo() dataQualityInfo} /
      * {@link DataQuality#getLineage() lineage} /
-     * {@link Lineage#getStatement() statement}</li></ul></p>
+     * {@link Lineage#getStatement() statement}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#history_Attribute">UCAR reference</a>
      */
@@ -310,9 +310,9 @@ public class AttributeNames {
      * The {@value} attribute name for miscellaneous information about the data
      * (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getSupplementalInformation() supplementalInformation}</li></ul></p>
+     * {@link DataIdentification#getSupplementalInformation() supplementalInformation}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#comment_Attribute">UCAR reference</a>
      */
@@ -323,8 +323,8 @@ public class AttributeNames {
      * (<em>Suggested</em>). This is actually defined in the "{@code NCISOMetadata}"
      * subgroup.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
-     * {@link Metadata#getDateStamp() dateStamp}</li></ul></p>
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
+     * {@link Metadata#getDateStamp() dateStamp}</li></ul>
      */
     public static final String METADATA_CREATION = "metadata_creation";
 
@@ -332,11 +332,11 @@ public class AttributeNames {
      * The {@value} attribute name for the date on which the data was created
      * (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
      * {@link Citation#getDates() date} /
-     * {@link CitationDate#getDate() date} with {@link DateType#CREATION}</li></ul></p>
+     * {@link CitationDate#getDate() date} with {@link DateType#CREATION}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#date_created_Attribute">UCAR reference</a>
      */
@@ -346,11 +346,11 @@ public class AttributeNames {
      * The {@value} attribute name for the date on which this data was last modified
      * (<em>Suggested</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
      * {@link Citation#getDates() date} /
-     * {@link CitationDate#getDate() date} with {@link DateType#REVISION}</li></ul></p>
+     * {@link CitationDate#getDate() date} with {@link DateType#REVISION}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#date_modified_Attribute">UCAR reference</a>
      */
@@ -360,11 +360,11 @@ public class AttributeNames {
      * The {@value} attribute name for a date on which this data was formally issued
      * (<em>Suggested</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
      * {@link Citation#getDates() date} /
-     * {@link CitationDate#getDate() date} with {@link DateType#PUBLICATION}</li></ul></p>
+     * {@link CitationDate#getDate() date} with {@link DateType#PUBLICATION}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#date_issued_Attribute">UCAR reference</a>
      */
@@ -438,8 +438,8 @@ public class AttributeNames {
          * The attribute name for the responsible's name. Possible values are
          * {@code "creator_name"}, {@code "contributor_name"} or {@code "publisher_name"}.
          *
-         * <p><b>Path in ISO 19115:</b> <ul><li>{@link ResponsibleParty} /
-         * {@link ResponsibleParty#getIndividualName() individualName}</li></ul></p>
+         * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link ResponsibleParty} /
+         * {@link ResponsibleParty#getIndividualName() individualName}</li></ul>
          */
         public final String NAME;
 
@@ -447,8 +447,8 @@ public class AttributeNames {
          * The attribute name for the responsible's institution, or {@code null} if none.
          * Possible value is {@code "institution"}.
          *
-         * <p><b>Path in ISO 19115:</b> <ul><li>{@link ResponsibleParty} /
-         * {@link ResponsibleParty#getOrganisationName() organisationName}</li></ul></p>
+         * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link ResponsibleParty} /
+         * {@link ResponsibleParty#getOrganisationName() organisationName}</li></ul>
          */
         public final String INSTITUTION;
 
@@ -456,10 +456,10 @@ public class AttributeNames {
          * The attribute name for the responsible's URL. Possible values are
          * {@code "creator_url"}, {@code "contributor_url"} or {@code "publisher_url"}.
          *
-         * <p><b>Path in ISO 19115:</b> <ul><li>{@link ResponsibleParty} /
+         * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link ResponsibleParty} /
          * {@link ResponsibleParty#getContactInfo() contactInfo} /
          * {@link Contact#getOnlineResource() onlineResource} /
-         * {@link OnlineResource#getLinkage() linkage}</li></ul></p>
+         * {@link OnlineResource#getLinkage() linkage}</li></ul>
          */
         public final String URL;
 
@@ -467,10 +467,10 @@ public class AttributeNames {
          * The attribute name for the responsible's email address. Possible values are
          * {@code "creator_email"}, {@code "contributor_email"} or {@code "publisher_email"}.
          *
-         * <p><b>Path in ISO 19115:</b> <ul><li>{@link ResponsibleParty} /
+         * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link ResponsibleParty} /
          * {@link ResponsibleParty#getContactInfo() contactInfo} /
          * {@link Contact#getAddress() address} /
-         * {@link Address#getElectronicMailAddresses() electronicMailAddress}</li></ul></p>
+         * {@link Address#getElectronicMailAddresses() electronicMailAddress}</li></ul>
          */
         public final String EMAIL;
 
@@ -478,8 +478,8 @@ public class AttributeNames {
          * The attribute name for the responsible's role, or {@code null} if none.
          * Possible value is {@code "contributor_role"}.
          *
-         * <p><b>Path in ISO 19115:</b> <ul><li>{@link ResponsibleParty} /
-         * {@link ResponsibleParty#getRole()}</li></ul></p>
+         * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link ResponsibleParty} /
+         * {@link ResponsibleParty#getRole()}</li></ul>
          *
          * @see Role
          */
@@ -516,9 +516,9 @@ public class AttributeNames {
     /**
      * The set of attribute names for the creator (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getCitation() citation} with {@link Role#ORIGINATOR}</li></ul></p>
+     * {@link DataIdentification#getCitation() citation} with {@link Role#ORIGINATOR}</li></ul>
      *
      * @see #CONTRIBUTOR
      * @see #PUBLISHER
@@ -530,9 +530,9 @@ public class AttributeNames {
     /**
      * The set of attribute names for the contributor (<em>Suggested</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getCitation() citation}</li></ul></p>
+     * {@link DataIdentification#getCitation() citation}</li></ul>
      *
      * @see #CREATOR
      * @see #PUBLISHER
@@ -544,14 +544,14 @@ public class AttributeNames {
     /**
      * The set of attribute names for the publisher (<em>Suggested</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getDistributionInfo() distributionInfo} /
      * {@link Distribution#getDistributors() distributors} /
      * {@link Distributor#getDistributorContact() distributorContact} with {@link Role#PUBLISHER}</li>
      * <li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
-     * {@link Keywords#getKeywords() keyword} with the {@code "dataCenter"} {@link KeywordType}</li></ul></p>
+     * {@link Keywords#getKeywords() keyword} with the {@code "dataCenter"} {@link KeywordType}</li></ul>
      *
      * @see #CREATOR
      * @see #CONTRIBUTOR
@@ -564,10 +564,10 @@ public class AttributeNames {
      * The {@value} attribute name for the scientific project that produced the data
      * (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getDescriptiveKeywords() descriptiveKeywords} /
-     * {@link Keywords#getKeywords() keyword} with the {@code "project"} {@link KeywordType}</li></ul></p>
+     * {@link Keywords#getKeywords() keyword} with the {@code "project"} {@link KeywordType}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#project_Attribute">UCAR reference</a>
      */
@@ -577,19 +577,19 @@ public class AttributeNames {
      * The {@value} attribute name for the summary of the intentions with which the resource(s)
      * was developed.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getPurpose() purpose}</li></ul></p>
+     * {@link DataIdentification#getPurpose() purpose}</li></ul>
      */
     public static final String PURPOSE = "purpose";
 
     /**
      * The {@value} attribute name for bibliographical references.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getCitation() citation} /
-     * {@link Citation#getOtherCitationDetails() otherCitationDetails}</li></ul></p>
+     * {@link Citation#getOtherCitationDetails() otherCitationDetails}</li></ul>
      */
     public static final String REFERENCES = "references";
 
@@ -597,9 +597,9 @@ public class AttributeNames {
      * The {@value} attribute name for a textual description of the processing (or quality control)
      * level of the data.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getContentInfo() contentInfo} /
-     * {@link ImageDescription#getProcessingLevelCode() processingLevelCode}</li></ul></p>
+     * {@link ImageDescription#getProcessingLevelCode() processingLevelCode}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#processing_level_Attribute">UCAR reference</a>
      */
@@ -609,9 +609,9 @@ public class AttributeNames {
      * The {@value} attribute name for a place to acknowledge various type of support for
      * the project that produced this data (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
-     * {@link DataIdentification#getCredits() credit}</li></ul></p>
+     * {@link DataIdentification#getCredits() credit}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#acknowledgement_Attribute">UCAR reference</a>
      */
@@ -621,10 +621,10 @@ public class AttributeNames {
      * The {@value} attribute name for a description of the restrictions to data access
      * and distribution (<em>Recommended</em>).
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getResourceConstraints() resourceConstraints} /
-     * {@link LegalConstraints#getUseLimitations() useLimitation}</li></ul></p>
+     * {@link LegalConstraints#getUseLimitations() useLimitation}</li></ul>
      *
      * @see <a href="http://www.unidata.ucar.edu/software/netcdf-java/formats/DataDiscoveryAttConvention.html#license_Attribute">UCAR reference</a>
      */
@@ -636,10 +636,10 @@ public class AttributeNames {
      * {@code "patent pending"}, {@code "trademark"}, {@code "license"},
      * {@code "intellectual property rights"} or {@code "restricted"}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getResourceConstraints() resourceConstraints} /
-     * {@link LegalConstraints#getAccessConstraints() accessConstraints}</li></ul></p>
+     * {@link LegalConstraints#getAccessConstraints() accessConstraints}</li></ul>
      *
      * @see Restriction
      */
@@ -648,11 +648,11 @@ public class AttributeNames {
     /**
      * The {@value} attribute name for an identifier of the geographic area.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getExtents() extent} /
      * {@link Extent#getGeographicElements() geographicElement} /
-     * {@link GeographicDescription#getGeographicIdentifier() geographicIdentifier}</li></ul></p>
+     * {@link GeographicDescription#getGeographicIdentifier() geographicIdentifier}</li></ul>
      */
     public static final String GEOGRAPHIC_IDENTIFIER = "geographic_identifier";
 
@@ -815,7 +815,7 @@ public class AttributeNames {
      * resolution and units. Latitudes are assumed to be in decimal degrees north, unless a
      * units attribute is specified.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getExtents() extent} /
      * {@link Extent#getGeographicElements() geographicElement} /
@@ -824,7 +824,7 @@ public class AttributeNames {
      * <li>{@link Metadata} /
      * {@link Metadata#getSpatialRepresentationInfo() spatialRepresentationInfo} /
      * {@link GridSpatialRepresentation#getAxisDimensionProperties() axisDimensionProperties} /
-     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul></p>
+     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul>
      *
      * @see #LONGITUDE
      * @see #VERTICAL
@@ -840,7 +840,7 @@ public class AttributeNames {
      * resolution and units. Longitudes are assumed to be in decimal degrees east, unless a
      * units attribute is specified.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getExtents() extent} /
      * {@link Extent#getGeographicElements() geographicElement} /
@@ -849,7 +849,7 @@ public class AttributeNames {
      * <li>{@link Metadata} /
      * {@link Metadata#getSpatialRepresentationInfo() spatialRepresentationInfo} /
      * {@link GridSpatialRepresentation#getAxisDimensionProperties() axisDimensionProperties} /
-     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul></p>
+     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul>
      *
      * @see #LATITUDE
      * @see #VERTICAL
@@ -865,7 +865,7 @@ public class AttributeNames {
      * resolution and units. Elevations are assumed to be in metres above the ground, unless a
      * units attribute is specified.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getExtents() extent} /
      * {@link Extent#getVerticalElements() verticalElement} /
@@ -874,7 +874,7 @@ public class AttributeNames {
      * <li>{@link Metadata} /
      * {@link Metadata#getSpatialRepresentationInfo() spatialRepresentationInfo} /
      * {@link GridSpatialRepresentation#getAxisDimensionProperties() axisDimensionProperties} /
-     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul></p>
+     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul>
      *
      * @see #LATITUDE
      * @see #LONGITUDE
@@ -889,7 +889,7 @@ public class AttributeNames {
      * The set of attribute names for the start and end times of the bounding box, resolution and
      * units.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getIdentificationInfo() identificationInfo} /
      * {@link DataIdentification#getExtents() extent} /
      * {@link Extent#getTemporalElements() temporalElement} /
@@ -897,7 +897,7 @@ public class AttributeNames {
      * <li>{@link Metadata} /
      * {@link Metadata#getSpatialRepresentationInfo() spatialRepresentationInfo} /
      * {@link GridSpatialRepresentation#getAxisDimensionProperties() axisDimensionProperties} /
-     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul></p>
+     * {@link org.opengis.metadata.spatial.Dimension#getResolution() resolution}</li></ul>
      *
      * @see #LATITUDE
      * @see #LONGITUDE
@@ -914,10 +914,10 @@ public class AttributeNames {
      * If specified, they shall be one flag name for each {@linkplain #FLAG_MASKS flag mask},
      * {@linkplain #FLAG_VALUES flag value} and {@linkplain #FLAG_MEANINGS flag meaning}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getContentInfo() contentInfo} /
      * {@link CoverageDescription#getRangeElementDescriptions() rangeElementDescription} /
-     * {@link RangeElementDescription#getName() name}</li></ul></p>
+     * {@link RangeElementDescription#getName() name}</li></ul>
      */
     public static final String FLAG_NAMES = "flag_names";
 
@@ -925,10 +925,10 @@ public class AttributeNames {
      * The {@value} attribute name for bitmask to apply on sample values before to compare
      * them to the {@linkplain #FLAG_VALUES flag values}.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getContentInfo() contentInfo} /
      * {@link CoverageDescription#getRangeElementDescriptions() rangeElementDescription} /
-     * {@link RangeElementDescription#getRangeElements() rangeElement}</li></ul></p>
+     * {@link RangeElementDescription#getRangeElements() rangeElement}</li></ul>
      */
     public static final String FLAG_MASKS = "flag_masks";
 
@@ -939,10 +939,10 @@ public class AttributeNames {
      * A flagged condition is identified by a bitwise AND of the variable value and each flag masks
      * value; a result that matches the flag values value indicates a true condition.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getContentInfo() contentInfo} /
      * {@link CoverageDescription#getRangeElementDescriptions() rangeElementDescription} /
-     * {@link RangeElementDescription#getRangeElements() rangeElement}</li></ul></p>
+     * {@link RangeElementDescription#getRangeElements() rangeElement}</li></ul>
      */
     public static final String FLAG_VALUES = "flag_values";
 
@@ -950,10 +950,10 @@ public class AttributeNames {
      * The {@value} attribute name for the meaning of {@linkplain #FLAG_VALUES flag values}.
      * Each flag values and flag masks must coincide with a flag meanings.
      *
-     * <p><b>Path in ISO 19115:</b> <ul><li>{@link Metadata} /
+     * <p><b>Path in ISO 19115:</b></p> <ul><li>{@link Metadata} /
      * {@link Metadata#getContentInfo() contentInfo} /
      * {@link CoverageDescription#getRangeElementDescriptions() rangeElementDescription} /
-     * {@link RangeElementDescription#getDefinition() definition}</li></ul></p>
+     * {@link RangeElementDescription#getDefinition() definition}</li></ul>
      */
     public static final String FLAG_MEANINGS = "flag_meanings";
 



Mime
View raw message