Author: krosenvold
Date: Sun Apr 12 16:23:36 2015
New Revision: 1673026
URL: http://svn.apache.org/r1673026
Log:
Fixed formatting
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java?rev=1673026&r1=1673025&r2=1673026&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
Sun Apr 12 16:23:36 2015
@@ -30,6 +30,7 @@ class LinuxLineFeedInputStream
{
private boolean slashNSeen = false;
+
private boolean slashRSeen = false;
private boolean eofSeen = false;
@@ -65,28 +66,29 @@ class LinuxLineFeedInputStream
boolean prevWasSlashR = slashRSeen;
if ( eofSeen )
{
- return eofGame(prevWasSlashR);
+ return eofGame( prevWasSlashR );
}
else
{
int target = readWithUpdate();
if ( eofSeen )
{
- return eofGame(prevWasSlashR);
+ return eofGame( prevWasSlashR );
}
- if (slashRSeen)
+ if ( slashRSeen )
{
return '\n';
}
- if ( prevWasSlashR && slashNSeen){ // Lone /r
+ if ( prevWasSlashR && slashNSeen )
+ { // Lone /r
return read();
}
return target;
}
}
- private int eofGame(boolean previousWasSlashR)
+ private int eofGame( boolean previousWasSlashR )
{
if ( previousWasSlashR || !ensureLineFeedAtEndOfFile )
{
