Author: desruisseaux
Date: Sun Feb 18 17:32:42 2018
New Revision: 1824678
URL: http://svn.apache.org/viewvc?rev=1824678&view=rev
Log:
Rename the files containing the name replacements to apply at reading or
writing time.
Added:
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst
- copied unchanged from r1824677,
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImageryExtensions.lst
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst
- copied unchanged from r1824677,
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.lst
Removed:
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImageryExtensions.lst
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.lst
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java?rev=1824678&r1=1824677&r2=1824678&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
[UTF-8] Sun Feb 18 17:32:42 2018
@@ -113,7 +113,7 @@ final class TransformVersion {
* The URI replacements to apply when going from the transforming
reader/writer to
* the model implemented by Apache SIS. This map is the converse of {@link
#exports}.
* It does not contain the map of properties to rename because that map is
handled
- * by {@link TransformingReader} instead, as part of {@code
NamespaceContent.lst} file.
+ * by {@link TransformingReader} instead, as part of {@value
TransformingReader#FILENAME} file.
*
* <p>This map shall not be modified after construction.
* We do not wrap in {@link Collections#unmodifiableMap(Map)} for
efficiency.</p>
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java?rev=1824678&r1=1824677&r2=1824678&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
[UTF-8] Sun Feb 18 17:32:42 2018
@@ -57,7 +57,7 @@ final class TransformingReader extends T
* different URIs under {@code "http://standards.iso.org/iso/19115/-3/…"}
depending on the
* class name.
*/
- static final String FILENAME = "NamespaceContent.lst";
+ static final String FILENAME = "ImportNames.lst";
/**
* The mapping from (<var>type</var>, <var>attribute</var>) pairs to
namespaces.
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java?rev=1824678&r1=1824677&r2=1824678&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
[UTF-8] Sun Feb 18 17:32:42 2018
@@ -62,7 +62,7 @@ final class TransformingWriter extends T
* where legacy schemas had two distinct URIs: {@code
"http://www.isotc211.org/2005/gmd"}
* and {@code "http://standards.iso.org/iso/19115/-2/gmi/1.0"}.
*/
- static final String FILENAME = "ImageryExtensions.lst";
+ static final String FILENAME = "ExportNames.lst";
/**
* The mapping from (<var>type</var>, <var>attribute</var>) pairs to
legacy namespaces.
