Browse Source

Remove empty default constructor;

create the filterchain Vector only once per Object.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277788 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 20 years ago
parent
commit
542b708954
1 changed files with 7 additions and 14 deletions
  1. +7
    -14
      src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

+ 7
- 14
src/main/org/apache/tools/ant/taskdefs/FixCRLF.java View File

@@ -92,21 +92,13 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
private File destDir = null; private File destDir = null;
private File file; private File file;
private FixCrLfFilter filter = new FixCrLfFilter(); private FixCrLfFilter filter = new FixCrLfFilter();
private Vector fcv = null;


/** /**
* Encoding to assume for the files * Encoding to assume for the files
*/ */
private String encoding = null; private String encoding = null;


/**
* Defaults the properties based on the system type.
* <ul><li>Unix: eol="LF" tab="asis" eof="remove"
* <li>Mac: eol="CR" tab="asis" eof="remove"
* <li>DOS: eol="CRLF" tab="asis" eof="asis"</ul>
*/
public FixCRLF () {
}

/** /**
* Chain this task as a reader. * Chain this task as a reader.
* @param rdr Reader to chain. * @param rdr Reader to chain.
@@ -317,11 +309,12 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
long lastModified = srcFile.lastModified(); long lastModified = srcFile.lastModified();
File destD = destDir == null ? srcDir : destDir; File destD = destDir == null ? srcDir : destDir;


FilterChain fc = new FilterChain();
fc.add(filter);
Vector fcv = new Vector(1);
fcv.add(fc);

if (fcv == null) {
FilterChain fc = new FilterChain();
fc.add(filter);
fcv = new Vector(1);
fcv.add(fc);
}
File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null); File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null);
tmpFile.deleteOnExit(); tmpFile.deleteOnExit();
try { try {


Loading…
Cancel
Save