Author: desruisseaux
Date: Fri Nov 30 17:49:39 2012
New Revision: 1415764
URL: http://svn.apache.org/viewvc?rev=1415764&view=rev
Log:
SVN merge info, together with a fix in import order done during the merge.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1413305-1415759
Merged /sis/branches/JDK6:r1413306-1415761
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java?rev=1415764&r1=1415763&r2=1415764&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
Fri Nov 30 17:49:39 2012
@@ -20,14 +20,11 @@ import java.util.Map;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Objects;
import java.lang.reflect.Proxy;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-
import org.opengis.metadata.Identifier;
-
import org.apache.sis.util.Classes;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.ComparisonMode;
@@ -35,6 +32,9 @@ import org.apache.sis.util.LenientCompar
import org.apache.sis.util.resources.Errors;
import org.apache.sis.internal.jaxb.IdentifierMapAdapter;
+// Related to JDK7
+import java.util.Objects;
+
/**
* The handler for an object where all methods returns null or empty
collections, except
