You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/07 12:45:44 UTC

svn commit: r1713110 - in /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering: InterpolatorFilterReaderLineEnding.java MultiDelimiterInterpolatorFilterReaderLineEnding.java

Author: khmarbaise
Date: Sat Nov  7 11:45:44 2015
New Revision: 1713110

URL: http://svn.apache.org/viewvc?rev=1713110&view=rev
Log:
Cleaned up code.

Modified:
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java

Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java?rev=1713110&r1=1713109&r2=1713110&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java Sat Nov  7 11:45:44 2015
@@ -201,12 +201,12 @@ public class InterpolatorFilterReaderLin
         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();
 

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=1713110&r1=1713109&r2=1713110&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 Sat Nov  7 11:45:44 2015
@@ -230,12 +230,12 @@ public class MultiDelimiterInterpolatorF
         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();