commit | b073ebacad99c1d4403970b64c93107e7649c737 | [log] [tgz] |
---|---|---|
author | Karl Heinz Marbaise <khmarbaise@apache.org> | Sat Nov 07 11:45:44 2015 +0000 |
committer | Karl Heinz Marbaise <khmarbaise@apache.org> | Sat Nov 07 11:45:44 2015 +0000 |
tree | ccc3f03076e694e4779ff187c2c1193eefa9d571 | |
parent | 736488633dd95314b1dc8b09b712c5f804ab3af5 [diff] |
Cleaned up code. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1713110 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java index 4e919a8..efa43c5 100644 --- a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java +++ b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
@@ -201,12 +201,12 @@ in.mark( markLength ); int ch = in.read(); - if ( ( ch == -1 ) || ( ch == '\n' && !supportMultiLineFiltering ) ) + if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) ) { return ch; } - boolean inEscape = ( useEscape && ch == getEscapeString().charAt( 0 ) ); + boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 ); StringBuilder key = new StringBuilder();
diff --git a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java index bd55f58..9cabefc 100644 --- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java +++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -230,12 +230,12 @@ BoundedReader in = new BoundedReader( this.in, markLength ); int ch = in.read(); - if ( ( ch == -1 ) || ( ch == '\n' && !supportMultiLineFiltering ) ) + if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) ) { return ch; } - boolean inEscape = ( useEscape && ch == getEscapeString().charAt( 0 ) ); + boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 ); StringBuilder key = new StringBuilder();