sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1595039 [3/3] - in /sis/branches/JDK6: ./ application/sis-javafx/ core/ core/sis-build-helper/src/main/ant/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-feature/ core/sis-feature/src/main/java/org/apache/sis...
Date Thu, 15 May 2014 20:48:32 GMT
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Thu May 15 20:48:31 2014
@@ -56,6 +56,7 @@ ExcessiveArgumentSize_3           = Argu
 ExcessiveListSize_2               = A size of {1} elements is excessive for the \u201c{0}\u201d list.
 ExcessiveStringSize               = The character string is too long.
 ForbiddenAttribute_2              = Attribute \u201c{0}\u201d is not allowed for an object of type \u2018{1}\u2019.
+ForbiddenProperty_1               = Property \u201c{0}\u201d is not allowed.
 IllegalArgumentClass_2            = Argument \u2018{0}\u2019 can not be an instance of \u2018{1}\u2019.
 IllegalArgumentClass_3            = Argument \u2018{0}\u2019 can not be an instance of \u2018{2}\u2019. Expected an instance of \u2018{1}\u2019 or derived type.
 IllegalArgumentField_4            = Argument \u2018{0}\u2019 can not take the \u201c{1}\u201d value, because the \u2018{2}\u2019 field can not take the \u201c{3}\u201d value.
@@ -91,10 +92,11 @@ KeyCollision_1                    = A di
 MandatoryAttribute_2              = Attribute \u201c{0}\u201d is mandatory for an object of type \u2018{1}\u2019.
 MismatchedArrayLengths            = Mismatched array lengths.
 MismatchedCRS                     = The coordinate reference system must be the same for all objects.
