ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/filters FixCrLfFilter.java
Date Fri, 04 Mar 2005 16:45:38 GMT
mbenson     2005/03/04 08:45:38

  Modified:    src/main/org/apache/tools/ant/filters FixCrLfFilter.java
  Log:
  Various terseness like I tend to do;
  More importantly, fixed Gump failure on Unix (see end of change list).
  Dyslexia strikes!
  
  Revision  Changes    Path
  1.2       +9 -25     ant/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
  
  Index: FixCrLfFilter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FixCrLfFilter.java	3 Mar 2005 21:46:47 -0000	1.1
  +++ FixCrLfFilter.java	4 Mar 2005 16:45:37 -0000	1.2
  @@ -406,18 +406,12 @@
            * Does this filter want to block edits on the last character returned by read()?
            */
           public boolean editsBlocked() {
  -            if (in instanceof SimpleFilterReader) {
  -                return ((SimpleFilterReader) in).editsBlocked();
  -            }
  -            return false;
  +            return in instanceof SimpleFilterReader
  +                && ((SimpleFilterReader) in).editsBlocked();
           }
   
           public int read() throws java.io.IOException {
  -            if (preemptIndex > 0) {
  -                return preempt[--preemptIndex];
  -            }
  -
  -            return in.read();
  +            return preemptIndex > 0 ? preempt[--preemptIndex] : in.read();
           }
   
           public void close() throws java.io.IOException {
  @@ -457,10 +451,7 @@
                   count++;
               }
               // if at EOF with no characters in the buffer, return EOF
  -            if (count == 0 && c == -1) {
  -                return -1;
  -            }
  -            return count;
  +            return (count == 0 && c == -1) ? -1 : count;
           }
       }
   
  @@ -610,7 +601,6 @@
               } else {
                   normalizedEOL--;
               }
  -
               return thisChar;
           }
       }
  @@ -637,7 +627,6 @@
                       push(eol, 1, eol.length - 1);
                   }
               }
  -            
               lastChar = thisChar;
               return thisChar;
           }
  @@ -654,14 +643,10 @@
               int thisChar = super.read();
   
               // if source is EOF but last character was NOT ctrl-z, return ctrl-z
  -            if (thisChar == -1) {
  -                if (lastChar != CTRLZ) {
  -                    lastChar = CTRLZ;
  -                    thisChar = CTRLZ;
  -                }
  -            } else {
  -                lastChar = thisChar;
  +            if (thisChar == -1 && lastChar != CTRLZ) {
  +                thisChar = CTRLZ;
               }
  +            lastChar = thisChar;
               return thisChar;
           }
       }
  @@ -790,7 +775,6 @@
                       for (;width > 1; width--) {
                           push(' ');
                       }
  -
                       c = ' ';
                   }
                   columnNumber += width;
  @@ -873,13 +857,13 @@
               if (this.equals(ASIS)) {
                   return ASIS;
               }
  -            if (this.equals(CR) || this.equals(UNIX)) {
  +            if (this.equals(CR) || this.equals(MAC)) {
                   return CR;
               }
               if (this.equals(CRLF) || this.equals(DOS)) {
                   return CRLF;
               }
  -            if (this.equals(LF) || this.equals(MAC)) {
  +            if (this.equals(LF) || this.equals(UNIX)) {
                   return LF;
               }
               throw new IllegalStateException("No replacement for " + this);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message