You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/09/17 08:48:58 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/parser DataStreamParser.java
epugh 2003/09/16 23:48:58
Modified: src/java/org/apache/turbine/util/parser
DataStreamParser.java
Log:
Clean up references to static property.
Revision Changes Path
1.2 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DataStreamParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataStreamParser.java 11 Apr 2003 13:15:11 -0000 1.1
+++ DataStreamParser.java 17 Sep 2003 06:48:58 -0000 1.2
@@ -231,10 +231,10 @@
neverRead = false;
tokenizer.nextToken();
- while (tokenizer.ttype == tokenizer.TT_WORD || tokenizer.ttype == tokenizer.TT_EOL
+ while (tokenizer.ttype == StreamTokenizer.TT_WORD || tokenizer.ttype == StreamTokenizer.TT_EOL
|| tokenizer.ttype == '"' || tokenizer.ttype == fieldSeparator)
{
- if (tokenizer.ttype != fieldSeparator && tokenizer.ttype != tokenizer.TT_EOL)
+ if (tokenizer.ttype != fieldSeparator && tokenizer.ttype != StreamTokenizer.TT_EOL)
{
columnNames.add(tokenizer.sval);
fieldCounter++;
@@ -245,12 +245,12 @@
columnNames.add(EMPTYFIELDNAME + fieldCounter);
fieldCounter++;
}
- else if (lastTtype == fieldSeparator && tokenizer.ttype == tokenizer.TT_EOL)
+ else if (lastTtype == fieldSeparator && tokenizer.ttype == StreamTokenizer.TT_EOL)
{
columnNames.add(EMPTYFIELDNAME + fieldCounter);
break;
}
- else if (tokenizer.ttype == tokenizer.TT_EOL)
+ else if (tokenizer.ttype == StreamTokenizer.TT_EOL)
{
break;
}
@@ -332,7 +332,7 @@
{
lineValues.add(colname, tokenizer.sval);
}
- else if (tokenizer.ttype == tokenizer.TT_EOL)
+ else if (tokenizer.ttype == StreamTokenizer.TT_EOL)
{
tokenizer.pushBack();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org