sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1492294 - in /sis/branches/JDK7: ./ application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
Date Wed, 12 Jun 2013 17:16:45 GMT
Author: desruisseaux
Date: Wed Jun 12 17:16:44 2013
New Revision: 1492294

URL: http://svn.apache.org/r1492294
Log:
SVN merge info together with post-merge adjustments.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
  Merged /sis/trunk:r1491515-1492284
  Merged /sis/branches/JDK6:r1491519-1492286

Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java?rev=1492294&r1=1492293&r2=1492294&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/SubCommandTest.java
[UTF-8] Wed Jun 12 17:16:44 2013
@@ -20,7 +20,6 @@ import java.util.EnumSet;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
-import java.nio.charset.StandardCharsets;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -28,6 +27,9 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.apache.sis.test.TestUtilities.getSingleton;
 
+// Related to JDK7
+import java.nio.charset.StandardCharsets;
+
 
 /**
  * Tests the {@link SubCommand} base class.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java?rev=1492294&r1=1492293&r2=1492294&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
[UTF-8] Wed Jun 12 17:16:44 2013
@@ -24,7 +24,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.TreeMap;
 import java.util.SortedMap;
 import java.util.Comparator;
@@ -36,6 +35,9 @@ import org.apache.sis.io.IO;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.io.LineAppender;
 
+// Related to JDK7
+import java.util.Objects;
+
 
 /**
  * A formatter writing log messages on a single line. Compared to {@link SimpleFormatter},
this



Mime
View raw message