Author: desruisseaux
Date: Mon Feb 26 11:37:12 2018
New Revision: 1825356
URL: http://svn.apache.org/viewvc?rev=1825356&view=rev
Log:
Post-merge cleanup.
Removed:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
-import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.xml.Namespaces;
@@ -60,8 +59,10 @@ public final class MD_RestrictionCode ex
*/
@Override
protected MD_RestrictionCode wrap(final CodeListUID value) {
- if ("licence".equals(value.codeListValue) &&
Context.isFlagSet(Context.current(), Context.LEGACY_METADATA)) {
+ if ("licence".equals(value.codeListValue) && !accept2014()) {
value.codeListValue = "license";
+ } else if ("license".equals(value.codeListValue) && accept2014()) {
+ value.codeListValue = "licence";
}
return new MD_RestrictionCode(value);
}
@@ -93,6 +94,9 @@ public final class MD_RestrictionCode ex
* @param value the unmarshalled value.
*/
public void setElement(final CodeListUID value) {
+ if (value != null && "license".equalsIgnoreCase(value.codeListValue)) {
+ value.codeListValue = "licence"; // For matching current
spelling (ISO 19115-3:2016).
+ }
identifier = value;
}
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -78,7 +78,7 @@ public final class TM_Duration extends P
* Returns the {@link Duration} generated from the metadata value.
* This method is systematically called at marshalling time by JAXB.
*
- * @return The time period, or {@code null}.
+ * @return the time period, or {@code null}.
*/
@XmlElement(name = "TM_Duration")
public javax.xml.datatype.Duration getElement() {
@@ -96,7 +96,7 @@ public final class TM_Duration extends P
* Sets the value from the {@link Duration}.
* This method is called at unmarshalling time by JAXB.
*
- * @param duration The adapter to set.
+ * @param duration the value to set.
*/
public void setElement(final javax.xml.datatype.Duration duration) {
metadata = TM_PeriodDuration.toISO(duration);
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -89,8 +89,10 @@ public final class CI_Responsibility ext
return new DefaultResponsibility(metadata);
}
return DefaultResponsibility.castOrCopy(metadata);
- } else {
+ } else if (FilterByVersion.LEGACY_METADATA.accept()) {
return DefaultResponsibleParty.castOrCopy(metadata);
+ } else {
+ return null;
}
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -246,6 +246,10 @@ public class DefaultContact extends ISOM
}
}
if (ignored != null) {
+ /*
+ * Log a warning for ignored property using a call to
'ignored.toString()' instead than 'ignored'
+ * because we want the property to appear as
"TelephoneType[FOO]" instead than "FOO".
+ */
Context.warningOccured(Context.current(),
DefaultContact.class, "getPhone",
Messages.class,
Messages.Keys.IgnoredPropertyAssociatedTo_1, ignored.toString());
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -22,14 +22,16 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
import org.opengis.metadata.citation.Role;
import org.opengis.metadata.extent.Extent;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.internal.jaxb.FilterByVersion;
import org.apache.sis.internal.jaxb.code.CI_RoleCode;
+// Branch-specific imports
+import org.opengis.metadata.citation.Party;
+import org.opengis.metadata.citation.Responsibility;
+
/**
* Information about the party and their role.
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -293,9 +293,9 @@ public class DefaultResolution extends I
* @since 0.5
*/
@Override
- @ValueRange(minimum=0, isMinIncluded=false)
@XmlElement(name = "vertical")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
+ @ValueRange(minimum=0, isMinIncluded=false)
public Double getVertical() {
return (property == VERTICAL) ? (Double) value : null;
}
@@ -326,9 +326,9 @@ public class DefaultResolution extends I
* @since 0.5
*/
@Override
- @ValueRange(minimum=0, isMinIncluded=false)
@XmlElement(name = "angularDistance")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
+ @ValueRange(minimum=0, isMinIncluded=false)
public Double getAngularDistance() {
return (property == ANGULAR) ? (Double) value : null;
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -47,9 +47,6 @@ import org.opengis.util.InternationalStr
public final class EPSGFactoryProxy implements CRSAuthorityFactory {
private volatile CRSAuthorityFactory factory;
- public EPSGFactoryProxy() {
- }
-
private CRSAuthorityFactory factory() throws FactoryException {
CRSAuthorityFactory f = factory;
if (f == null) {
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -17,9 +17,11 @@
package org.apache.sis.internal.jaxb.gmd;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.opengis.util.ControlledVocabulary;
import org.apache.sis.util.iso.Types;
+// Branch-dependent imports
+import org.opengis.util.ControlledVocabulary;
+
/**
* An adapter for {@link Enum}, in order to implement the ISO 19115-3 standard.
@@ -32,7 +34,7 @@ import org.apache.sis.util.iso.Types;
* }
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.6
+ * @version 1.0
*
* @param <ValueType> the subclass implementing this adapter.
* @param <BoundType> the enum being adapted.
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -461,7 +461,7 @@ public final class Types extends Static
*/
static String getResources(final String classname) {
String resources = "org.opengis.metadata.Descriptions";
- if (classname.regionMatches(0, resources, 0, 21)) { // 21 is the
location after the last dot.
+ if (classname.regionMatches(0, resources, 0, 21)) { // 21
is the location after the last dot.
return resources;
}
// Add more checks here (maybe in a loop) if there is more resource
candidates.
Modified:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1825356&r1=1825355&r2=1825356&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] Mon Feb 26 11:37:12 2018
@@ -2625,13 +2625,14 @@ parse: for (int i = 0; i < length;)
/**
* Adds a URL to a more complete description of the metadata.
+ * Storage location is:
*
* <ul>
* <li>{@code metadata/metadataLinkage/linkage}
* with {@code function} set to {@link
OnLineFunction#COMPLETE_METADATA}</li>
* </ul>
*
- * @param link
+ * @param link URL to a more complete description of the metadata, or
{@code null}.
*/
public final void addCompleteMetadata(final URI link) {
if (link != null) {
