bodewig     01/12/11 05:54:35

  Modified:    .        build.xml
               src/main/org/apache/tools/ant/taskdefs FixCRLF.java
  Log:
  JDK 1.1 issues.
  
  I'm sure the depend classes can be converted to not use JDK 1.2
  collection classes.
  
  Revision  Changes    Path
  1.213     +4 -0      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- build.xml 2001/12/02 00:44:27     1.212
  +++ build.xml 2001/12/11 13:54:35     1.213
  @@ -301,6 +301,10 @@
                  unless="bcel.present" />
         <exclude name="${util.package}/depend/*.java"
                  unless="bcel.present" />
  +      <exclude name="${optional.type.package}/depend/*.java"
  +               unless="jdk1.2+" />
  +      <exclude name="${util.package}/depend/*.java"
  +               unless="jdk1.2+" />
       </javac>
   
       <copy todir="${build.classes}">
  
  
  
  1.25      +2 -2      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- FixCRLF.java      2001/11/19 13:58:52     1.24
  +++ FixCRLF.java      2001/12/11 13:54:35     1.25
  @@ -115,7 +115,7 @@
    *
    * @author Sam Ruby <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  - * @version $Revision: 1.24 $ $Name:  $
  + * @version $Revision: 1.25 $ $Name:  $
    */
   
   public class FixCRLF extends MatchingTask {
  @@ -884,7 +884,7 @@
                       if (i < line.length() - 1) {
                           // Trailing characters are ^Zs
                           // Construct new line and eofStr
  -                        eofStr.append(line.substring(i + 1));
  +                        eofStr.append(line.toString().substring(i + 1));
                           if (i < 0) {
                               line.setLength(0);
                               reachedEof = true;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to