jon 01/06/21 17:29:57
Modified: src/java/org/apache/turbine/util DataStreamParser.java
Log:
compile out debugging... Kurt Grafius <[EMAIL PROTECTED]>
cleaned up some code formatting
Revision Changes Path
1.7 +16 -3
jakarta-turbine/src/java/org/apache/turbine/util/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/DataStreamParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataStreamParser.java 2001/06/12 21:40:39 1.6
+++ DataStreamParser.java 2001/06/22 00:29:56 1.7
@@ -87,7 +87,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: DataStreamParser.java,v 1.6 2001/06/12 21:40:39 jon Exp $
+ * @version $Id: DataStreamParser.java,v 1.7 2001/06/22 00:29:56 jon Exp $
*/
public abstract class DataStreamParser implements Iterator
{
@@ -111,6 +111,10 @@
* The character encoding of the input
*/
private String characterEncoding;
+ /**
+ * Debugging
+ */
+ private static final boolean DEBUG = false;
/**
* Create a new DataStreamParser instance. Requires a Reader to read the
@@ -213,12 +217,18 @@
throws IOException, NoSuchElementException
{
if (!hasNextRow())
+ {
throw new NoSuchElementException();
-
+ }
+
if (lineValues == null)
+ {
lineValues = new BaseValueParser(characterEncoding);
+ }
else
+ {
lineValues.clear();
+ }
Iterator it = columnNames.iterator();
tokenizer.nextToken();
@@ -231,7 +241,10 @@
{
String colname = it.next().toString();
String colval = tokenizer.sval;
- Log.debug(colname + "=" + colval);
+ if (DEBUG)
+ {
+ Log.debug(colname + "=" + colval);
+ }
lineValues.add(colname, colval);
}
tokenizer.nextToken();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
