svn commit: r1394919 - in /sis/branches/JDK7/sis-utility/src: main/java/org/apache/sis/util/resources/ResourceInternationalString.java test/java/org/apache/sis/util/type/TypesTest.java

[desruisseaux]

Author: desruisseaux
Date: Sat Oct  6 04:43:15 2012
New Revision: 1394919

URL: http://svn.apache.org/viewvc?rev=1394919&view=rev
Log:
Trivial change for testing merge.

Modified:
    
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
    
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java

Modified: 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1394919&r1=1394918&r2=1394919&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
 (original)
+++ 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
 Sat Oct  6 04:43:15 2012
@@ -20,10 +20,10 @@ import java.io.Serializable;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import net.jcip.annotations.Immutable;
+import org.apache.sis.util.Utilities;
 import org.apache.sis.util.type.AbstractInternationalString;
 
 // Related to JDK7
-import org.apache.sis.util.Utilities;
 import java.util.Objects;
 
 

Modified: 
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java?rev=1394919&r1=1394918&r2=1394919&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java
 (original)
+++ 
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java
 Sat Oct  6 04:43:15 2012
@@ -20,7 +20,6 @@ import org.opengis.metadata.citation.Cit
 import org.opengis.referencing.datum.Datum;
 import org.opengis.referencing.cs.AxisDirection;
 import org.apache.sis.test.TestCase;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;