sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1682899 - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
Date Mon, 01 Jun 2015 13:43:04 GMT
Author: desruisseaux
Date: Mon Jun  1 13:43:03 2015
New Revision: 1682899

URL: http://svn.apache.org/r1682899
Log:
Metadata: added ISO 19115 version information.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java?rev=1682899&r1=1682898&r2=1682899&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
[UTF-8] Mon Jun  1 13:43:03 2015
@@ -81,6 +81,7 @@ public final class ServicesForUtility ex
         CharSequence     edition               = null;
         String           code                  = null;
         String           codeSpace             = null;
+        String           version               = null;
         CharSequence     citedResponsibleParty = null;
         PresentationForm presentationForm      = null;
         Citation         copyFrom              = null;  // Copy citedResponsibleParty from
that citation.
@@ -90,6 +91,7 @@ public final class ServicesForUtility ex
                 edition   = "ISO 19115-1:2014(E)";
                 code      = "19115-1";
                 codeSpace = "ISO";
+                version   = "2014(E)";
                 citedResponsibleParty = "International Organization for Standardization";
                 presentationForm = PresentationForm.DOCUMENT_DIGITAL;
                 break;
@@ -99,6 +101,7 @@ public final class ServicesForUtility ex
                 edition   = "ISO 19115-2:2009(E)";
                 code      = "19115-2";
                 codeSpace = "ISO";
+                version   = "2009(E)";
                 copyFrom  = Citations.ISO_19115.get(0);
                 presentationForm = PresentationForm.DOCUMENT_DIGITAL;
                 break;
@@ -150,7 +153,7 @@ public final class ServicesForUtility ex
         final DefaultCitation c = new DefaultCitation(title);
         if (alternateTitle        != null) c.getAlternateTitles().add(Types.toInternationalString(alternateTitle));
         if (edition               != null) c.setEdition(Types.toInternationalString(edition));
-        if (code                  != null) c.getIdentifiers().add(new ImmutableIdentifier(null,
codeSpace, code));
+        if (code                  != null) c.getIdentifiers().add(new ImmutableIdentifier(null,
codeSpace, code, version, null));
         if (copyFrom              != null) c.setCitedResponsibleParties(copyFrom.getCitedResponsibleParties());
         if (presentationForm      != null) c.getPresentationForms().add(presentationForm);
         if (citedResponsibleParty != null) {

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java?rev=1682899&r1=1682898&r2=1682899&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] Mon Jun  1 13:43:03 2015
@@ -163,7 +163,8 @@ public final strictfp class MetadataRead
             "  │   ├─Edition……………………………………………………………………………………
ISO 19115-1:2014(E)\n" +
             "  │   ├─Identifier\n" +
             "  │   │   ├─Code…………………………………………………………………………………
19115-1\n" +
-            "  │   │   └─Code space…………………………………………………………………
ISO\n" +
+            "  │   │   ├─Code space…………………………………………………………………
ISO\n" +
+            "  │   │   └─Version…………………………………………………………………………
2014(E)\n" +
             "  │   └─Presentation form…………………………………………………………
Document digital\n" +
             "  └─Metadata standard (2 of 2)\n" +
             "      ├─Title…………………………………………………………………………………………
Geographic Information — Metadata Part 2: Extensions for imagery and gridded data\n" +
@@ -174,7 +175,8 @@ public final strictfp class MetadataRead
             "      ├─Edition……………………………………………………………………………………
ISO 19115-2:2009(E)\n" +
             "      ├─Identifier\n" +
             "      │   ├─Code…………………………………………………………………………………
19115-2\n" +
-            "      │   └─Code space…………………………………………………………………
ISO\n" +
+            "      │   ├─Code space…………………………………………………………………
ISO\n" +
+            "      │   └─Version…………………………………………………………………………
2009(E)\n" +
             "      └─Presentation form…………………………………………………………
Document digital\n", text);
     }
 }



Mime
View raw message