sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/02: Documentation update: replace gmd prefix by prefix from new XML schemas for ISO 19115-3.
Date Sat, 20 Oct 2018 13:58:18 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit f645f1480c35ab04e90e108c08250b0939c8b446
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Fri Oct 19 10:40:14 2018 +0200

    Documentation update: replace gmd prefix by prefix from new XML schemas for ISO 19115-3.
---
 .../apache/sis/internal/book/CodeColorizer.java    |  4 +--
 .../org/apache/sis/internal/book/XML_PREFIX.lst    | 35 +++++++++++++++++++++-
 .../sis/internal/jaxb/gco/ObjectReference.java     | 12 ++++----
 .../apache/sis/internal/jaxb/gco/PropertyType.java | 12 ++++----
 .../metadata/iso/acquisition/DefaultObjective.java |  2 +-
 .../sis/metadata/iso/citation/DefaultCitation.java |  2 +-
 .../java/org/apache/sis/util/iso/package-info.java |  2 +-
 .../java/org/apache/sis/xml/IdentifierSpace.java   | 14 ++++-----
 .../main/java/org/apache/sis/xml/NilObject.java    | 18 +++++------
 .../src/main/java/org/apache/sis/xml/XML.java      |  2 +-
 .../main/java/org/apache/sis/xml/package-info.java |  8 ++---
 .../sis/metadata/iso/extent/DefaultExtentTest.java |  2 +-
 .../identification/DefaultBrowseGraphicTest.java   |  4 +--
 .../org/apache/sis/xml/UUIDMarshallingTest.java    | 20 ++++++-------
 .../apache/sis/coverage/grid/GridGeometryTest.java |  6 ++--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  8 ++---
 .../org/apache/sis/internal/storage/xml/Store.java |  2 +-
 17 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
