You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/09/02 15:14:29 UTC
svn commit: r1519427 - in /sis/branches/JDK7/core:
sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/
sis-referencing/src/main/java/org/apache/sis/referencing/
sis-referencing/src/test/java/org/apache/sis/referencing/
Author: desruisseaux
Date: Mon Sep 2 13:14:29 2013
New Revision: 1519427
URL: http://svn.apache.org/r1519427
Log:
Minor formatting and link fixes.
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1519427&r1=1519426&r2=1519427&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] Mon Sep 2 13:14:29 2013
@@ -56,6 +56,7 @@ import org.apache.sis.internal.metadata.
* @module
*
* @see Extents#getGeographicBoundingBox(Extent)
+ * @see org.apache.sis.referencing.AbstractReferenceSystem#getDomainOfValidity()
*/
@XmlType(name = "EX_Extent_Type", propOrder = {
"description",
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java?rev=1519427&r1=1519426&r2=1519427&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java [UTF-8] Mon Sep 2 13:14:29 2013
@@ -17,7 +17,6 @@
package org.apache.sis.referencing;
import java.util.Map;
-import java.util.Objects;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.util.InternationalString;
import org.opengis.referencing.ReferenceSystem;
@@ -29,6 +28,9 @@ import org.apache.sis.util.iso.Types;
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
+// Related to JDK7
+import java.util.Objects;
+
/**
* Description of a spatial and temporal reference system used by a dataset.
@@ -59,12 +61,16 @@ public class AbstractReferenceSystem ext
/**
* Area for which the (coordinate) reference system is valid.
+ *
+ * @see #getDomainOfValidity()
*/
private final Extent domainOfValidity;
/**
* Description of domain of usage, or limitations of usage,
* for which this (coordinate) reference system object is valid.
+ *
+ * @see #getScope()
*/
@XmlElement(required = true)
private final InternationalString scope;
@@ -121,6 +127,8 @@ public class AbstractReferenceSystem ext
* or {@code null} if unspecified.
*
* @return Area or region or timeframe in which this (coordinate) reference system is valid, or {@code null}.
+ *
+ * @see org.apache.sis.metadata.iso.extent.DefaultExtent
*/
@Override
public Extent getDomainOfValidity() {
Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java?rev=1519427&r1=1519426&r2=1519427&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java [UTF-8] Mon Sep 2 13:14:29 2013
@@ -45,12 +45,9 @@ public final strictfp class AbstractIden
@Test
public void testCreateFromMap() {
final Map<String,Object> properties = new HashMap<>(10);
- assertNull(properties.put("name", "This is a name"));
- assertNull(properties.put("remarks", "There is remarks"));
- assertNull(properties.put("remarks_fr", "Voici des remarques"));
- assertNull(properties.put("anchorPoint", "Anchor point"));
- assertNull(properties.put("realizationEpoch", "Realization epoch"));
- assertNull(properties.put("validArea", "Valid area"));
+ assertNull(properties.put("name", "This is a name"));
+ assertNull(properties.put("remarks", "There is remarks"));
+ assertNull(properties.put("remarks_fr", "Voici des remarques"));
final AbstractIdentifiedObject object = new AbstractIdentifiedObject(properties);
Validators.validate(object);