Author: desruisseaux
Date: Wed Apr 3 16:20:12 2013
New Revision: 1464090
URL: http://svn.apache.org/r1464090
Log:
Post branch merge.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1457837-1464086
Merged /sis/branches/JDK6:r1457839-1464087
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java?rev=1464090&r1=1464089&r2=1464090&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
[UTF-8] Wed Apr 3 16:20:12 2013
@@ -19,7 +19,6 @@ package org.apache.sis.internal.jaxb.met
import java.util.Set;
import java.util.Collection;
import java.util.Collections;
-import java.util.Objects;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@ -32,6 +31,9 @@ import org.opengis.referencing.Reference
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.util.iso.DefaultNameSpace;
+// Related to JDK7
+import java.util.Objects;
+
/**
* An implementation of {@link ReferenceSystem} marshalled as specified in ISO
19115.
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1464090&r1=1464089&r2=1464090&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
[UTF-8] Wed Apr 3 16:20:12 2013
@@ -120,6 +120,8 @@ public class DefaultTemporalExtent exten
* If no extent has been {@linkplain #setExtent(TemporalPrimitive)
explicitely set},
* then this method will build an extent from the {@linkplain
#getStartTime() start
* time} and {@linkplain #getEndTime() end time} if any.
+ *
+ * @return The content date.
*/
@Override
@XmlElement(name = "extent", required = true)
@@ -130,7 +132,7 @@ public class DefaultTemporalExtent exten
/**
* Sets the date and time for the content of the dataset.
*
- * @param newValue The new extent.
+ * @param newValue The new content date.
*/
public synchronized void setExtent(final TemporalPrimitive newValue) {
checkWritePermission();
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java?rev=1464090&r1=1464089&r2=1464090&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java
[UTF-8] Wed Apr 3 16:20:12 2013
@@ -19,20 +19,17 @@ package org.apache.sis.referencing;
import java.util.Map;
import java.util.Locale;
import java.util.Collection;
-import java.util.Objects;
import java.util.logging.Level;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import net.jcip.annotations.Immutable;
-
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.parameter.InvalidParameterValueException;
import org.opengis.referencing.ReferenceIdentifier;
import org.opengis.util.InternationalString;
-
import org.apache.sis.xml.Namespaces;
import org.apache.sis.util.Deprecable;
import org.apache.sis.util.CharSequences;
@@ -49,6 +46,9 @@ import static org.apache.sis.util.Argume
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import static org.opengis.referencing.IdentifiedObject.REMARKS_KEY;
+// Related to JDK7
+import java.util.Objects;
+
/**
* An identification of a {@link
org.opengis.referencing.crs.CoordinateReferenceSystem} object.
