sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1394920 - in /sis/branches/JDK6: ./ sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java
Date Sat, 06 Oct 2012 04:45:02 GMT
Author: desruisseaux
Date: Sat Oct  6 04:45:01 2012
New Revision: 1394920

URL: http://svn.apache.org/viewvc?rev=1394920&view=rev
Log:
Merge from the JDK7 branch.

Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
    sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1394917-1394919

Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1394920&r1=1394919&r2=1394920&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
(original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
Sat Oct  6 04:45:01 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 org.apache.sis.internal.util.Objects;
 
 

Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java?rev=1394920&r1=1394919&r2=1394920&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/type/TypesTest.java Sat
Oct  6 04:45:01 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.*;



Mime
View raw message