You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2011/02/20 21:42:51 UTC
svn commit: r1072718 - in /maven/shared/trunk/maven-filtering/src:
main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Author: bentmann
Date: Sun Feb 20 20:42:50 2011
New Revision: 1072718
URL: http://svn.apache.org/viewvc?rev=1072718&view=rev
Log:
o Restored Java 1.4 compatibility
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1072718&r1=1072717&r2=1072718&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java Sun Feb 20 20:42:50 2011
@@ -87,7 +87,7 @@ public class MultiDelimiterInterpolatorF
private boolean supportMultiLineFiltering;
- private Character preserveChar = null;
+ private int preserveChar = -1;
/**
* This constructor uses default begin token ${ and default end token }.
@@ -221,10 +221,10 @@ public class MultiDelimiterInterpolatorF
}
return ch;
}
- if ( preserveChar != null )
+ if ( preserveChar >= 0 )
{
- char copy = Character.valueOf( preserveChar.charValue() ).charValue();
- preserveChar = null;
+ int copy = preserveChar;
+ preserveChar = -1;
replaceIndex = -1;
return copy;
}
@@ -278,7 +278,7 @@ public class MultiDelimiterInterpolatorF
// so we preserve it
replaceData = key.toString();
replaceIndex = 1;
- preserveChar = Character.valueOf( (char) ch );
+ preserveChar = ch;
return replaceData.charAt( 0 );
}
else
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java?rev=1072718&r1=1072717&r2=1072718&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java Sun Feb 20 20:42:50 2011
@@ -98,8 +98,8 @@ public class EscapeStringTest
String content = IOUtil.toString( new FileInputStream( new File( outputDirectory, "content.xml" ) ) );
System.out.println( "content " + content );
- assertTrue( content.contains( "<broken-tag>Content with replacement: I am the replacement !</broken-tag>" ) );
- assertTrue( content.contains( "<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>") );
+ assertTrue( content.indexOf( "<broken-tag>Content with replacement: I am the replacement !</broken-tag>" ) >= 0 );
+ assertTrue( content.indexOf( "<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>" ) >= 0 );
}
finally
{