-MismatchedParameterDescriptor_1   = Mismatched descriptor for \u201c{0}\u201d parameter.
 MismatchedDimension_2             = Mismatched object dimensions: {0}D and {1}D.
 MismatchedDimension_3             = Argument \u2018{0}\u2019 has {2} dimension{2,choice,1#|2#s}, while {1} was expected.
 MismatchedMatrixSize_4            = Mismatched matrix sizes: expected {0}\u00d7{1} but got {2}\u00d7{3}.
+MismatchedParameterDescriptor_1   = Mismatched descriptor for \u201c{0}\u201d parameter.
+MismatchedPropertyType_1          = Mismatched type for \u201c{0}\u201d property.
 MissingAuthority_1                = No authority was specified for code \u201c{0}\u201d. The expected syntax is \u201cAUTHORITY:CODE\u201d.
 MissingRequiredModule_1           = This operation requires the \u201c{0}\u201d module.
 MissingSchemeInURI                = Missing scheme in URI.
@@ -136,6 +138,7 @@ NullCollectionElement_1           = \u20
 NullMapKey                        = Null key is not allowed in this dictionary.
 NullMapValue                      = Null values are not allowed in this dictionary.
 OddArrayLength_1                  = Array length is {0}, while we expected an even length.
+PropertyAlreadyExists_2           = Property \u201c{1}\u201d is already exists in \u201c{0}\u201d.
 ParameterNotFound_2               = No parameter named \u201c{1}\u201d has been found in \u201c{0}\u201d.
 PropertyNotFound_2                = No property named \u201c{1}\u201d has been found in \u201c{0}\u201d.
 SingularMatrix                    = Matrix is singular.

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Thu May 15 20:48:31 2014
@@ -46,6 +46,7 @@ ExcessiveArgumentSize_3           = L\u2
 ExcessiveListSize_2               = Une taille de {1} \u00e9l\u00e9ments est excessive pour la liste \u00ab\u202f{0}\u202f\u00bb.
 ExcessiveStringSize               = La cha\u00eene de caract\u00e8res est trop longue.
 ForbiddenAttribute_2              = L\u2019attribut \u00ab\u202f{0}\u202f\u00bb n\u2019est pas autoris\u00e9 pour un objet de type \u2018{1}\u2019.
+ForbiddenProperty_1               = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas autoris\u00e9e.
 IllegalArgumentClass_2            = L\u2019argument \u2018{0}\u2019 ne peut pas \u00eatre de type \u2018{1}\u2019.
 IllegalArgumentClass_3            = L\u2019argument \u2018{0}\u2019 ne peut pas \u00eatre de type \u2018{2}\u2019. Une instance de \u2018{1}\u2019 ou d\u2019un type d\u00e9riv\u00e9 \u00e9tait attendue.
 IllegalArgumentField_4            = L\u2019argument \u2018{0}\u2019 n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb parce que le champs \u2018{2}\u2019 ne peut pas prendre la valeur \u00ab\u202f{3}\u202f\u00bb.
@@ -81,10 +82,11 @@ KeyCollision_1                    = Une 
 MandatoryAttribute_2              = L\u2019attribut \u00ab\u202f{0}\u202f\u00bb est obligatoire pour un objet de type \u2018{1}\u2019.
 MismatchedArrayLengths            = Les dimensions des tableaux ne correspondent pas.
 MismatchedCRS                     = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es doit \u00eatre le m\u00eame pour tous les objets.
-MismatchedParameterDescriptor_1   = Le descripteur du param\u00e8tre \u00ab\u202f{0}\u202f\u00bb ne correspond pas.
 MismatchedDimension_2             = Les dimensions des objets ({0}D et {1}D) ne concordent pas.
 MismatchedDimension_3             = L\u2019argument \u2018{0}\u2019 a {2} dimension{2,choice,1#|2#s}, alors qu\u2019on en attendait {1}.
 MismatchedMatrixSize_4            = Une matrice de taille de {0}\u00d7{1} \u00e9tait attendue mais la matrice donn\u00e9es est de taille {2}\u00d7{3}.
+MismatchedParameterDescriptor_1   = Le descripteur du param\u00e8tre \u00ab\u202f{0}\u202f\u00bb ne correspond pas.
+MismatchedPropertyType_1          = Le type de la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb ne correspond pas.
 MissingAuthority_1                = Aucune autorit\u00e9 n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e pour le code \u00ab\u202f{0}\u202f\u00bb. Le format attendu est \u00ab\u202fAUTORIT\u00c9:CODE\u202f\u00bb.
 MissingRequiredModule_1           = Cette op\u00e9ration requiert le module \u00ab\u202f{0}\u202f\u00bb.
 MissingSchemeInURI                = Il manque le sch\u00e9ma d\u2019URI.
@@ -125,6 +127,7 @@ NullCollectionElement_1           = La c
 NullMapKey                        = La cl\u00e9 nulle n\u2019est pas autoris\u00e9e dans ce dictionnaire.
 NullMapValue                      = Les valeurs nulles ne sont pas autoris\u00e9es dans ce dictionnaire.
 OddArrayLength_1                  = La longueur du tableau est {0}, alors qu\u2019on attendait une longueur paire.
+PropertyAlreadyExists_2           = La propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb existe d\u00e9j\u00e0 dans \u00ab\u202f{0}\u202f\u00bb.
 ParameterNotFound_2               = Aucun param\u00e8tre nomm\u00e9 \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9 dans \u00ab\u202f{0}\u202f\u00bb.
 PropertyNotFound_2                = Aucune propri\u00e9t\u00e9 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
 RecursiveCreateCallForKey_1       = Appel r\u00e9cursif lors de la cr\u00e9ation d\u2019un objet pour la cl\u00e9 \u00ab\u202f{0}\u202f\u00bb.

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java [UTF-8] Thu May 15 20:48:31 2014
@@ -16,9 +16,11 @@
  */
 package org.apache.sis.internal.util;
 
+import java.util.List;
 import java.util.Arrays;
 import java.util.Collection;
 import org.apache.sis.util.NullArgumentException;
+import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
@@ -30,7 +32,7 @@ import static org.apache.sis.test.Assert
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.5
  * @module
  */
 public final strictfp class CheckedArrayListTest extends TestCase {
@@ -90,16 +92,40 @@ public final strictfp class CheckedArray
      * Ensures that we can not element of the wrong type.
      */
     @Test
-    @SuppressWarnings({"unchecked","rawtypes"})
     public void testAddWrongType() {
-        final CheckedArrayList list = new CheckedArrayList<String>(String.class);
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
+        final String message = testAddWrongType(list);
+        assertTrue("element", message.contains("element"));
+        assertTrue("Integer", message.contains("Integer"));
+        assertTrue("String",  message.contains("String"));
+    }
+
+    /**
+     * Implementation of {@link #testAddWrongType()}, also shared by {@link #testAddWrongTypeToSublist()}.
+     * Returns the exception message.
+     */
+    @SuppressWarnings({"unchecked","rawtypes"})
+    private static String testAddWrongType(final List list) {
         try {
             list.add(Integer.valueOf(4));
-        } catch (IllegalArgumentException e) {
-            final String message = e.getMessage();
-            assertTrue("element", message.contains("element"));
-            assertTrue("Integer", message.contains("Integer"));
-            assertTrue("String",  message.contains("String"));
+            fail("Shall not be allowed to add an integer to the list.");
+            return null;
+        } catch (ClassCastException e) {
+            return e.getMessage();
         }
     }
+
+    /**
+     * Ensures that we can not element of the wrong type in a sublist.
+     */
+    @Test
+    @DependsOnMethod("testAddWrongType")
+    public void testAddWrongTypeToSublist() {
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
+        assertTrue(list.add("One"));
+        assertTrue(list.add("Two"));
+        assertTrue(list.add("Three"));
+        testAddWrongType(list.subList(1, 3));
+        // Exception message is JDK-dependent, so we can not test it.
+    }
 }

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] Thu May 15 20:48:31 2014
@@ -23,8 +23,16 @@ import org.junit.Test;
 
 import static javax.measure.unit.Unit.ONE;
 import static javax.measure.unit.SI.CELSIUS;
+import static javax.measure.unit.SI.KELVIN;
 import static javax.measure.unit.SI.METRE;
+import static javax.measure.unit.SI.METRES_PER_SECOND;
+import static javax.measure.unit.SI.SQUARE_METRE;
 import static javax.measure.unit.SI.KILOMETRE;
+import static javax.measure.unit.SI.KILOGRAM;
+import static javax.measure.unit.SI.JOULE;
+import static javax.measure.unit.SI.PASCAL;
+import static javax.measure.unit.SI.SECOND;
+import static javax.measure.unit.SI.HERTZ;
 import static javax.measure.unit.SI.RADIAN;
 import static javax.measure.unit.NonSI.CENTIRADIAN;
 import static javax.measure.unit.NonSI.DEGREE_ANGLE;
@@ -35,6 +43,7 @@ import static javax.measure.unit.NonSI.D
 import static javax.measure.unit.NonSI.SPHERE;
 import static javax.measure.unit.NonSI.ATMOSPHERE;
 import static javax.measure.unit.NonSI.NAUTICAL_MILE;
+import static javax.measure.unit.NonSI.PERCENT;
 import static org.apache.sis.measure.SexagesimalConverter.*;
 import static org.apache.sis.measure.Units.*;
 import static org.apache.sis.test.Assert.*;
@@ -214,7 +223,7 @@ public final strictfp class UnitsTest ex
     }
 
     /**
-     * Tests {@link Units#valueOf(String)}.
+     * Tests {@link Units#valueOf(String)} with units most commonly found in geospatial data.
      */
     @Test
     public void testValueOf() {
@@ -226,12 +235,14 @@ public final strictfp class UnitsTest ex
         assertSame(DEGREE_ANGLE, valueOf("DEGREES"));
         assertSame(DEGREE_ANGLE, valueOf("DEGRÉES"));
         assertSame(DEGREE_ANGLE, valueOf("degrees_east"));
+        assertSame(DEGREE_ANGLE, valueOf("degrees_north"));
         assertSame(DEGREE_ANGLE, valueOf("degrées_north"));
         assertSame(DEGREE_ANGLE, valueOf("decimal_degree"));
         assertSame(SECOND_ANGLE, valueOf("arcsec"));
         assertSame(RADIAN,       valueOf("rad"));
         assertSame(RADIAN,       valueOf("radian"));
         assertSame(RADIAN,       valueOf("radians"));
+        assertSame(SECOND,       valueOf("s"));
         assertSame(METRE,        valueOf("m"));
         assertSame(METRE,        valueOf("metre"));
         assertSame(METRE,        valueOf("meter"));
@@ -244,9 +255,37 @@ public final strictfp class UnitsTest ex
         assertSame(KILOMETRE,    valueOf("kilometres"));
         assertSame(KILOMETRE,    valueOf("kilomètres"));
         assertSame(KILOMETRE,    valueOf("kilometers"));
+        assertSame(KELVIN,       valueOf("K"));
         assertSame(CELSIUS,      valueOf("Celsius"));
         assertSame(CELSIUS,      valueOf("degree Celsius"));
         assertSame(CELSIUS,      valueOf("degree_Celcius"));
+        assertSame(PASCAL,       valueOf("Pa"));
+    }
+
+    /**
+     * Tests {@link Units#valueOf(String)} with more advanced units.
+     * Those units are found in NetCDF files among others.
+     */
+    @Test
+    public void testAdvancedValueOf() {
+        assertSame  (Units.MILLISECOND,             valueOf("ms"));
+        assertEquals(METRES_PER_SECOND,             valueOf("m/s"));
+        assertEquals(METRES_PER_SECOND,             valueOf("m.s-1"));
+        assertEquals(SQUARE_METRE.divide(SECOND),   valueOf("m2.s-1"));
+        assertEquals(KILOGRAM.divide(SQUARE_METRE), valueOf("kg.m-2"));
+        assertEquals(JOULE.divide(KILOGRAM),        valueOf("J/kg"));
+        assertEquals(PASCAL.divide(SECOND),         valueOf("Pa/s"));
+        assertSame  (HERTZ,                         valueOf("1/s"));
+        assertSame  (HERTZ,                         valueOf("s-1"));
+        assertSame  (PERCENT,                       valueOf("%"));
+        assertSame  (Unit.ONE,                      valueOf("kg/kg"));
+        assertSame  (Unit.ONE,                      valueOf("kg.kg-1"));
+        assertSame  (Units.PPM,                     valueOf("ppm")); // Parts per million
+        assertSame  (Units.PSU,                     valueOf("psu")); // Pratical Salinity Unit
+        assertSame  (Units.SIGMA,                   valueOf("sigma"));
+
+        // Potential vorticity surface
+        assertEquals(KELVIN.times(SQUARE_METRE).divide(KILOGRAM.times(SECOND)), valueOf("K.m2.kg-1.s-1"));
     }
 
     /**

Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Thu May 15 20:48:31 2014
@@ -647,8 +647,8 @@ 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>
           <doclet>org.apache.sis.internal.doclet.Doclet</doclet>
           <tagletArtifact>

Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java [UTF-8] Thu May 15 20:48:31 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";
 

Modified: sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java?rev=1595039&r1=1595038&r2=1595039&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java [UTF-8] Thu May 15 20:48:31 2014
@@ -29,7 +29,6 @@ import com.esri.core.geometry.Polygon;
 import com.esri.core.geometry.Polyline;
 import com.esri.core.geometry.Geometry;
 
-import org.apache.sis.measure.NumberRange;
 import org.apache.sis.feature.DefaultFeature;
 import org.apache.sis.feature.DefaultFeatureType;
 import org.apache.sis.feature.DefaultAttributeType;
@@ -163,7 +162,7 @@ public class ShapeFile {
                 double x = rf.getDouble();
                 double y = rf.getDouble();
                 Point pnt = new Point(x,y);
-                f.setAttributeValue(GEOMETRY_NAME, pnt);
+                f.setPropertyValue(GEOMETRY_NAME, pnt);
 
             } else if (ShapeType == ShapeTypeEnum.Polygon.getValue()) {
                 double xmin = rf.getDouble();
@@ -191,7 +190,7 @@ public class ShapeFile {
                     ypnt = rf.getDouble();
                     poly.lineTo(xpnt, ypnt);
                 }
-                f.setAttributeValue(GEOMETRY_NAME, poly);
+                f.setPropertyValue(GEOMETRY_NAME, poly);
 
             } else if (ShapeType == ShapeTypeEnum.PolyLine.getValue()) {
                 double xmin = rf.getDouble();
@@ -227,7 +226,7 @@ public class ShapeFile {
                     }
                 }
 
-                f.setAttributeValue(GEOMETRY_NAME, ply);
+                f.setPropertyValue(GEOMETRY_NAME, ply);
 
             } else {
                 throw new DataStoreException("Unsupported shapefile type: " + this.ShapeType);
@@ -244,7 +243,7 @@ public class ShapeFile {
                 data = new byte[fd.getLength()];
                 df.get(data);
                 String value = new String(data);
-                f.setAttributeValue(fd.getName(), value);
+                f.setPropertyValue(fd.getName(), value);
             }
 
             this.FeatureMap.put(RecordNumber, f);
@@ -259,14 +258,13 @@ public class ShapeFile {
     private DefaultFeatureType getFeatureType(final String name) {
         final int n = FDArray.size();
         final DefaultAttributeType<?>[] attributes = new DefaultAttributeType<?>[n + 1];
-        final NumberRange<Integer> cardinality = NumberRange.create(1, true, 1, true);
         final Map<String,Object> properties = new HashMap<String,Object>(4);
         for (int i=0; i<n; i++) {
             properties.put(DefaultAttributeType.NAME_KEY, FDArray.get(i).getName());
-            attributes[i] = new DefaultAttributeType<String>(properties, String.class, null, cardinality);
+            attributes[i] = new DefaultAttributeType<String>(properties, String.class, 1, 1, null);
         }
         properties.put(DefaultAttributeType.NAME_KEY, GEOMETRY_NAME);
-        attributes[n] = new DefaultAttributeType<Geometry>(properties, Geometry.class, null, cardinality);
+        attributes[n] = new DefaultAttributeType<Geometry>(properties, Geometry.class, 1, 1, null);
         properties.put(DefaultAttributeType.NAME_KEY, name);
         return new DefaultFeatureType(properties, false, null, attributes);
     }



Mime
View raw message