sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1682897 - in /sis/branches/JDK8/core/sis-metadata/src: main/java/org/apache/sis/metadata/iso/citation/ test/java/org/apache/sis/metadata/ test/java/org/apache/sis/metadata/iso/citation/
Date Mon, 01 Jun 2015 13:29:11 GMT
Author: desruisseaux
Date: Mon Jun  1 13:29:10 2015
New Revision: 1682897

URL: http://svn.apache.org/r1682897
Log:
Metadata: minor javadoc, and remove the HardCodeCitations.GEOTIFF constant (was used in tests
only).
We will use the "real" Citations.GEOTIFF constant instead if needed, or the HardCodedCitations.SIS
constant if a "dummy" codespace is needed for testing purpose.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1682897&r1=1682896&r2=1682897&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] Mon Jun  1 13:29:10 2015
@@ -61,7 +61,7 @@ import static org.apache.sis.internal.ut
  *   <li>{@link org.apache.sis.metadata.iso.DefaultMetadata#getMetadataStandards()}
for other {@code Citation} constants.</li>
  * </ul>
  *
- * The static methods defined in this class are typically for:
+ * The static methods defined in this class are for:
  * <ul>
  *   <li>Inferring an identifier from a citation (this is useful mostly with {@code
IdentifierSpace} instances).</li>
  *   <li>Determining if two instances can be considered the same {@code Citation} by
comparing their titles or
@@ -101,12 +101,12 @@ public final class Citations extends Sta
      * and in the way that SIS support them. The current content is:
      *
      * <ul>
-     *   <li>At index 0, {@linkplain org.opengis.annotation.Specification#ISO_19115
  ISO 19115-1:2014(E)}</li>
-     *   <li>At index 1, {@linkplain org.opengis.annotation.Specification#ISO_19115_2
ISO 19115-2:2009(E)}</li>
+     *   <li>{@linkplain org.opengis.annotation.Specification#ISO_19115   ISO 19115-1:2014(E)}
at index 0.</li>
+     *   <li>{@linkplain org.opengis.annotation.Specification#ISO_19115_2 ISO 19115-2:2009(E)}
at index 1.</li>
      * </ul>
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.DefaultMetadata#getMetadataStandards()}</li>
      * </ul>
@@ -174,7 +174,7 @@ public final class Citations extends Sta
      * which return only {@code "EPSG"}.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -220,7 +220,7 @@ public final class Citations extends Sta
      * {@linkplain DefaultCitation#getTitle() title} or URL according newer OGC publications.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -253,7 +253,7 @@ public final class Citations extends Sta
      * </table></div>
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -299,7 +299,7 @@ public final class Citations extends Sta
      * </table></div>
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -314,7 +314,7 @@ public final class Citations extends Sta
      * This specification identifies some map projections by their own numerical codes.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -327,7 +327,7 @@ public final class Citations extends Sta
      * The authority for identifiers of objects defined by the <a href="http://trac.osgeo.org/proj/">Proj.4</a>
project.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -340,7 +340,7 @@ public final class Citations extends Sta
      * The authority for identifiers of objects defined by MapInfo.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -354,7 +354,7 @@ public final class Citations extends Sta
      * for digital hydrographic data</a> specification.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.ImmutableIdentifier#getAuthority()}</li>
      * </ul>
@@ -369,7 +369,7 @@ public final class Citations extends Sta
      * but the SIS library handles it like any other identifier.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link DefaultCitation#getIdentifiers()}</li>
      * </ul>
@@ -384,7 +384,7 @@ public final class Citations extends Sta
      * but the SIS library handles it like any other identifier.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link DefaultCitation#getIdentifiers()}</li>
      * </ul>
@@ -397,7 +397,7 @@ public final class Citations extends Sta
      * The codespace of objects that are specific to the <a href="http://sis.apache.org">Apache
SIS</a> project.
      *
      * <div class="section">Main usage</div>
-     * This value is typically returned by:
+     * This value can be returned by:
      * <ul>
      *   <li>{@link org.apache.sis.metadata.iso.quality.DefaultConformanceResult#getSpecification()}</li>
      * </ul>

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java?rev=1682897&r1=1682896&r2=1682897&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
[UTF-8] Mon Jun  1 13:29:10 2015
@@ -172,13 +172,13 @@ public final strictfp class MetadataStan
 
         // Self equality test
         DefaultCitation instance = HardCodedCitations.EPSG;
-        assertFalse(std.equals(instance, HardCodedCitations.GEOTIFF, ComparisonMode.STRICT));
-        assertTrue (std.equals(instance, HardCodedCitations.EPSG,    ComparisonMode.STRICT));
+        assertFalse(std.equals(instance, HardCodedCitations.SIS,  ComparisonMode.STRICT));
+        assertTrue (std.equals(instance, HardCodedCitations.EPSG, ComparisonMode.STRICT));
 
         // Test comparison with a copy
         instance = new DefaultCitation(HardCodedCitations.EPSG);
-        assertFalse(std.equals(instance, HardCodedCitations.GEOTIFF, ComparisonMode.STRICT));
-        assertTrue (std.equals(instance, HardCodedCitations.EPSG,    ComparisonMode.STRICT));
+        assertFalse(std.equals(instance, HardCodedCitations.SIS,  ComparisonMode.STRICT));
+        assertTrue (std.equals(instance, HardCodedCitations.EPSG, ComparisonMode.STRICT));
 
         // test comparison with a modified copy
         instance.setTitle(new SimpleInternationalString("A dummy title"));

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1682897&r1=1682896&r2=1682897&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] Mon Jun  1 13:29:10 2015
@@ -593,13 +593,13 @@ public final strictfp class PropertyAcce
     public void testEquals() {
         DefaultCitation citation = HardCodedCitations.EPSG;
         final PropertyAccessor accessor = createPropertyAccessor();
-        assertFalse(accessor.equals(citation, HardCodedCitations.GEOTIFF, ComparisonMode.STRICT));
-        assertTrue (accessor.equals(citation, HardCodedCitations.EPSG,    ComparisonMode.STRICT));
+        assertFalse(accessor.equals(citation, HardCodedCitations.SIS,  ComparisonMode.STRICT));
+        assertTrue (accessor.equals(citation, HardCodedCitations.EPSG, ComparisonMode.STRICT));
 
         // Same test than above, but on a copy of the EPSG constant.
         citation = new DefaultCitation(HardCodedCitations.EPSG);
-        assertFalse(accessor.equals(citation, HardCodedCitations.GEOTIFF, ComparisonMode.STRICT));
-        assertTrue (accessor.equals(citation, HardCodedCitations.EPSG,    ComparisonMode.STRICT));
+        assertFalse(accessor.equals(citation, HardCodedCitations.SIS,  ComparisonMode.STRICT));
+        assertTrue (accessor.equals(citation, HardCodedCitations.EPSG, ComparisonMode.STRICT));
 
         // Identifiers shall be stored in different collection instances with equal content.
         final int    index  = accessor.indexOf("identifiers", true);

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java?rev=1682897&r1=1682896&r2=1682897&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
[UTF-8] Mon Jun  1 13:29:10 2015
@@ -104,18 +104,7 @@ public final strictfp class HardCodedCit
     }
 
     /**
-     * The <a href="http://www.remotesensing.org/geotiff/geotiff.html">GeoTIFF</a>
specification.
-     */
-    public static final DefaultCitation GEOTIFF;
-    static {
-        final DefaultCitation c = new DefaultCitation("GeoTIFF");
-        c.getPresentationForms().add(PresentationForm.DOCUMENT_DIGITAL);
-        c.freeze();
-        GEOTIFF = c;
-    }
-
-    /**
-     * The <a href="http://sis.apache.org">Apache SIS</a> project.
+     * Codespace for objects specific to <a href="http://sis.apache.org">Apache SIS</a>.
      */
     public static final DefaultCitation SIS;
     static {



Mime
View raw message