You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2014/05/04 19:25:34 UTC
svn commit: r908013 [22/22] - 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/ testapidocs/
testapidocs/org/apache...
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVRecord.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVRecord.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/CSVRecord.html Sun May 4 17:25:32 2014
@@ -180,56 +180,59 @@
<a class="jxr_linenumber" name="L172" href="#L172">172</a>
<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment"> * Puts all values of this record into the given Map.</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment"> * </em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment"> * @param map The Map to populate.</em>
<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> * @return the given map.</em>
<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L179" href="#L179">179</a> <M <strong class="jxr_keyword">extends</strong> Map<String, String>> M putIn(<strong class="jxr_keyword">final</strong> M map) {
<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Entry<String, Integer> entry : mapping.entrySet()) {
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> map.put(entry.getKey(), values[entry.getValue().intValue()]);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> }
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">return</strong> map;
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> }
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment"> * Returns the number of values in this record.</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment"> * @return the number of values.</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">return</strong> values.length;
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> }
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment"> * Converts the values to a List.</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment"> * TODO: Maybe make this public?</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> * @return a new List</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">private</strong> List<String> toList() {
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">return</strong> Arrays.asList(values);
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> }
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment"> * Copies this record into a new Map. The new map is not connect</em>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment"> * @return A new Map. The map is empty if the record has no headers.</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">public</strong> Map<String, String> toMap() {
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">return</strong> putIn(<strong class="jxr_keyword">new</strong> HashMap<String, String>(values.length));
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> }
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> @Override
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">return</strong> Arrays.toString(values);
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> }
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> String[] values() {
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> <strong class="jxr_keyword">return</strong> values;
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> }
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> }
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> col = entry.getValue().intValue();
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">if</strong> (col < values.length) {
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> map.put(entry.getKey(), values[col]);
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> }
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> }
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">return</strong> map;
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> }
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment"> * Returns the number of values in this record.</em>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment"> * @return the number of values.</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size() {
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">return</strong> values.length;
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> }
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> * Converts the values to a List.</em>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> <em class="jxr_javadoccomment"> * TODO: Maybe make this public?</em>
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <em class="jxr_javadoccomment"> * @return a new List</em>
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">private</strong> List<String> toList() {
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">return</strong> Arrays.asList(values);
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> }
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_javadoccomment"> * Copies this record into a new Map. The new map is not connect</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_javadoccomment"> * @return A new Map. The map is empty if the record has no headers.</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">public</strong> Map<String, String> toMap() {
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">return</strong> putIn(<strong class="jxr_keyword">new</strong> HashMap<String, String>(values.length));
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> }
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> @Override
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> <strong class="jxr_keyword">return</strong> Arrays.toString(values);
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> String[] values() {
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">return</strong> values;
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> }
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Constants.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Constants.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Constants.html Sun May 4 17:25:32 2014
@@ -47,33 +47,40 @@
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> LF = '\n';
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> SP = ' ';
<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> TAB = '\t';
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String EMPTY = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment">/** The end of stream symbol */</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> END_OF_STREAM = -1;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment">/** Undefined state for the lookahead char */</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> UNDEFINED = -2;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment">/** According to RFC 4180, line breaks are delimited by CRLF */</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CRLF = <span class="jxr_string">"\r\n"</span>;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * Unicode line separator.</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String LINE_SEPARATOR = <span class="jxr_string">"\u2028"</span>;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> * Unicode paragraph separator.</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String PARAGRAPH_SEPARATOR = <span class="jxr_string">"\u2029"</span>;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment"> * Unicode next line.</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String NEXT_LINE = <span class="jxr_string">"\u0085"</span>;
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> }
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment">/** ASCII record separator */</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> RS = 30;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment">/** ASCII unit separator */</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> US = 31;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String EMPTY = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment">/** The end of stream symbol */</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> END_OF_STREAM = -1;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment">/** Undefined state for the lookahead char */</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> UNDEFINED = -2;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em class="jxr_javadoccomment">/** According to RFC 4180, line breaks are delimited by CRLF */</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CRLF = <span class="jxr_string">"\r\n"</span>;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * Unicode line separator.</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String LINE_SEPARATOR = <span class="jxr_string">"\u2028"</span>;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment"> * Unicode paragraph separator.</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String PARAGRAPH_SEPARATOR = <span class="jxr_string">"\u2029"</span>;
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * Unicode next line.</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String NEXT_LINE = <span class="jxr_string">"\u0085"</span>;
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Lexer.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Lexer.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/Lexer.html Sun May 4 17:25:32 2014
@@ -63,11 +63,11 @@
<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> ignoreEmptyLines;
<a class="jxr_linenumber" name="L56" href="#L56">56</a>
<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em class="jxr_javadoccomment">/** The input stream */</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> in;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> reader;
<a class="jxr_linenumber" name="L59" href="#L59">59</a>
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment">/** INTERNAL API. but ctor needs to be called dynamically by PerformanceTest class */</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <a href="../../../../org/apache/commons/csv/Lexer.html">Lexer</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="L62" href="#L62">62</a> <strong class="jxr_keyword">this</strong>.in = in;
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <a href="../../../../org/apache/commons/csv/Lexer.html">Lexer</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> reader) {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">this</strong>.reader = reader;
<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">this</strong>.delimiter = format.getDelimiter();
<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">this</strong>.escape = mapNullToDisabled(format.getEscape());
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">this</strong>.quoteChar = mapNullToDisabled(format.getQuoteChar());
@@ -90,10 +90,10 @@
<a class="jxr_linenumber" name="L82" href="#L82">82</a> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> nextToken(<strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/csv/Token.html">Token</a> token) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="L83" href="#L83">83</a>
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em class="jxr_comment">// get the last read char (required for empty line detection)</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">int</strong> lastChar = in.getLastChar();
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">int</strong> lastChar = reader.getLastChar();
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<a class="jxr_linenumber" name="L87" href="#L87">87</a> <em class="jxr_comment">// read the next char and set eol</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">int</strong> c = in.read();
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">int</strong> c = reader.read();
<a class="jxr_linenumber" name="L89" href="#L89">89</a> <em class="jxr_comment">/*</em>
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <em class="jxr_comment"> * Note: The following call will swallow LF if c == CR. But we don't need to know if the last char was CR or LF</em>
<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_comment"> * - they are equivalent here.</em>
@@ -105,7 +105,7 @@
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">while</strong> (eol && isStartOfLine(lastChar)) {
<a class="jxr_linenumber" name="L98" href="#L98">98</a> <em class="jxr_comment">// go on char ahead ...</em>
<a class="jxr_linenumber" name="L99" href="#L99">99</a> lastChar = c;
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> c = in.read();
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> c = reader.read();
<a class="jxr_linenumber" name="L101" href="#L101">101</a> eol = readEndOfLine(c);
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// reached end of file without any content (empty line at the end)</em>
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">if</strong> (isEndOfFile(c)) {
@@ -124,7 +124,7 @@
<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
<a class="jxr_linenumber" name="L117" href="#L117">117</a>
<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">if</strong> (isStartOfLine(lastChar) && isCommentStart(c)) {
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">final</strong> String line = in.readLine();
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">final</strong> String line = reader.readLine();
<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">if</strong> (line == <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="L121" href="#L121">121</a> token.type = EOF;
<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_comment">// don't set token.isReady here because no content</em>
@@ -141,7 +141,7 @@
<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_comment">// ignore whitespaces at beginning of a token</em>
<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">if</strong> (ignoreSurroundingSpaces) {
<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">while</strong> (isWhitespace(c) && !eol) {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> c = in.read();
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> c = reader.read();
<a class="jxr_linenumber" name="L137" href="#L137">137</a> eol = readEndOfLine(c);
<a class="jxr_linenumber" name="L138" href="#L138">138</a> }
<a class="jxr_linenumber" name="L139" href="#L139">139</a> }
@@ -206,14 +206,14 @@
<a class="jxr_linenumber" name="L198" href="#L198">198</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isEscape(ch)) {
<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> unescaped = readEscape();
<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">if</strong> (unescaped == Constants.END_OF_STREAM) { <em class="jxr_comment">// unexpected char after escape</em>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> token.content.append((<strong class="jxr_keyword">char</strong>) ch).append((<strong class="jxr_keyword">char</strong>) in.getLastChar());
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> token.content.append((<strong class="jxr_keyword">char</strong>) ch).append((<strong class="jxr_keyword">char</strong>) reader.getLastChar());
<a class="jxr_linenumber" name="L202" href="#L202">202</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="L203" href="#L203">203</a> token.content.append((<strong class="jxr_keyword">char</strong>) unescaped);
<a class="jxr_linenumber" name="L204" href="#L204">204</a> }
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> ch = in.read(); <em class="jxr_comment">// continue</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> ch = reader.read(); <em class="jxr_comment">// continue</em>
<a class="jxr_linenumber" name="L206" href="#L206">206</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="L207" href="#L207">207</a> token.content.append((<strong class="jxr_keyword">char</strong>) ch);
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> ch = in.read(); <em class="jxr_comment">// continue</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> ch = reader.read(); <em class="jxr_comment">// continue</em>
<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
<a class="jxr_linenumber" name="L210" href="#L210">210</a> }
<a class="jxr_linenumber" name="L211" href="#L211">211</a>
@@ -249,24 +249,24 @@
<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> startLineNumber = getCurrentLineNumber();
<a class="jxr_linenumber" name="L242" href="#L242">242</a> <strong class="jxr_keyword">int</strong> c;
<a class="jxr_linenumber" name="L243" href="#L243">243</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> c = in.read();
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> c = reader.read();
<a class="jxr_linenumber" name="L245" href="#L245">245</a>
<a class="jxr_linenumber" name="L246" href="#L246">246</a> <strong class="jxr_keyword">if</strong> (isEscape(c)) {
<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> unescaped = readEscape();
<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">if</strong> (unescaped == Constants.END_OF_STREAM) { <em class="jxr_comment">// unexpected char after escape</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> token.content.append((<strong class="jxr_keyword">char</strong>) c).append((<strong class="jxr_keyword">char</strong>) in.getLastChar());
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> token.content.append((<strong class="jxr_keyword">char</strong>) c).append((<strong class="jxr_keyword">char</strong>) reader.getLastChar());
<a class="jxr_linenumber" name="L250" href="#L250">250</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="L251" href="#L251">251</a> token.content.append((<strong class="jxr_keyword">char</strong>) unescaped);
<a class="jxr_linenumber" name="L252" href="#L252">252</a> }
<a class="jxr_linenumber" name="L253" href="#L253">253</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (isQuoteChar(c)) {
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">if</strong> (isQuoteChar(in.lookAhead())) {
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">if</strong> (isQuoteChar(reader.lookAhead())) {
<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_comment">// double or escaped encapsulator -> add single encapsulator to token</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> c = in.read();
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> c = reader.read();
<a class="jxr_linenumber" name="L257" href="#L257">257</a> token.content.append((<strong class="jxr_keyword">char</strong>) c);
<a class="jxr_linenumber" name="L258" href="#L258">258</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em class="jxr_comment">// token finish mark (encapsulator) reached: ignore whitespace till delimiter</em>
<a class="jxr_linenumber" name="L260" href="#L260">260</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> c = in.read();
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> c = reader.read();
<a class="jxr_linenumber" name="L262" href="#L262">262</a> <strong class="jxr_keyword">if</strong> (isDelimiter(c)) {
<a class="jxr_linenumber" name="L263" href="#L263">263</a> token.type = TOKEN;
<a class="jxr_linenumber" name="L264" href="#L264">264</a> <strong class="jxr_keyword">return</strong> token;
@@ -305,7 +305,7 @@
<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment"> * @return the current line number</em>
<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L299" href="#L299">299</a> <strong class="jxr_keyword">long</strong> getCurrentLineNumber() {
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> <strong class="jxr_keyword">return</strong> in.getCurrentLineNumber();
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> <strong class="jxr_keyword">return</strong> reader.getCurrentLineNumber();
<a class="jxr_linenumber" name="L301" href="#L301">301</a> }
<a class="jxr_linenumber" name="L302" href="#L302">302</a>
<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_comment">// TODO escape handling needs more work</em>
@@ -322,7 +322,7 @@
<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong class="jxr_keyword">int</strong> readEscape() <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_comment">// the escape char has just been read (normally a backslash)</em>
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ch = in.read();
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ch = reader.read();
<a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong class="jxr_keyword">switch</strong> (ch) {
<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong class="jxr_keyword">case</strong> 'r':
<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong class="jxr_keyword">return</strong> CR;
@@ -369,15 +369,15 @@
<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L362" href="#L362">362</a> <strong class="jxr_keyword">boolean</strong> readEndOfLine(<strong class="jxr_keyword">int</strong> ch) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_comment">// check if we have \r\n...</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> <strong class="jxr_keyword">if</strong> (ch == CR && in.lookAhead() == LF) {
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> <strong class="jxr_keyword">if</strong> (ch == CR && reader.lookAhead() == LF) {
<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_comment">// note: does not change ch outside of this method!</em>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> ch = in.read();
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> ch = reader.read();
<a class="jxr_linenumber" name="L367" href="#L367">367</a> }
<a class="jxr_linenumber" name="L368" href="#L368">368</a> <strong class="jxr_keyword">return</strong> ch == LF || ch == CR;
<a class="jxr_linenumber" name="L369" href="#L369">369</a> }
<a class="jxr_linenumber" name="L370" href="#L370">370</a>
<a class="jxr_linenumber" name="L371" href="#L371">371</a> <strong class="jxr_keyword">boolean</strong> isClosed() {
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> <strong class="jxr_keyword">return</strong> in.isClosed();
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> <strong class="jxr_keyword">return</strong> reader.isClosed();
<a class="jxr_linenumber" name="L373" href="#L373">373</a> }
<a class="jxr_linenumber" name="L374" href="#L374">374</a>
<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">/**</em>
@@ -434,7 +434,7 @@
<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L428" href="#L428">428</a> <strong class="jxr_keyword">void</strong> close() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> in.close();
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> reader.close();
<a class="jxr_linenumber" name="L430" href="#L430">430</a> }
<a class="jxr_linenumber" name="L431" href="#L431">431</a> }
</pre>