Author: desruisseaux
Date: Fri Jun 14 13:26:26 2013
New Revision: 1493059
URL: http://svn.apache.org/r1493059
Log:
SVN merge info, together with post-merge correction.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1492285-1493038
Merged /sis/branches/JDK6:r1492287-1493057
Modified:
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java?rev=1493059&r1=1493058&r2=1493059&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
[UTF-8] Fri Jun 14 13:26:26 2013
@@ -58,9 +58,9 @@ public final strictfp class MonolineForm
* The given string shall use tabulation before each line of the message.
*/
private static String localize(final Level level, final String expected) {
- final String name = level.getName();
- return expected.replace(name, level.getLocalizedName())
- .replace("\t",
CharSequences.spaces(MonolineFormatter.levelWidth(null) - name.length()));
+ final String label = level.getLocalizedName();
+ return expected.replace(level.getName(), label)
+ .replace("\t",
CharSequences.spaces(MonolineFormatter.levelWidth(null) - label.length()));
}
/**
