sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1398732 - in /sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb: IdentifierMapAdapter.java IdentifierMapWithSpecialCases.java NonMarshalledAuthority.java
Date Tue, 16 Oct 2012 11:08:47 GMT
Author: desruisseaux
Date: Tue Oct 16 11:08:46 2012
New Revision: 1398732

URL: http://svn.apache.org/viewvc?rev=1398732&view=rev
Log:
Isolate JDK7-specific imports.

Modified:
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?rev=1398732&r1=1398731&r2=1398732&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
Tue Oct 16 11:08:46 2012
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.AbstractSet;
 import java.util.AbstractMap;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.io.Serializable;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
@@ -32,6 +31,9 @@ import org.apache.sis.util.ArgumentCheck
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.IdentifierMap;
 
+// Related to JDK7
+import java.util.Objects;
+
 import static org.apache.sis.util.collection.Collections.hashMapCapacity;
 
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java?rev=1398732&r1=1398731&r2=1398732&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
Tue Oct 16 11:08:46 2012
@@ -19,14 +19,14 @@ package org.apache.sis.internal.jaxb;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
-import java.util.Objects;
-
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
-
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.XLink;
 
+// Related to JDK7
+import java.util.Objects;
+
 
 /**
  * A map of identifiers which handles some identifiers in a special way.

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1398732&r1=1398731&r2=1398732&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
Tue Oct 16 11:08:46 2012
@@ -22,9 +22,7 @@ import java.util.Collection;
 import java.io.Serializable;
 import java.io.ObjectStreamException;
 import java.lang.reflect.Field;
-
 import org.opengis.metadata.Identifier;
-
 import org.apache.sis.internal.simple.SimpleCitation;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.xml.IdentifierSpace;



Mime
View raw message