Author: desruisseaux
Date: Mon Mar 18 00:07:16 2013
New Revision: 1457605
URL: http://svn.apache.org/r1457605
Log:
SVN merge info.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1452397-1457601
Merged /sis/branches/JDK6:r1452399-1457602
Modified:
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java?rev=1457605&r1=1457604&r2=1457605&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
[UTF-8] Mon Mar 18 00:07:16 2013
@@ -25,7 +25,6 @@ import java.net.URL;
import java.net.URISyntaxException;
import java.net.MalformedURLException;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import org.opengis.util.InternationalString;
import org.opengis.metadata.spatial.PixelOrientation;
import org.apache.sis.measure.Angle;
@@ -42,6 +41,7 @@ import static org.apache.sis.test.Assert
// Related to JDK7
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.charset.StandardCharsets;
/**