index f6749cf..7a25df6 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
@@ -209,7 +209,7 @@ public final class CodeColorizer {
                 /*
                  * For more elaborated analysis than the above easy check, we need the Specifier
enum of the
                  * first word. It may be a GeoAPI or SIS class name (e.g. "Citation" in "Citation.title"),
-                 * or a XML prefix (e.g. "gmd" in "gmd:CI_Citation").
+                 * or a XML prefix (e.g. "cit" in "cit:CI_Citation").
                  */
                 int c, i=0;
                 while (Character.isJavaIdentifierPart((c = word.charAt(i)))) {
@@ -244,7 +244,7 @@ public final class CodeColorizer {
         }
         /*
          * Found the specifier. The XML prefix case is handle in a special way because
-         * we do not highlight the "gmd", "gml", etc. prefixes in highlitht(…) method.
+         * we do not highlight the "cit", "gml", etc. prefixes in highlitht(…) method.
          */
         if (specifier == Specifier.XML_PREFIX) {
             specifier = Specifier.OGC;
diff --git a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.lst
b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.lst
index ff1844e..8657229 100644
--- a/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.lst
+++ b/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.lst
@@ -1,6 +1,39 @@
+cat
+cit
+csw
+dqc
+fcc
 gco
+gcx
+gex
 gfc
 gmd
 gmi
-gmx
 gml
+gmw
+gmx
+gts
+lan
+mac
+mas
+mcc
+mco
+md1
+md2
+mda
+mdb
+mdq
+mds
+mdt
+mex
+mmi
+mpc
+mrc
+mrd
+mri
+mrl
+mrs
+msr
+rce
+srv
+xsi
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
index c52f912..7910f55 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
@@ -129,13 +129,13 @@ final class ObjectReference {
      * However a previous value may exit in unusual (probably not very valid) XML, as in
the following example:
      *
      * {@preformat xml
-     *   <gmd:CI_Citation>
-     *     <gmd:series uuidref="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
-     *       <gmd:CI_Series uuid="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
+     *   <cit:CI_Citation>
+     *     <cit:series uuidref="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
+     *       <cit:CI_Series uuid="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">
      *         ...
-     *       </gmd:CI_Series>
-     *     </gmd:series>
-     *   </gmd:CI_Citation>
+     *       </cit:CI_Series>
+     *     </cit:series>
+     *   </cit:CI_Citation>
      * }
      *
      * In such situation, this method is silent if the two identifiers are equal, or logs
a warning and restores
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
index ad566ab..096fa1f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
@@ -212,13 +212,13 @@ public abstract class PropertyType<ValueType extends PropertyType<ValueType,Boun
              * doubt, we are better to marshal the full object. We are not loosing information
since in the
              * later case, the identifiers will be marshalled as Strings by ISOMetadata.
Example:
              *
-             *   <gmd:CI_Citation>
-             *     <gmd:series uuidref="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">    
 ☚ marshalled by this
-             *       <gmd:CI_Series uuid="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">  
 ☚ marshalled by ISOMetadata
+             *   <cit:CI_Citation>
+             *     <cit:series uuidref="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">    
 ☚ marshalled by this
+             *       <cit:CI_Series uuid="f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf">  
 ☚ marshalled by ISOMetadata
              *         ...
-             *       </gmd:CI_Series>
-             *     </gmd:series>
-             *   </gmd:CI_Citation>
+             *       </cit:CI_Series>
+             *     </cit:series>
+             *   </cit:CI_Citation>
              *
              * We do not try to parse UUID or XLink objects from String because it should
be the job of
              * org.apache.sis.internal.jaxb.ModifiableIdentifierMap.put(Citation, String).
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
index d4a4bf6..ca7648e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
@@ -179,7 +179,7 @@ public class DefaultObjective extends ISOMetadata implements Objective
{
      * thus providing a unified view of every kind of identifiers associated to this objective.
      *
      * <div class="note"><b>XML note:</b>
-     * The {@code <gmd:identifier>} element marshalled to XML will exclude all the
above cited identifiers,
+     * The {@code <mac:identifier>} element marshalled to XML will exclude all the
above cited identifiers,
      * for compliance with ISO 19115 model. Those identifiers will appear in other XML elements
or attributes.</div>
      *
      * @return identification of the objective.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index e55901d..3353486 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
@@ -364,7 +364,7 @@ public class DefaultCitation extends ISOMetadata implements Citation {
      * providing a unified view of every kind of identifiers associated to this citation.
      *
      * <div class="note"><b>XML note:</b>
-     * The {@code <gmd:identifier>} element marshalled to XML will exclude all the
above cited identifiers,
+     * The {@code <cit:identifier>} element marshalled to XML will exclude all the
above cited identifiers,
      * for ISO 19115-3 compliance. Those identifiers will appear in other XML elements or
attributes.</div>
      *
      * @return the identifiers, or an empty collection if none.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java
index 53db887..de10783 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java
@@ -21,7 +21,7 @@
  *
  * <ul>
  *   <li>Implementations of {@link org.opengis.util.InternationalString}
- *       (related to the {@code <gmd:textGroup>} XML element found in ISO specifications):
+ *       (related to the {@code <lan:textGroup>} XML element found in ISO specifications):
  *     <ul>
  *       <li>{@link org.apache.sis.util.iso.SimpleInternationalString}   for wrapping
a single {@link java.lang.String};</li>
  *       <li>{@link org.apache.sis.util.iso.DefaultInternationalString}  for providing
many localizations in a {@link java.util.Map};</li>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
index a4e62d3..5c2945b 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/IdentifierSpace.java
@@ -30,13 +30,13 @@ import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
  * space are marshalled in the outer property element, as in the example below:
  *
  * {@preformat xml
- *   <gmd:CI_Citation>
- *     <gmd:series xlink:href="http://myReference">
- *       <gmd:CI_Series>
- *         <gmd:name>...</gmd:name>
- *       </gmd:CI_Series>
- *     </gmd:series>
- *   </gmd:CI_Citation>
+ *   <cit:CI_Citation>
+ *     <cit:series xlink:href="http://myReference">
+ *       <cit:CI_Series>
+ *         <cit:name>...</cit:name>
+ *       </cit:CI_Series>
+ *     </cit:series>
+ *   </cit:CI_Citation>
  * }
  *
  * The values defined in this interface can be used as keys in the map returned by
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
index d10a3bc..aac8946 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/NilObject.java
@@ -39,19 +39,19 @@ package org.apache.sis.xml;
  *   <th>Unknown {@code Series} element</th>
  * </tr><tr><td>
  * {@preformat xml
- *   <gmd:CI_Citation>
- *     <gmd:series>
- *       <gmd:CI_Series>
+ *   <cit:CI_Citation>
+ *     <cit:series>
+ *       <cit:CI_Series>
  *         <!-- Some content here -->
- *       </gmd:CI_Series>
- *     </gmd:series>
- *   </gmd:CI_Citation>
+ *       </cit:CI_Series>
+ *     </cit:series>
+ *   </cit:CI_Citation>
  * }
  * </td><td>
  * {@preformat xml
- *   <gmd:CI_Citation>
- *     <gmd:series nilReason="unknown"/>
- *   </gmd:CI_Citation>
+ *   <cit:CI_Citation>
+ *     <cit:series nilReason="unknown"/>
+ *   </cit:CI_Citation>
  * }
  * </td></tr></table>
  *
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
index 1f4e9c1..bb74cf0 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
@@ -99,7 +99,7 @@ public final class XML extends Static {
      * {@link CharSequence} recognized by {@link org.apache.sis.util.Locales#parse(String)}.
      *
      * <p>This property is mostly for marshallers. However this property can also be
used at
-     * unmarshalling time, for example if a {@code <gmd:PT_FreeText>} element containing
+     * unmarshalling time, for example if a {@code <lan:PT_FreeText>} element containing
      * many localized strings need to be represented in a Java {@link String} object. In
      * such case, the unmarshaller will try to pickup a string in the language specified
      * by this property.</p>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
index ba667c2..64b3978 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/package-info.java
@@ -32,13 +32,13 @@
  *
  * {@preformat xml
  *   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- *   <gmd:CI_Citation xmlns:gmd="http://www.isotc211.org/2005/gmd"
+ *   <cit:CI_Citation xmlns:gmd="http://www.isotc211.org/2005/gmd"
  *                    xmlns:gco="http://www.isotc211.org/2005/gco">
- *     <gmd:title>
+ *     <cit:title>
  *       <gco:CharacterString>Open Geospatial Consortium</gco:CharacterString>
- *     </gmd:title>
+ *     </cit:title>
  *     ... much more XML below this point ...
- *   </gmd:CI_Citation>
+ *   </cit:CI_Citation>
  * }
  *
  * <div class="section">Customizing the XML</div>
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index 8aa7a63..be34363 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -84,7 +84,7 @@ public final strictfp class DefaultExtentTest extends TestUsingFile {
     }
 
     /**
-     * Tests the (un)marshalling of a {@code <gmd:EX_Extent>} object.
+     * Tests the (un)marshalling of a {@code <gex:EX_Extent>} object.
      * This test opportunistically tests setting {@code "gml:id"} value.
      *
      * @throws JAXBException if an error occurred during the during marshalling / unmarshalling
processes.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
index 8428360..3bc89df 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
@@ -248,7 +248,7 @@ public final strictfp class DefaultBrowseGraphicTest extends TestCase
{
 
     /**
      * Ensures that the unmarshaller produces a warning when {@code <gco:CharacterString>}
and
-     * {@code <gcx:FileName>} both exist inside the same {@code <gmd:MD_BrowseGraphic>}.
+     * {@code <gcx:FileName>} both exist inside the same {@code <mcc:MD_BrowseGraphic>}.
      *
      * @throws JAXBException if an error occurred while (un)marshalling the {@code BrowseGraphic}.
      */
@@ -266,7 +266,7 @@ public final strictfp class DefaultBrowseGraphicTest extends TestCase
{
     }
 
     /**
-     * Implementation of {@link #testWarnings()} using the given {@code <gmd:fileName>}
values.
+     * Implementation of {@link #testWarnings()} using the given {@code <mcc:fileName>}
values.
      */
     private void testWarnings(final String first, final String second) throws JAXBException
{
         final Warning listener = new Warning();
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
index 914bb47..14214bc 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -44,7 +44,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
     private static final String UUID_VALUE = "f8f5fcb1-d57b-4013-b3a4-4eaa40df6dcf";
 
     /**
-     * A XML with a {@code uuid} identifier in the {@code <gmd:CI_Series>} element.
+     * A XML with a {@code uuid} identifier in the {@code <cit:CI_Series>} element.
      */
     private static final String IDENTIFIED_XML =
             "<cit:CI_Citation xmlns:cit=\"" + Namespaces.CIT + '"' +
@@ -62,7 +62,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
             "</cit:CI_Citation>";
 
     /**
-     * A XML with a {@code uuidref} identifier in the {@code <gmd:series>} element.
+     * A XML with a {@code uuidref} identifier in the {@code <cit:series>} element.
      * This XML declares the method body anyway, which is kind of contradictory with usage
of reference.
      */
     private static final String REFERENCED_XML_WITH_BODY =
@@ -81,7 +81,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
             "</cit:CI_Citation>";
 
     /**
-     * A XML with a {@code uuidref} identifier in the {@code <gmd:series>} element.
+     * A XML with a {@code uuidref} identifier in the {@code <cit:series>} element.
      */
     private static final String REFERENCED_XML =
             "<cit:CI_Citation xmlns:cit=\"" + Namespaces.CIT + '"' +
@@ -95,7 +95,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
     /**
      * Tests (un)marshalling of an object identified by the {@code uuid} attribute.
      * The element of interest for this test is the {@code "uuid"} attribute value
-     * in the {@code <gmd:CI_Series>} element of the following XML fragment:
+     * in the {@code <cit:CI_Series>} element of the following XML fragment:
      *
      * {@preformat xml
      *   <cit:CI_Citation>
@@ -112,7 +112,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      *   </cit:CI_Citation>
      * }
      *
-     * On an implementation note, the {@code uuid} and other attributes of the {@code <gmd:CI_Series>}
+     * On an implementation note, the {@code uuid} and other attributes of the {@code <cit:CI_Series>}
      * elements are handled by {@link org.apache.sis.internal.jaxb.gco.PropertyType}.
      *
      * @throws JAXBException if an error occurred during (un)marshalling.
@@ -146,7 +146,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      * This test does not try to resolve the reference, but only check that the identifier
is properly saved.
      *
      * <p>The element of interest for this test is the {@code "uuidref"} part
-     * in the {@code <gmd:series>} property of the following XML fragment:</p>
+     * in the {@code <cit:series>} property of the following XML fragment:</p>
      *
      * {@preformat xml
      *   <cit:CI_Citation>
@@ -164,7 +164,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
      * }
      *
      * On an implementation note, the {@code uuidref}, {@code xlink:href} and other attributes
of the
-     * {@code <gmd:series>} element are handled by {@link org.apache.sis.internal.jaxb.gco.PropertyType}.
+     * {@code <cit:series>} element are handled by {@link org.apache.sis.internal.jaxb.gco.PropertyType}.
      *
      * @throws JAXBException if an error occurred during (un)marshalling.
      */
@@ -185,8 +185,8 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
         assertEquals("uuid", UUID_VALUE, map.get(IdentifierSpace.UUID));
         /*
          * Marshal the object back to XML and compare with the expected result. The result
shall be
-         * slightly different than the original XML, since the UUID in the <gmd:series>
element shall
-         * move to the <gmd:CI_Series> element. This is the expected behavior because
we have a fully
+         * slightly different than the original XML, since the UUID in the <cit:series>
element shall
+         * move to the <cit:CI_Series> element. This is the expected behavior because
we have a fully
          * constructed object, not a reference to an object defined elsewhere.
          */
         final String actual = XML.marshal(citation);
@@ -195,7 +195,7 @@ public final strictfp class UUIDMarshallingTest extends TestCase {
     }
 
     /**
-     * The same test than {@link #testReference()}, except that the {@code <gmd:CI_Series>}
element is empty.
+     * The same test than {@link #testReference()}, except that the {@code <cit:CI_Series>}
element is empty.
      * This situation shall force the creation of a new, empty, element for storing the {@code
uuidref} information.
      *
      * @throws JAXBException if an error occurred during (un)marshalling.
diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
index 5c34e88..360cb20 100644
--- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -214,8 +214,8 @@ public final strictfp class GridGeometryTest extends TestCase {
                 new double[] {+80, 15}), grid.getEnvelope(), STRICT);
         assertArrayEquals("resolution", new double[] {0.5, 0.5}, grid.getResolution(false),
STRICT);
         assertMatrixEquals("gridToCRS", Matrices.create(3, 3, new double[] {
-                0, 0.5,  -89.75,
-                0.5, 0, -179.75,
-                0,   0,    1}), MathTransforms.getMatrix(grid.getGridToCRS(PixelInCell.CELL_CENTER)),
STRICT);
+                0,   0.5, -89.75,
+                0.5, 0,  -179.75,
+                0,   0,     1}), MathTransforms.getMatrix(grid.getGridToCRS(PixelInCell.CELL_CENTER)),
STRICT);
     }
 }
diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index 8ddd1e1..eb5a298 100644
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@ -695,7 +695,7 @@ split:  while ((start = CharSequences.skipLeadingWhitespaces(value, start,
lengt
 
     /**
      * Adds information about axes and cell geometry.
-     * This is the {@code <gmd:spatialRepresentationInfo>} element in XML.
+     * This is the {@code <mdb:spatialRepresentationInfo>} element in XML.
      *
      * @param  cs  the grid geometry (related to the netCDF coordinate system).
      */
@@ -878,7 +878,7 @@ split:  while ((start = CharSequences.skipLeadingWhitespaces(value, start,
lengt
     }
 
     /**
-     * Adds information about all netCDF variables. This is the {@code <gmd:contentInfo>}
element in XML.
+     * Adds information about all netCDF variables. This is the {@code <mdb:contentInfo>}
element in XML.
      * This method groups variables by their domains, i.e. variables having the same set
of axes are grouped together.
      */
     private void addContentInfo() {
@@ -918,7 +918,7 @@ split:  while ((start = CharSequences.skipLeadingWhitespaces(value, start,
lengt
 
     /**
      * Adds metadata about a sample dimension (or band) from the given variable.
-     * This is the {@code <gmd:dimension>} element in XML.
+     * This is the {@code <mrc:dimension>} element in XML.
      *
      * @param  variable  the netCDF variable.
      */
@@ -955,7 +955,7 @@ split:  while ((start = CharSequences.skipLeadingWhitespaces(value, start,
lengt
 
     /**
      * Adds metadata about the meaning of a sample value.
-     * This is the {@code <gmd:rangeElementDescription>} element in XML.
+     * This is the {@code <mrc:rangeElementDescription>} element in XML.
      *
      * <p><b>Note:</b> ISO 19115 range elements are approximately equivalent
to
      * {@code org.apache.sis.coverage.Category} in the {@code sis-coverage} module.</p>
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
index 76b9f55..e6a1509 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
@@ -49,7 +49,7 @@ import org.apache.sis.setup.OptionKey;
  * The current implementation recognizes the following objects:
  *
  * <ul>
- *   <li>{@link Metadata}, typically built from the {@code <gmd:MD_Metadata>}
XML element.</li>
+ *   <li>{@link Metadata}, typically built from the {@code <mdb:MD_Metadata>}
XML element.</li>
  *   <li>{@link ReferenceSystem}, accessible by {@link Metadata#getReferenceSystemInfo()}.</li>
  * </ul>
  *


Mime
View raw message