You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/03/26 23:16:20 UTC
svn commit: r856056 [24/26] - in
/websites/production/commons/content/proper/commons-csv: ./ apidocs/
apidocs/org/apache/commons/csv/ apidocs/org/apache/commons/csv/class-use/
apidocs/src-html/org/apache/commons/csv/ cobertura/ testapidocs/
testapidocs...
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVLexer.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVLexer.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVLexer.html Tue Mar 26 22:16:19 2013
@@ -43,7 +43,7 @@
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/csv/CSVLexer.html">CSVLexer</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/csv/Lexer.html">Lexer</a> {
<a class="jxr_linenumber" name="34" href="#34">34</a>
<a class="jxr_linenumber" name="35" href="#35">35</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> INTERNAL API. ctor needs to be public so can be called dynamically by PerformanceTest class */</em>
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVLexer.html">CSVLexer</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> in) {
+<a class="jxr_linenumber" name="36" href="#36">36</a> <a href="../../../../org/apache/commons/csv/CSVLexer.html">CSVLexer</a>(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> in) {
<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">super</strong>(format, in);
<a class="jxr_linenumber" name="38" href="#38">38</a> }
<a class="jxr_linenumber" name="39" href="#39">39</a>
@@ -122,7 +122,7 @@
<a class="jxr_linenumber" name="112" href="#112">112</a> token.type = EORECORD;
<a class="jxr_linenumber" name="113" href="#113">113</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isQuoteChar(c)) {
<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// consume encapsulated token</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> encapsulatedTokenLexer(token);
+<a class="jxr_linenumber" name="115" href="#115">115</a> parseEncapsulatedToken(token);
<a class="jxr_linenumber" name="116" href="#116">116</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isEndOfFile(c)) {
<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment">// end of file return EOF()</em>
<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_comment">// noop: tkn.content.append("");</em>
@@ -131,14 +131,14 @@
<a class="jxr_linenumber" name="121" href="#121">121</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// next token must be a simple token</em>
<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// add removed blanks when not ignoring whitespace chars...</em>
-<a class="jxr_linenumber" name="124" href="#124">124</a> simpleTokenLexer(token, c);
+<a class="jxr_linenumber" name="124" href="#124">124</a> parseSimpleToken(token, c);
<a class="jxr_linenumber" name="125" href="#125">125</a> }
<a class="jxr_linenumber" name="126" href="#126">126</a> }
<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">return</strong> token;
<a class="jxr_linenumber" name="128" href="#128">128</a> }
<a class="jxr_linenumber" name="129" href="#129">129</a>
<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment"> * A simple token lexer</em>
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment"> * Parses a simple token.</em>
<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment"> * <p/></em>
<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment"> * Simple token are tokens which are not surrounded by encapsulators. A simple token might contain escaped</em>
<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_javadoccomment"> * delimiters (as \, or \;). The token is finished when one of the following conditions become true:</em>
@@ -156,7 +156,7 @@
<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_javadoccomment"> * on stream access error</em>
<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> simpleTokenLexer(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> tkn, <strong class="jxr_keyword">int</strong> c) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> parseSimpleToken(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> tkn, <strong class="jxr_keyword">int</strong> c) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_comment">// Faster to use while(true)+break than while(tkn.type == INVALID)</em>
<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">if</strong> (readEndOfLine(c)) {
@@ -186,7 +186,7 @@
<a class="jxr_linenumber" name="176" href="#176">176</a> }
<a class="jxr_linenumber" name="177" href="#177">177</a>
<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment"> * An encapsulated token lexer</em>
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment"> * Parses an encapsulated token.</em>
<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_javadoccomment"> * <p/></em>
<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_javadoccomment"> * Encapsulated tokens are surrounded by the given encapsulating-string. The encapsulator itself might be included</em>
<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment"> * in the token using a doubling syntax (as "", '') or using escaping (as in \", \'). Whitespaces before and after</em>
@@ -205,7 +205,7 @@
<a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_javadoccomment"> * on invalid state: EOF before closing encapsulator or invalid character before delimiter or EOL</em>
<a class="jxr_linenumber" name="197" href="#197">197</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> encapsulatedTokenLexer(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> tkn) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> parseEncapsulatedToken(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> tkn) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// save current line number in case needed for IOE</em>
<a class="jxr_linenumber" name="200" href="#200">200</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> startLineNumber = getLineNumber();
<a class="jxr_linenumber" name="201" href="#201">201</a> <strong class="jxr_keyword">int</strong> c;
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVParser.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVParser.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVParser.html Tue Mar 26 22:16:19 2013
@@ -46,267 +46,285 @@
<a class="jxr_linenumber" name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * specification of a {@link CSVFormat}.</em>
<a class="jxr_linenumber" name="37" href="#37">37</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * Parsing of a csv-string having tabs as separators, '"' as an optional value encapsulator, and comments starting with</em>
-<a class="jxr_linenumber" name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * '#':</em>
+<a class="jxr_linenumber" name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * To parse a CSV input with tabs as separators, '"' (double-quote) as an optional value encapsulator, </em>
+<a class="jxr_linenumber" name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * and comments starting with '#', you write:</em>
<a class="jxr_linenumber" name="41" href="#41">41</a> <em class="jxr_javadoccomment"> * </p></em>
<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_javadoccomment"> * <pre></em>
-<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_javadoccomment"> * CSVFormat format = new CSVFormat('\t', '&quot;', '#');</em>
-<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * Reader in = new StringReader(&quot;a\tb\nc\td&quot;);</em>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * List&lt;CSVRecord&gt; records = new CSVParser(in, format).getRecords();</em>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * </pre></em>
-<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * Parsing of a csv-string in Excel CSV format, using a for-each loop:</em>
-<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_javadoccomment"> * <pre></em>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * Reader in = new StringReader("a;b\nc;d");</em>
-<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * CSVParser parser = new CSVParser(in, CSVFormat.EXCEL);</em>
-<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * for (CSVRecord record : parser) {</em>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_javadoccomment"> * ...</em>
-<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * }</em>
-<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_javadoccomment"> * </pre></em>
-<a class="jxr_linenumber" name="60" href="#60">60</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_javadoccomment"> * Internal parser state is completely covered by the format and the reader-state.</em>
-<a class="jxr_linenumber" name="63" href="#63">63</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_javadoccomment"> * Reader in = new StringReader(&quot;a\tb\nc\td&quot;);</em>
+<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * Iterable&lt;CSVRecord&gt; parser = CSVFormat.newBuilder()</em>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * .withCommentStart('#')</em>
+<a class="jxr_linenumber" name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * .withDelimiter('\t')</em>
+<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * .withQuoteChar('"').parse(in);</em>
+<a class="jxr_linenumber" name="49" href="#49">49</a> <em class="jxr_javadoccomment"> * for (CSVRecord csvRecord : parse) {</em>
+<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_javadoccomment"> * ...</em>
+<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_javadoccomment"> * }</em>
+<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_javadoccomment"> * </pre></em>
+<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_javadoccomment"> * To parse CSV input in a given format like Excel, you write:</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * </p></em>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * <pre></em>
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_javadoccomment"> * Reader in = new StringReader("a;b\nc;d");</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> <em class="jxr_javadoccomment"> * Iterable&lt;CSVRecord&gt; parser = CSVFormat.EXCEL.parse(in);</em>
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_javadoccomment"> * for (CSVRecord record : parser) {</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_javadoccomment"> * ...</em>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <em class="jxr_javadoccomment"> * }</em>
+<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_javadoccomment"> * </pre></em>
<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <em class="jxr_javadoccomment"> * see <a href="package-summary.html">package documentation</a> for more details</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> <em class="jxr_javadoccomment"> * You may also get a List of records:</em>
<a class="jxr_linenumber" name="67" href="#67">67</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * @version $Id: CSVParser.java 1459447 2013-03-21 18:47:40Z ggregory $</em>
-<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a> <strong class="jxr_keyword">implements</strong> Iterable<CSVRecord> {
-<a class="jxr_linenumber" name="72" href="#72">72</a>
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Lexer.html">Lexer</a> lexer;
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map<String, Integer> headerMap;
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> recordNumber;
-<a class="jxr_linenumber" name="76" href="#76">76</a>
-<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_comment">// the following objects are shared to reduce garbage</em>
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> A record buffer for getRecord(). Grows as necessary and is reused. */</em>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<String> record = <strong class="jxr_keyword">new</strong> ArrayList<String>();
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> reusableToken = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a>();
-<a class="jxr_linenumber" name="82" href="#82">82</a>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="84" href="#84">84</a> <em class="jxr_javadoccomment"> * CSV parser using the default {@link CSVFormat}.</em>
-<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_javadoccomment"> * @param input</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_javadoccomment"> * a Reader containing "csv-formatted" input</em>
-<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> Reader input) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">this</strong>(input, CSVFormat.DEFAULT);
-<a class="jxr_linenumber" name="93" href="#93">93</a> }
+<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_javadoccomment"> * <pre></em>
+<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_javadoccomment"> * Reader in = new StringReader("a;b\nc;d");</em>
+<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_javadoccomment"> * CSVParser parser = new CSVParser(in, CSVFormat.EXCEL);</em>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_javadoccomment"> * List&lt;CSVRecord&gt; list = parser.getRecords();</em>
+<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_javadoccomment"> * </pre></em>
+<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * Internal parser state is completely covered by the format and the reader-state.</em>
+<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * </p></em>
+<a class="jxr_linenumber" name="76" href="#76">76</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * see <a href="package-summary.html">package documentation</a> for more details</em>
+<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_javadoccomment"> * </p></em>
+<a class="jxr_linenumber" name="80" href="#80">80</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_javadoccomment"> * @version $Id: CSVParser.java 1461307 2013-03-26 20:52:28Z ggregory $</em>
+<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a> <strong class="jxr_keyword">implements</strong> Iterable<CSVRecord> {
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Lexer.html">Lexer</a> lexer;
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map<String, Integer> headerMap;
+<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> recordNumber;
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// the following objects are shared to reduce garbage</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a>
+<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> A record buffer for getRecord(). Grows as necessary and is reused. */</em>
+<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<String> record = <strong class="jxr_keyword">new</strong> ArrayList<String>();
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> reusableToken = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a>();
<a class="jxr_linenumber" name="94" href="#94">94</a>
<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * Customized CSV parser using the given {@link CSVFormat}</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * CSV parser using the default {@link CSVFormat}.</em>
<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * @param input</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * a Reader containing CSV-formatted input</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment"> * @param format</em>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment"> * the CSVFormat used for CSV parsing</em>
-<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
-<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * a Reader containing "csv-formatted" input</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> Reader input, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">this</strong>.lexer = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/CSVLexer.html">CSVLexer</a>(format, <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a>(input));
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">this</strong>.headerMap = initializeHeader(format);
-<a class="jxr_linenumber" name="108" href="#108">108</a> }
-<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_javadoccomment"> * Customized CSV parser using the given {@link CSVFormat}</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_javadoccomment"> * @param input</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_javadoccomment"> * a String containing "csv-formatted" input</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment"> * @param format</em>
-<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_javadoccomment"> * the CSVFormat used for CSV parsing</em>
-<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
-<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
-<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> String input, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">new</strong> StringReader(input), format);
-<a class="jxr_linenumber" name="122" href="#122">122</a> }
-<a class="jxr_linenumber" name="123" href="#123">123</a>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_javadoccomment"> * Returns a copy of the header map that iterates in column order.</em>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment"> * The map keys are column names.</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_javadoccomment"> * The map values are 0-based indices.</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_javadoccomment"> * @return a copy of the header map that iterates in column order.</em>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">public</strong> Map<String, Integer> getHeaderMap() {
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> LinkedHashMap<String, Integer>(headerMap);
-<a class="jxr_linenumber" name="134" href="#134">134</a> }
-<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_javadoccomment"> * Returns the current line number in the input stream.</em>
-<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_javadoccomment"> * <p/></em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_javadoccomment"> * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the record number.</em>
-<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment"> * @return current line number</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getLineNumber() {
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">return</strong> lexer.getLineNumber();
-<a class="jxr_linenumber" name="145" href="#145">145</a> }
-<a class="jxr_linenumber" name="146" href="#146">146</a>
-<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * Returns the current record number in the input stream.</em>
-<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_javadoccomment"> * <p/></em>
-<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_javadoccomment"> * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the line number.</em>
-<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="152" href="#152">152</a> <em class="jxr_javadoccomment"> * @return current line number</em>
-<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getRecordNumber() {
-<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">return</strong> recordNumber;
-<a class="jxr_linenumber" name="156" href="#156">156</a> }
-<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_javadoccomment"> * Parses the next record from the current point in the stream.</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_javadoccomment"> * @return the record as an array of values, or <tt>null</tt> if the end of the stream has been reached</em>
-<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_javadoccomment"> * on parse error or input read-failure</em>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> nextRecord() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="166" href="#166">166</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> result = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="167" href="#167">167</a> record.clear();
-<a class="jxr_linenumber" name="168" href="#168">168</a> StringBuilder sb = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">do</strong> {
-<a class="jxr_linenumber" name="170" href="#170">170</a> reusableToken.reset();
-<a class="jxr_linenumber" name="171" href="#171">171</a> lexer.nextToken(reusableToken);
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">switch</strong> (reusableToken.type) {
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">case</strong> TOKEN:
-<a class="jxr_linenumber" name="174" href="#174">174</a> record.add(reusableToken.content.toString());
-<a class="jxr_linenumber" name="175" href="#175">175</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">case</strong> EORECORD:
-<a class="jxr_linenumber" name="177" href="#177">177</a> record.add(reusableToken.content.toString());
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">case</strong> EOF:
-<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">if</strong> (reusableToken.isReady) {
-<a class="jxr_linenumber" name="181" href="#181">181</a> record.add(reusableToken.content.toString());
-<a class="jxr_linenumber" name="182" href="#182">182</a> }
-<a class="jxr_linenumber" name="183" href="#183">183</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">case</strong> INVALID:
-<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"(line "</span> + getLineNumber() + <span class="jxr_string">") invalid parse sequence"</span>);
-<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">case</strong> COMMENT: <em class="jxr_comment">// Ignored currently</em>
-<a class="jxr_linenumber" name="187" href="#187">187</a> <strong class="jxr_keyword">if</strong> (sb == <strong class="jxr_keyword">null</strong>) { <em class="jxr_comment">// first comment for this record</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> sb = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="189" href="#189">189</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="190" href="#190">190</a> sb.append(<span class="jxr_string">"\n"</span>);
-<a class="jxr_linenumber" name="191" href="#191">191</a> }
-<a class="jxr_linenumber" name="192" href="#192">192</a> sb.append(reusableToken.content);
-<a class="jxr_linenumber" name="193" href="#193">193</a> reusableToken.type = TOKEN; <em class="jxr_comment">// Read another token</em>
-<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="195" href="#195">195</a> }
-<a class="jxr_linenumber" name="196" href="#196">196</a> } <strong class="jxr_keyword">while</strong> (reusableToken.type == TOKEN);
-<a class="jxr_linenumber" name="197" href="#197">197</a>
-<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">if</strong> (!record.isEmpty()) {
-<a class="jxr_linenumber" name="199" href="#199">199</a> recordNumber++;
-<a class="jxr_linenumber" name="200" href="#200">200</a> <strong class="jxr_keyword">final</strong> String comment = sb == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : sb.toString();
-<a class="jxr_linenumber" name="201" href="#201">201</a> result = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a>(record.toArray(<strong class="jxr_keyword">new</strong> String[record.size()]), headerMap, comment, <strong class="jxr_keyword">this</strong>.recordNumber);
-<a class="jxr_linenumber" name="202" href="#202">202</a> }
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="204" href="#204">204</a> }
-<a class="jxr_linenumber" name="205" href="#205">205</a>
-<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="207" href="#207">207</a> <em class="jxr_javadoccomment"> * Parses the CSV input according to the given format and returns the content as an array of {@link CSVRecord}</em>
-<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_javadoccomment"> * entries.</em>
-<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_javadoccomment"> * <p/></em>
-<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_javadoccomment"> * The returned content starts at the current parse-position in the stream.</em>
-<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_javadoccomment"> * @return list of {@link CSVRecord} entries, may be empty</em>
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_javadoccomment"> * on parse error or input read-failure</em>
-<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">public</strong> List<CSVRecord> getRecords() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">final</strong> List<CSVRecord> records = <strong class="jxr_keyword">new</strong> ArrayList<CSVRecord>();
-<a class="jxr_linenumber" name="218" href="#218">218</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> rec;
-<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">while</strong> ((rec = nextRecord()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="220" href="#220">220</a> records.add(rec);
-<a class="jxr_linenumber" name="221" href="#221">221</a> }
-<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> records;
-<a class="jxr_linenumber" name="223" href="#223">223</a> }
-<a class="jxr_linenumber" name="224" href="#224">224</a>
-<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_javadoccomment"> * Initializes the name to index mapping if the format defines a header.</em>
-<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">private</strong> Map<String, Integer> initializeHeader(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="229" href="#229">229</a> Map<String, Integer> hdrMap = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="230" href="#230">230</a> <strong class="jxr_keyword">if</strong> (format.getHeader() != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="231" href="#231">231</a> hdrMap = <strong class="jxr_keyword">new</strong> LinkedHashMap<String, Integer>();
-<a class="jxr_linenumber" name="232" href="#232">232</a>
-<a class="jxr_linenumber" name="233" href="#233">233</a> String[] header = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="234" href="#234">234</a> <strong class="jxr_keyword">if</strong> (format.getHeader().length == 0) {
-<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment">// read the header from the first line of the file</em>
-<a class="jxr_linenumber" name="236" href="#236">236</a> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> rec = nextRecord();
-<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">if</strong> (rec != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="238" href="#238">238</a> header = rec.values();
-<a class="jxr_linenumber" name="239" href="#239">239</a> }
-<a class="jxr_linenumber" name="240" href="#240">240</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="241" href="#241">241</a> header = format.getHeader();
-<a class="jxr_linenumber" name="242" href="#242">242</a> }
-<a class="jxr_linenumber" name="243" href="#243">243</a>
-<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment">// build the name to index mappings</em>
-<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">if</strong> (header != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < header.length; i++) {
-<a class="jxr_linenumber" name="247" href="#247">247</a> hdrMap.put(header[i], Integer.valueOf(i));
-<a class="jxr_linenumber" name="248" href="#248">248</a> }
-<a class="jxr_linenumber" name="249" href="#249">249</a> }
-<a class="jxr_linenumber" name="250" href="#250">250</a> }
-<a class="jxr_linenumber" name="251" href="#251">251</a> <strong class="jxr_keyword">return</strong> hdrMap;
-<a class="jxr_linenumber" name="252" href="#252">252</a> }
-<a class="jxr_linenumber" name="253" href="#253">253</a>
-<a class="jxr_linenumber" name="254" href="#254">254</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_javadoccomment"> * Returns an iterator on the records. IOExceptions occurring during the iteration are wrapped in a</em>
-<a class="jxr_linenumber" name="256" href="#256">256</a> <em class="jxr_javadoccomment"> * RuntimeException.</em>
-<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">public</strong> Iterator<CSVRecord> iterator() {
-<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Iterator<CSVRecord>() {
-<a class="jxr_linenumber" name="260" href="#260">260</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> current;
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> Reader input) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">this</strong>(input, CSVFormat.DEFAULT);
+<a class="jxr_linenumber" name="107" href="#107">107</a> }
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_javadoccomment"> * Customized CSV parser using the given {@link CSVFormat}</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_javadoccomment"> * @param input</em>
+<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_javadoccomment"> * a Reader containing CSV-formatted input</em>
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_javadoccomment"> * @param format</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment"> * the CSVFormat used for CSV parsing</em>
+<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
+<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
+<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
+<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> Reader input, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">this</strong>.lexer = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/CSVLexer.html">CSVLexer</a>(format, <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a>(input));
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">this</strong>.headerMap = initializeHeader(format);
+<a class="jxr_linenumber" name="124" href="#124">124</a> }
+<a class="jxr_linenumber" name="125" href="#125">125</a>
+<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment"> * Customized CSV parser using the given {@link CSVFormat}</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_javadoccomment"> * @param input</em>
+<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_javadoccomment"> * a String containing "csv-formatted" input</em>
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment"> * @param format</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment"> * the CSVFormat used for CSV parsing</em>
+<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment"> * @throws IllegalArgumentException</em>
+<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_javadoccomment"> * thrown if the parameters of the format are inconsistent</em>
+<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
+<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVParser.html">CSVParser</a>(<strong class="jxr_keyword">final</strong> String input, <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">new</strong> StringReader(input), format);
+<a class="jxr_linenumber" name="140" href="#140">140</a> }
+<a class="jxr_linenumber" name="141" href="#141">141</a>
+<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * Returns a copy of the header map that iterates in column order.</em>
+<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_javadoccomment"> * The map keys are column names.</em>
+<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_javadoccomment"> * The map values are 0-based indices.</em>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * @return a copy of the header map that iterates in column order.</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> <strong class="jxr_keyword">public</strong> Map<String, Integer> getHeaderMap() {
+<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> LinkedHashMap<String, Integer>(headerMap);
+<a class="jxr_linenumber" name="152" href="#152">152</a> }
+<a class="jxr_linenumber" name="153" href="#153">153</a>
+<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_javadoccomment"> * Returns the current line number in the input stream.</em>
+<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_javadoccomment"> * <p/></em>
+<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_javadoccomment"> * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the record number.</em>
+<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_javadoccomment"> * @return current line number</em>
+<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getLineNumber() {
+<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">return</strong> lexer.getLineNumber();
+<a class="jxr_linenumber" name="163" href="#163">163</a> }
+<a class="jxr_linenumber" name="164" href="#164">164</a>
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_javadoccomment"> * Returns the current record number in the input stream.</em>
+<a class="jxr_linenumber" name="167" href="#167">167</a> <em class="jxr_javadoccomment"> * <p/></em>
+<a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_javadoccomment"> * ATTENTION: If your CSV input has multi-line values, the returned number does not correspond to the line number.</em>
+<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_javadoccomment"> * @return current line number</em>
+<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getRecordNumber() {
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">return</strong> recordNumber;
+<a class="jxr_linenumber" name="174" href="#174">174</a> }
+<a class="jxr_linenumber" name="175" href="#175">175</a>
+<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_javadoccomment"> * Parses the next record from the current point in the stream.</em>
+<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment"> * @return the record as an array of values, or <tt>null</tt> if the end of the stream has been reached</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_javadoccomment"> * on parse error or input read-failure</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> nextRecord() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="184" href="#184">184</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> result = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="185" href="#185">185</a> record.clear();
+<a class="jxr_linenumber" name="186" href="#186">186</a> StringBuilder sb = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="187" href="#187">187</a> <strong class="jxr_keyword">do</strong> {
+<a class="jxr_linenumber" name="188" href="#188">188</a> reusableToken.reset();
+<a class="jxr_linenumber" name="189" href="#189">189</a> lexer.nextToken(reusableToken);
+<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">switch</strong> (reusableToken.type) {
+<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">case</strong> TOKEN:
+<a class="jxr_linenumber" name="192" href="#192">192</a> record.add(reusableToken.content.toString());
+<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">case</strong> EORECORD:
+<a class="jxr_linenumber" name="195" href="#195">195</a> record.add(reusableToken.content.toString());
+<a class="jxr_linenumber" name="196" href="#196">196</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">case</strong> EOF:
+<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">if</strong> (reusableToken.isReady) {
+<a class="jxr_linenumber" name="199" href="#199">199</a> record.add(reusableToken.content.toString());
+<a class="jxr_linenumber" name="200" href="#200">200</a> }
+<a class="jxr_linenumber" name="201" href="#201">201</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="202" href="#202">202</a> <strong class="jxr_keyword">case</strong> INVALID:
+<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"(line "</span> + getLineNumber() + <span class="jxr_string">") invalid parse sequence"</span>);
+<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">case</strong> COMMENT: <em class="jxr_comment">// Ignored currently</em>
+<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">if</strong> (sb == <strong class="jxr_keyword">null</strong>) { <em class="jxr_comment">// first comment for this record</em>
+<a class="jxr_linenumber" name="206" href="#206">206</a> sb = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="207" href="#207">207</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="208" href="#208">208</a> sb.append(<span class="jxr_string">"\n"</span>);
+<a class="jxr_linenumber" name="209" href="#209">209</a> }
+<a class="jxr_linenumber" name="210" href="#210">210</a> sb.append(reusableToken.content);
+<a class="jxr_linenumber" name="211" href="#211">211</a> reusableToken.type = TOKEN; <em class="jxr_comment">// Read another token</em>
+<a class="jxr_linenumber" name="212" href="#212">212</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="213" href="#213">213</a> }
+<a class="jxr_linenumber" name="214" href="#214">214</a> } <strong class="jxr_keyword">while</strong> (reusableToken.type == TOKEN);
+<a class="jxr_linenumber" name="215" href="#215">215</a>
+<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">if</strong> (!record.isEmpty()) {
+<a class="jxr_linenumber" name="217" href="#217">217</a> recordNumber++;
+<a class="jxr_linenumber" name="218" href="#218">218</a> <strong class="jxr_keyword">final</strong> String comment = sb == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : sb.toString();
+<a class="jxr_linenumber" name="219" href="#219">219</a> result = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a>(record.toArray(<strong class="jxr_keyword">new</strong> String[record.size()]), headerMap, comment, <strong class="jxr_keyword">this</strong>.recordNumber);
+<a class="jxr_linenumber" name="220" href="#220">220</a> }
+<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="222" href="#222">222</a> }
+<a class="jxr_linenumber" name="223" href="#223">223</a>
+<a class="jxr_linenumber" name="224" href="#224">224</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_javadoccomment"> * Parses the CSV input according to the given format and returns the content as an array of {@link CSVRecord}</em>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_javadoccomment"> * entries.</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> <em class="jxr_javadoccomment"> * <p/></em>
+<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_javadoccomment"> * The returned content starts at the current parse-position in the stream.</em>
+<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_javadoccomment"> * @return list of {@link CSVRecord} entries, may be empty</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_javadoccomment"> * on parse error or input read-failure</em>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a> <strong class="jxr_keyword">public</strong> List<CSVRecord> getRecords() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="235" href="#235">235</a> <strong class="jxr_keyword">final</strong> List<CSVRecord> records = <strong class="jxr_keyword">new</strong> ArrayList<CSVRecord>();
+<a class="jxr_linenumber" name="236" href="#236">236</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> rec;
+<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">while</strong> ((rec = nextRecord()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="238" href="#238">238</a> records.add(rec);
+<a class="jxr_linenumber" name="239" href="#239">239</a> }
+<a class="jxr_linenumber" name="240" href="#240">240</a> <strong class="jxr_keyword">return</strong> records;
+<a class="jxr_linenumber" name="241" href="#241">241</a> }
+<a class="jxr_linenumber" name="242" href="#242">242</a>
+<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_javadoccomment"> * Initializes the name to index mapping if the format defines a header.</em>
+<a class="jxr_linenumber" name="245" href="#245">245</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">private</strong> Map<String, Integer> initializeHeader(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVFormat.html">CSVFormat</a> format) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="247" href="#247">247</a> Map<String, Integer> hdrMap = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">if</strong> (format.getHeader() != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="249" href="#249">249</a> hdrMap = <strong class="jxr_keyword">new</strong> LinkedHashMap<String, Integer>();
+<a class="jxr_linenumber" name="250" href="#250">250</a>
+<a class="jxr_linenumber" name="251" href="#251">251</a> String[] header = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="252" href="#252">252</a> <strong class="jxr_keyword">if</strong> (format.getHeader().length == 0) {
+<a class="jxr_linenumber" name="253" href="#253">253</a> <em class="jxr_comment">// read the header from the first line of the file</em>
+<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> record = nextRecord();
+<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">if</strong> (record != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="256" href="#256">256</a> header = record.values();
+<a class="jxr_linenumber" name="257" href="#257">257</a> }
+<a class="jxr_linenumber" name="258" href="#258">258</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="259" href="#259">259</a> header = format.getHeader();
+<a class="jxr_linenumber" name="260" href="#260">260</a> }
<a class="jxr_linenumber" name="261" href="#261">261</a>
-<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> getNextRecord() {
-<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">return</strong> nextRecord();
-<a class="jxr_linenumber" name="265" href="#265">265</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
-<a class="jxr_linenumber" name="266" href="#266">266</a> <em class="jxr_comment">// TODO: This is not great, throw an ISE instead?</em>
-<a class="jxr_linenumber" name="267" href="#267">267</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
-<a class="jxr_linenumber" name="268" href="#268">268</a> }
-<a class="jxr_linenumber" name="269" href="#269">269</a> }
-<a class="jxr_linenumber" name="270" href="#270">270</a>
-<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
-<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">if</strong> (current == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="273" href="#273">273</a> current = getNextRecord();
-<a class="jxr_linenumber" name="274" href="#274">274</a> }
-<a class="jxr_linenumber" name="275" href="#275">275</a>
-<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">return</strong> current != <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="277" href="#277">277</a> }
-<a class="jxr_linenumber" name="278" href="#278">278</a>
-<a class="jxr_linenumber" name="279" href="#279">279</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> next() {
-<a class="jxr_linenumber" name="280" href="#280">280</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> next = current;
-<a class="jxr_linenumber" name="281" href="#281">281</a> current = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="282" href="#282">282</a>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">// hasNext() wasn't called before</em>
-<a class="jxr_linenumber" name="285" href="#285">285</a> next = getNextRecord();
-<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="287" href="#287">287</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NoSuchElementException(<span class="jxr_string">"No more CSV records available"</span>);
-<a class="jxr_linenumber" name="288" href="#288">288</a> }
-<a class="jxr_linenumber" name="289" href="#289">289</a> }
-<a class="jxr_linenumber" name="290" href="#290">290</a>
-<a class="jxr_linenumber" name="291" href="#291">291</a> <strong class="jxr_keyword">return</strong> next;
-<a class="jxr_linenumber" name="292" href="#292">292</a> }
+<a class="jxr_linenumber" name="262" href="#262">262</a> <em class="jxr_comment">// build the name to index mappings</em>
+<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">if</strong> (header != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < header.length; i++) {
+<a class="jxr_linenumber" name="265" href="#265">265</a> hdrMap.put(header[i], Integer.valueOf(i));
+<a class="jxr_linenumber" name="266" href="#266">266</a> }
+<a class="jxr_linenumber" name="267" href="#267">267</a> }
+<a class="jxr_linenumber" name="268" href="#268">268</a> }
+<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">return</strong> hdrMap;
+<a class="jxr_linenumber" name="270" href="#270">270</a> }
+<a class="jxr_linenumber" name="271" href="#271">271</a>
+<a class="jxr_linenumber" name="272" href="#272">272</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="273" href="#273">273</a> <em class="jxr_javadoccomment"> * Returns an iterator on the records. IOExceptions occurring during the iteration are wrapped in a</em>
+<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_javadoccomment"> * RuntimeException.</em>
+<a class="jxr_linenumber" name="275" href="#275">275</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">public</strong> Iterator<CSVRecord> iterator() {
+<a class="jxr_linenumber" name="277" href="#277">277</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Iterator<CSVRecord>() {
+<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> current;
+<a class="jxr_linenumber" name="279" href="#279">279</a>
+<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> getNextRecord() {
+<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">return</strong> nextRecord();
+<a class="jxr_linenumber" name="283" href="#283">283</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> IOException e) {
+<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">// TODO: This is not great, throw an ISE instead?</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="286" href="#286">286</a> }
+<a class="jxr_linenumber" name="287" href="#287">287</a> }
+<a class="jxr_linenumber" name="288" href="#288">288</a>
+<a class="jxr_linenumber" name="289" href="#289">289</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasNext() {
+<a class="jxr_linenumber" name="290" href="#290">290</a> <strong class="jxr_keyword">if</strong> (current == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="291" href="#291">291</a> current = getNextRecord();
+<a class="jxr_linenumber" name="292" href="#292">292</a> }
<a class="jxr_linenumber" name="293" href="#293">293</a>
-<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() {
-<a class="jxr_linenumber" name="295" href="#295">295</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException();
-<a class="jxr_linenumber" name="296" href="#296">296</a> }
-<a class="jxr_linenumber" name="297" href="#297">297</a> };
-<a class="jxr_linenumber" name="298" href="#298">298</a> }
-<a class="jxr_linenumber" name="299" href="#299">299</a> }
+<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">return</strong> current != <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="295" href="#295">295</a> }
+<a class="jxr_linenumber" name="296" href="#296">296</a>
+<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> next() {
+<a class="jxr_linenumber" name="298" href="#298">298</a> <a href="../../../../org/apache/commons/csv/CSVRecord.html">CSVRecord</a> next = current;
+<a class="jxr_linenumber" name="299" href="#299">299</a> current = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="300" href="#300">300</a>
+<a class="jxr_linenumber" name="301" href="#301">301</a> <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="302" href="#302">302</a> <em class="jxr_comment">// hasNext() wasn't called before</em>
+<a class="jxr_linenumber" name="303" href="#303">303</a> next = getNextRecord();
+<a class="jxr_linenumber" name="304" href="#304">304</a> <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="305" href="#305">305</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NoSuchElementException(<span class="jxr_string">"No more CSV records available"</span>);
+<a class="jxr_linenumber" name="306" href="#306">306</a> }
+<a class="jxr_linenumber" name="307" href="#307">307</a> }
+<a class="jxr_linenumber" name="308" href="#308">308</a>
+<a class="jxr_linenumber" name="309" href="#309">309</a> <strong class="jxr_keyword">return</strong> next;
+<a class="jxr_linenumber" name="310" href="#310">310</a> }
+<a class="jxr_linenumber" name="311" href="#311">311</a>
+<a class="jxr_linenumber" name="312" href="#312">312</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> remove() {
+<a class="jxr_linenumber" name="313" href="#313">313</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> UnsupportedOperationException();
+<a class="jxr_linenumber" name="314" href="#314">314</a> }
+<a class="jxr_linenumber" name="315" href="#315">315</a> };
+<a class="jxr_linenumber" name="316" href="#316">316</a> }
+<a class="jxr_linenumber" name="317" href="#317">317</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>