youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Correct spelling. 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270819 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
c73be43653
commit
b01362cc82
1 changed files with 39 additions and 39 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +39
    -39
      src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

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

@@ -250,9 +250,9 @@ public class FixCRLF extends MatchingTask {
* @deprecated use {@link #setEol setEol} instead. * @deprecated use {@link #setEol setEol} instead.
*/ */
public void setCr(AddAsisRemove attr) { public void setCr(AddAsisRemove attr) {
log("DEPRECATED: The cr attribute has been deprecated,",
log("DEPRECATED: The cr attribute has been deprecated,",
Project.MSG_WARN); Project.MSG_WARN);
log("Please us the eol attribute instead", Project.MSG_WARN);
log("Please use the eol attribute instead", Project.MSG_WARN);
String option = attr.getValue(); String option = attr.getValue();
CrLf c = new CrLf(); CrLf c = new CrLf();
if (option.equals("remove")) { if (option.equals("remove")) {
@@ -341,7 +341,7 @@ public class FixCRLF extends MatchingTask {
*/ */
public void execute() throws BuildException { public void execute() throws BuildException {
// first off, make sure that we've got a srcdir and destdir // first off, make sure that we've got a srcdir and destdir
if (srcDir == null) { if (srcDir == null) {
throw new BuildException("srcdir attribute must be set!"); throw new BuildException("srcdir attribute must be set!");
} }
@@ -384,7 +384,7 @@ public class FixCRLF extends MatchingTask {
*/ */
private Reader getReader(File f) throws IOException { private Reader getReader(File f) throws IOException {
return (encoding == null) ? new FileReader(f) return (encoding == null) ? new FileReader(f)
: new InputStreamReader(new FileInputStream(f), encoding);
: new InputStreamReader(new FileInputStream(f), encoding);
} }




@@ -403,12 +403,12 @@ public class FixCRLF extends MatchingTask {
try { try {
tmpFile = fileUtils.createTempFile("fixcrlf", "", destD); tmpFile = fileUtils.createTempFile("fixcrlf", "", destD);
Writer writer = (encoding == null) ? new FileWriter(tmpFile) Writer writer = (encoding == null) ? new FileWriter(tmpFile)
: new OutputStreamWriter(new FileOutputStream(tmpFile), encoding);
: new OutputStreamWriter(new FileOutputStream(tmpFile), encoding);
outWriter = new BufferedWriter(writer); outWriter = new BufferedWriter(writer);
} catch (IOException e) { } catch (IOException e) {
throw new BuildException(e); throw new BuildException(e);
} }
while (lines.hasMoreElements()) { while (lines.hasMoreElements()) {
// In-line states // In-line states
int endComment; int endComment;
@@ -418,11 +418,11 @@ public class FixCRLF extends MatchingTask {
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
throw new BuildException(e); throw new BuildException(e);
} }
String lineString = line.getLineString(); String lineString = line.getLineString();
int linelen = line.length(); int linelen = line.length();


// Note - all of the following processing NOT done for
// Note - all of the following processing NOT done for
// tabs ASIS // tabs ASIS


if (tabs == ASIS) { if (tabs == ASIS) {
@@ -439,11 +439,11 @@ public class FixCRLF extends MatchingTask {
while ((ptr = line.getNext()) < linelen) { while ((ptr = line.getNext()) < linelen) {


switch (lines.getState()) { switch (lines.getState()) {
case NOTJAVA: case NOTJAVA:
notInConstant(line, line.length(), outWriter); notInConstant(line, line.length(), outWriter);
break; break;
case IN_MULTI_COMMENT: case IN_MULTI_COMMENT:
if ((endComment = if ((endComment =
lineString.indexOf("*/", line.getNext()) lineString.indexOf("*/", line.getNext())
@@ -456,7 +456,7 @@ public class FixCRLF extends MatchingTask {
else { else {
endComment = linelen; endComment = linelen;
} }
notInConstant(line, endComment, outWriter); notInConstant(line, endComment, outWriter);
break; break;


@@ -472,7 +472,7 @@ public class FixCRLF extends MatchingTask {
// Find the end of the constant. Watch out for // Find the end of the constant. Watch out for
// backslashes. Literal tabs are left unchanged, and // backslashes. Literal tabs are left unchanged, and
// the column is adjusted accordingly. // the column is adjusted accordingly.
int begin = line.getNext(); int begin = line.getNext();
char terminator = (lines.getState() == IN_STR_CONST char terminator = (lines.getState() == IN_STR_CONST
? '\"' ? '\"'
@@ -483,42 +483,42 @@ public class FixCRLF extends MatchingTask {
line.setColumn( line.setColumn(
line.getColumn() + line.getColumn() +
tablength - tablength -
line.getColumn() % tablength);
line.getColumn() % tablength);
} }
else { else {
line.incColumn(); line.incColumn();
} }
} }
// Now output the substring // Now output the substring
try { try {
outWriter.write(line.substring(begin, line.getNext())); outWriter.write(line.substring(begin, line.getNext()));
} catch (IOException e) { } catch (IOException e) {
throw new BuildException(e); throw new BuildException(e);
} }
lines.setState(LOOKING); lines.setState(LOOKING);
break; break;
case LOOKING: case LOOKING:
nextStateChange(line); nextStateChange(line);
notInConstant(line, line.getLookahead(), outWriter); notInConstant(line, line.getLookahead(), outWriter);
break; break;
} // end of switch (state) } // end of switch (state)
} // end of while (line.getNext() < linelen) } // end of while (line.getNext() < linelen)
} // end of else (tabs != ASIS) } // end of else (tabs != ASIS)
try { try {
outWriter.write(eolstr); outWriter.write(eolstr);
} catch (IOException e) { } catch (IOException e) {
throw new BuildException(e); throw new BuildException(e);
} // end of try-catch } // end of try-catch
} // end of while (lines.hasNext()) } // end of while (lines.hasNext())


try { try {
@@ -537,11 +537,11 @@ public class FixCRLF extends MatchingTask {
throw new BuildException(e); throw new BuildException(e);
} }
} }
File destFile = new File(destD, file); File destFile = new File(destD, file);


try {
try {
lines.close(); lines.close();
lines = null; lines = null;
} }
@@ -598,7 +598,7 @@ public class FixCRLF extends MatchingTask {
} catch (IOException io) { } catch (IOException io) {
log("Error closing "+srcFile, Project.MSG_ERR); log("Error closing "+srcFile, Project.MSG_ERR);
} // end of catch } // end of catch
if (tmpFile != null) { if (tmpFile != null) {
tmpFile.delete(); tmpFile.delete();
} }
@@ -624,8 +624,8 @@ public class FixCRLF extends MatchingTask {
{ {
int eol = bufline.length(); int eol = bufline.length();
int ptr = bufline.getNext(); int ptr = bufline.getNext();
// Look for next single or double quote, double slash or slash star // Look for next single or double quote, double slash or slash star
while (ptr < eol) { while (ptr < eol) {
switch (bufline.getChar(ptr++)) { switch (bufline.getChar(ptr++)) {
@@ -652,7 +652,7 @@ public class FixCRLF extends MatchingTask {
} }
break; break;
} // end of switch (bufline.getChar(ptr++)) } // end of switch (bufline.getChar(ptr++))
} // end of while (ptr < eol) } // end of while (ptr < eol)
// Eol is the next token // Eol is the next token
bufline.setLookahead(ptr); bufline.setLookahead(ptr);
@@ -758,7 +758,7 @@ public class FixCRLF extends MatchingTask {
place = nextStop - placediff; place = nextStop - placediff;
nextStop += tablength; nextStop += tablength;
} }
for ( ; nextStop - placediff <= linestring.length() for ( ; nextStop - placediff <= linestring.length()
; nextStop += tablength) ; nextStop += tablength)
{ {
@@ -792,7 +792,7 @@ public class FixCRLF extends MatchingTask {
} catch (IOException e) { } catch (IOException e) {
throw new BuildException(e); throw new BuildException(e);
} // end of try-catch } // end of try-catch
} // end of else tabs == ADD } // end of else tabs == ADD


// Set column position as modified by this method // Set column position as modified by this method
@@ -839,13 +839,13 @@ public class FixCRLF extends MatchingTask {
line.append((char) ch); line.append((char) ch);
ch = reader.read(); ch = reader.read();
} }
if (ch == -1 && line.length() == 0) { if (ch == -1 && line.length() == 0) {
// Eof has been reached // Eof has been reached
reachedEof = true; reachedEof = true;
return; return;
} }
switch ((char) ch) { switch ((char) ch) {
case '\r': case '\r':
// Check for \r, \r\n and \r\r\n // Check for \r, \r\n and \r\r\n
@@ -869,12 +869,12 @@ public class FixCRLF extends MatchingTask {
break; break;
} // end of switch ((char)(ch = reader.read())) } // end of switch ((char)(ch = reader.read()))
break; break;
case '\n': case '\n':
++eolcount; ++eolcount;
eolStr.append('\n'); eolStr.append('\n');
break; break;
} // end of switch ((char) ch) } // end of switch ((char) ch)


// if at eolcount == 0 and trailing characters of string // if at eolcount == 0 and trailing characters of string
@@ -895,9 +895,9 @@ public class FixCRLF extends MatchingTask {
line.setLength(i + 1); line.setLength(i + 1);
} }
} }
} // end of if (eolcount == 0) } // end of if (eolcount == 0)
} catch (IOException e) { } catch (IOException e) {
throw new BuildException(e); throw new BuildException(e);
} }
@@ -944,7 +944,7 @@ public class FixCRLF extends MatchingTask {
private int lookahead = UNDEF; private int lookahead = UNDEF;
private String line; private String line;
private String eolStr; private String eolStr;
public BufferLine(String line, String eolStr) public BufferLine(String line, String eolStr)
throws BuildException throws BuildException
{ {


Write Preview
Loading…
Cancel
Save