You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by ki...@apache.org on 2017/09/03 05:34:10 UTC
svn commit: r1017635 [38/40] - 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/ images/ jacoco-aggregate/
jacoco-a...
Modified: websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/ExtendedBufferedReader.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/ExtendedBufferedReader.html (original)
+++ websites/production/commons/content/proper/commons-csv/xref/org/apache/commons/csv/ExtendedBufferedReader.html Sun Sep 3 05:34:03 2017
@@ -40,167 +40,165 @@
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em class="jxr_javadoccomment"> * In particular the reader supports a look-ahead option, which allows you to see the next char returned by</em>
<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em class="jxr_javadoccomment"> * {@link #read()}. This reader also tracks how many characters have been read with {@link #getPosition()}.</em>
<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @version $Id$</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> <strong class="jxr_keyword">extends</strong> BufferedReader {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment">/** The last char returned */</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> lastChar = UNDEFINED;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment">/** The count of EOLs (CR/LF/CRLF) seen so far */</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> eolCounter;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment">/** The position, which is number of characters read so far */</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> position;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a> <strong class="jxr_keyword">extends</strong> BufferedReader {
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment">/** The last char returned */</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> lastChar = UNDEFINED;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment">/** The count of EOLs (CR/LF/CRLF) seen so far */</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> eolCounter;
+<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 position, which is number of characters read so far */</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">long</strong> position;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> closed;
<a class="jxr_linenumber" name="L48" href="#L48">48</a>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> closed;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * Created extended buffered reader using default buffer-size</em>
-<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> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a>(<strong class="jxr_keyword">final</strong> Reader reader) {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">super</strong>(reader);
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> @Override
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> read() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> current = <strong class="jxr_keyword">super</strong>.read();
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">if</strong> (current == CR || current == LF && lastChar != CR) {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> eolCounter++;
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> }
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> lastChar = current;
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">this</strong>.position++;
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">return</strong> lastChar;
-<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="L69" href="#L69">69</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * Returns the last character that was read as an integer (0 to 65535). This will be the last character returned by</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * any of the read methods. This will not include a character read using the {@link #lookAhead()} method. If no</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> * character has been read then this will return {@link Constants#UNDEFINED}. If the end of the stream was reached</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em class="jxr_javadoccomment"> * on the last read then this will return {@link Constants#END_OF_STREAM}.</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <em class="jxr_javadoccomment"> * @return the last character that was read</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">int</strong> getLastChar() {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">return</strong> lastChar;
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> @Override
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> read(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] buf, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> offset, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> length) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">if</strong> (length == 0) {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">return</strong> 0;
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * Created extended buffered reader using default buffer-size</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <a href="../../../../org/apache/commons/csv/ExtendedBufferedReader.html">ExtendedBufferedReader</a>(<strong class="jxr_keyword">final</strong> Reader reader) {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">super</strong>(reader);
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> @Override
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> read() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> current = <strong class="jxr_keyword">super</strong>.read();
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">if</strong> (current == CR || current == LF && lastChar != CR) {
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> eolCounter++;
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> }
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> lastChar = current;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">this</strong>.position++;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> lastChar;
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
+<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> <em class="jxr_javadoccomment"> * Returns the last character that was read as an integer (0 to 65535). This will be the last character returned by</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * any of the read methods. This will not include a character read using the {@link #lookAhead()} method. If no</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * character has been read then this will return {@link Constants#UNDEFINED}. If the end of the stream was reached</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * on the last read then this will return {@link Constants#END_OF_STREAM}.</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> <em class="jxr_javadoccomment"> * @return the last character that was read</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">int</strong> getLastChar() {
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">return</strong> lastChar;
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> @Override
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> read(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] buf, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> offset, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> length) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">if</strong> (length == 0) {
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">return</strong> 0;
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len = <strong class="jxr_keyword">super</strong>.read(buf, offset, length);
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len = <strong class="jxr_keyword">super</strong>.read(buf, offset, length);
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">if</strong> (len > 0) {
<a class="jxr_linenumber" name="L88" href="#L88">88</a>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">if</strong> (len > 0) {
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = offset; i < offset + len; i++) {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> ch = buf[i];
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">if</strong> (ch == LF) {
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">if</strong> (CR != (i > 0 ? buf[i - 1] : lastChar)) {
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> eolCounter++;
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ch == CR) {
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> eolCounter++;
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> }
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = offset; i < offset + len; i++) {
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> ch = buf[i];
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">if</strong> (ch == LF) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">if</strong> (CR != (i > 0 ? buf[i - 1] : lastChar)) {
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> eolCounter++;
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ch == CR) {
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> eolCounter++;
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> }
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> lastChar = buf[offset + len - 1];
<a class="jxr_linenumber" name="L101" href="#L101">101</a>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> lastChar = buf[offset + len - 1];
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (len == -1) {
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> lastChar = END_OF_STREAM;
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> }
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> position += len;
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">return</strong> len;
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * Calls {@link BufferedReader#readLine()} which drops the line terminator(s). This method should only be called</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * when processing a comment, otherwise information can be lost.</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (len == -1) {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> lastChar = END_OF_STREAM;
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> }
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> position += len;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">return</strong> len;
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> }
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> * Calls {@link BufferedReader#readLine()} which drops the line terminator(s). This method should only be called</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment"> * when processing a comment, otherwise information can be lost.</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * Increments {@link #eolCounter}</em>
<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * Increments {@link #eolCounter}</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> * Sets {@link #lastChar} to {@link Constants#END_OF_STREAM} at EOF, otherwise to LF</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * @return the line that was read, or null if reached EOF.</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> @Override
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">public</strong> String readLine() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">final</strong> String line = <strong class="jxr_keyword">super</strong>.readLine();
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">if</strong> (line != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> lastChar = LF; <em class="jxr_comment">// needed for detecting start of line</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> eolCounter++;
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> lastChar = END_OF_STREAM;
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> }
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">return</strong> line;
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> }
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * Returns the next character in the current reader without consuming it. So the next call to {@link #read()} will</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * still return this value. Does not affect line number or last character.</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * Sets {@link #lastChar} to {@link Constants#END_OF_STREAM} at EOF, otherwise to LF</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> * @return the line that was read, or null if reached EOF.</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> @Override
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">public</strong> String readLine() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">final</strong> String line = <strong class="jxr_keyword">super</strong>.readLine();
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">if</strong> (line != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> lastChar = LF; <em class="jxr_comment">// needed for detecting start of line</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> eolCounter++;
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> lastChar = END_OF_STREAM;
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> }
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">return</strong> line;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment"> * Returns the next character in the current reader without consuming it. So the next call to {@link #read()} will</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> * still return this value. Does not affect line number or last character.</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @return the next character</em>
<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * @return the next character</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> * if there is an error in reading</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">int</strong> lookAhead() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">super</strong>.mark(1);
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> c = <strong class="jxr_keyword">super</strong>.read();
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">super</strong>.reset();
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">return</strong> c;
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> }
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment"> * Returns the current line number</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment"> * @return the current line number</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">long</strong> getCurrentLineNumber() {
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <em class="jxr_comment">// Check if we are at EOL or EOF or just starting</em>
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">if</strong> (lastChar == CR || lastChar == LF || lastChar == UNDEFINED || lastChar == END_OF_STREAM) {
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">return</strong> eolCounter; <em class="jxr_comment">// counter is accurate</em>
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">return</strong> eolCounter + 1; <em class="jxr_comment">// Allow for counter being incremented only at EOL</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment"> * Gets the character position in the reader.</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em class="jxr_javadoccomment"> * @return the current position in the reader (counting characters, not bytes since this is a Reader)</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">long</strong> getPosition() {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>.position;
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> }
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isClosed() {
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">return</strong> closed;
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> }
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * Closes the stream.</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> @Override
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> close() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_comment">// Set ivars before calling super close() in case close() throws an IOException.</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> closed = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> lastChar = END_OF_STREAM;
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">super</strong>.close();
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> }
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> }
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> * if there is an error in reading</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">int</strong> lookAhead() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">super</strong>.mark(1);
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> c = <strong class="jxr_keyword">super</strong>.read();
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">super</strong>.reset();
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">return</strong> c;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em class="jxr_javadoccomment"> * Returns the current line number</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_javadoccomment"> * @return the current line number</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">long</strong> getCurrentLineNumber() {
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_comment">// Check if we are at EOL or EOF or just starting</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">if</strong> (lastChar == CR || lastChar == LF || lastChar == UNDEFINED || lastChar == END_OF_STREAM) {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">return</strong> eolCounter; <em class="jxr_comment">// counter is accurate</em>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">return</strong> eolCounter + 1; <em class="jxr_comment">// Allow for counter being incremented only at EOL</em>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_javadoccomment"> * Gets the character position in the reader.</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment"> * @return the current position in the reader (counting characters, not bytes since this is a Reader)</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">long</strong> getPosition() {
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>.position;
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> }
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isClosed() {
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">return</strong> closed;
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> * Closes the stream.</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> * If an I/O error occurs</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> @Override
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> close() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_comment">// Set ivars before calling super close() in case close() throws an IOException.</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> closed = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> lastChar = END_OF_STREAM;
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">super</strong>.close();
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2017 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file