Author: desruisseaux
Date: Mon Feb 26 11:48:41 2018
New Revision: 1825358
URL: http://svn.apache.org/viewvc?rev=1825358&view=rev
Log:
Merge minor cleanup from JDK8 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 26 11:48:41 2018
@@ -2,5 +2,5 @@
/sis/branches/ISO-19115-3:1804459-1825252
/sis/branches/JDK6:1394364-1758914
/sis/branches/JDK7:1394913-1822221
-/sis/branches/JDK8:1584960-1825261
+/sis/branches/JDK8:1584960-1825357
/sis/branches/JDK9:1773327-1803064
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java?rev=1825358&r1=1825357&r2=1825358&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
[UTF-8] Mon Feb 26 11:48:41 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1825358&r1=1825357&r2=1825358&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
[UTF-8] Mon Feb 26 11:48:41 2018
@@ -297,10 +297,10 @@ public class DefaultResolution extends I
*
* @since 0.5
*/
- @ValueRange(minimum=0, isMinIncluded=false)
@XmlElement(name = "vertical")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="vertical", obligation=CONDITIONAL,
specification=ISO_19115)
+ @ValueRange(minimum=0, isMinIncluded=false)
public Double getVertical() {
return (property == VERTICAL) ? (Double) value : null;
}
@@ -330,10 +330,10 @@ public class DefaultResolution extends I
*
* @since 0.5
*/
- @ValueRange(minimum=0, isMinIncluded=false)
@XmlElement(name = "angularDistance")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="angularDistance", obligation=CONDITIONAL,
specification=ISO_19115)
+ @ValueRange(minimum=0, isMinIncluded=false)
public Double getAngularDistance() {
return (property == ANGULAR) ? (Double) value : null;
}
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java?rev=1825358&r1=1825357&r2=1825358&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
[UTF-8] Mon Feb 26 11:48:41 2018
@@ -46,9 +46,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/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1825358&r1=1825357&r2=1825358&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
[UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
[UTF-8] Mon Feb 26 11:48:41 2018
@@ -460,7 +460,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/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL:
http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1825358&r1=1825357&r2=1825358&view=diff
==============================================================================
---
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] (original)
+++
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
[UTF-8] Mon Feb 26 11:48:41 2018
@@ -2637,13 +2637,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 {@code
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) {
