You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ba...@apache.org on 2013/10/19 19:17:59 UTC
svn commit: r883363 [46/48] - in
/websites/production/commons/content/proper/commons-lang: ./ apidocs/
apidocs/org/apache/commons/lang3/ apidocs/org/apache/commons/lang3/builder/
apidocs/org/apache/commons/lang3/builder/class-use/ apidocs/org/apache/co...
Modified: websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeLiteral.html
==============================================================================
--- websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeLiteral.html (original)
+++ websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeLiteral.html Sat Oct 19 17:17:55 2013
@@ -90,41 +90,44 @@
<a class="jxr_linenumber" name="80" href="#80">80</a>
<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String toString;
<a class="jxr_linenumber" name="82" href="#82">82</a>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/commons/lang3/reflect/TypeLiteral.html">TypeLiteral</a>() {
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">this</strong>.value =
-<a class="jxr_linenumber" name="85" href="#85">85</a> Validate.notNull(TypeUtils.getTypeArguments(getClass(), TypeLiteral.<strong class="jxr_keyword">class</strong>).get(T),
-<a class="jxr_linenumber" name="86" href="#86">86</a> <span class="jxr_string">"%s does not assign type parameter %s"</span>, getClass(), TypeUtils.toLongString(T));
-<a class="jxr_linenumber" name="87" href="#87">87</a>
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">this</strong>.toString = String.format(<span class="jxr_string">"%s<%s>"</span>, TypeLiteral.<strong class="jxr_keyword">class</strong>.getSimpleName(), TypeUtils.toString(value));
-<a class="jxr_linenumber" name="89" href="#89">89</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"> * The default constructor.</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> <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/commons/lang3/reflect/TypeLiteral.html">TypeLiteral</a>() {
+<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">this</strong>.value =
+<a class="jxr_linenumber" name="88" href="#88">88</a> Validate.notNull(TypeUtils.getTypeArguments(getClass(), TypeLiteral.<strong class="jxr_keyword">class</strong>).get(T),
+<a class="jxr_linenumber" name="89" href="#89">89</a> <span class="jxr_string">"%s does not assign type parameter %s"</span>, getClass(), TypeUtils.toLongString(T));
<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> @Override
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> equals(Object obj) {
-<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">if</strong> (obj == <strong class="jxr_keyword">this</strong>) {
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="95" href="#95">95</a> }
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">if</strong> (obj instanceof TypeLiteral == false) {
-<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">this</strong>.toString = String.format(<span class="jxr_string">"%s<%s>"</span>, TypeLiteral.<strong class="jxr_keyword">class</strong>.getSimpleName(), TypeUtils.toString(value));
+<a class="jxr_linenumber" name="92" href="#92">92</a> }
+<a class="jxr_linenumber" name="93" href="#93">93</a>
+<a class="jxr_linenumber" name="94" href="#94">94</a> @Override
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> equals(Object obj) {
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">if</strong> (obj == <strong class="jxr_keyword">this</strong>) {
+<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="98" href="#98">98</a> }
-<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">final</strong> TypeLiteral<?> other = (TypeLiteral<?>) obj;
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">return</strong> TypeUtils.equals(value, other.value);
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
-<a class="jxr_linenumber" name="102" href="#102">102</a>
-<a class="jxr_linenumber" name="103" href="#103">103</a> @Override
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">return</strong> 37 << 4 | value.hashCode();
-<a class="jxr_linenumber" name="106" href="#106">106</a> }
-<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> @Override
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">return</strong> toString;
-<a class="jxr_linenumber" name="111" href="#111">111</a> }
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> @Override
-<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">public</strong> Type getType() {
-<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">return</strong> value;
-<a class="jxr_linenumber" name="116" href="#116">116</a> }
-<a class="jxr_linenumber" name="117" href="#117">117</a> }
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">if</strong> (obj instanceof TypeLiteral == false) {
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">final</strong> TypeLiteral<?> other = (TypeLiteral<?>) obj;
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> TypeUtils.equals(value, other.value);
+<a class="jxr_linenumber" name="104" href="#104">104</a> }
+<a class="jxr_linenumber" name="105" href="#105">105</a>
+<a class="jxr_linenumber" name="106" href="#106">106</a> @Override
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> hashCode() {
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">return</strong> 37 << 4 | value.hashCode();
+<a class="jxr_linenumber" name="109" href="#109">109</a> }
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> @Override
+<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">return</strong> toString;
+<a class="jxr_linenumber" name="114" href="#114">114</a> }
+<a class="jxr_linenumber" name="115" href="#115">115</a>
+<a class="jxr_linenumber" name="116" href="#116">116</a> @Override
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">public</strong> Type getType() {
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">return</strong> value;
+<a class="jxr_linenumber" name="119" href="#119">119</a> }
+<a class="jxr_linenumber" name="120" href="#120">120</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeUtils.html
==============================================================================
--- websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeUtils.html (original)
+++ websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/reflect/TypeUtils.html Sat Oct 19 17:17:55 2013
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_javadoccomment"> * generics. </p></em>
<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_javadoccomment"> * @since 3.0</em>
-<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * @version $Id: TypeUtils.java 1525740 2013-09-23 23:43:13Z mbenson $</em>
+<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * @version $Id: TypeUtils.java 1533474 2013-10-18 14:53:11Z britter $</em>
<a class="jxr_linenumber" name="46" href="#46">46</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/lang3/reflect/TypeUtils.html">TypeUtils</a> {
<a class="jxr_linenumber" name="48" href="#48">48</a>
@@ -65,7 +65,7 @@
<a class="jxr_linenumber" name="55" href="#55">55</a>
<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> Type[] upperBounds;
<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> Type[] lowerBounds;
-<a class="jxr_linenumber" name="58" href="#58">58</a>
+<a class="jxr_linenumber" name="58" href="#58">58</a>
<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/lang3/reflect/TypeUtils.html">WildcardTypeBuilder</a> withUpperBounds(Type... bounds) {
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">this</strong>.upperBounds = bounds;
<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
@@ -1557,7 +1557,7 @@
<a class="jxr_linenumber" name="1547" href="#1547">1547</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="1548" href="#1548">1548</a> <em class="jxr_javadoccomment"> * Wrap the specified {@link Type} in a {@link Typed} wrapper.</em>
<a class="jxr_linenumber" name="1549" href="#1549">1549</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="1550" href="#1550">1550</a> <em class="jxr_javadoccomment"> * @param T inferred generic type</em>
+<a class="jxr_linenumber" name="1550" href="#1550">1550</a> <em class="jxr_javadoccomment"> * @param <T> inferred generic type</em>
<a class="jxr_linenumber" name="1551" href="#1551">1551</a> <em class="jxr_javadoccomment"> * @param type to wrap</em>
<a class="jxr_linenumber" name="1552" href="#1552">1552</a> <em class="jxr_javadoccomment"> * @return Typed<T></em>
<a class="jxr_linenumber" name="1553" href="#1553">1553</a> <em class="jxr_javadoccomment"> */</em>
@@ -1573,7 +1573,7 @@
<a class="jxr_linenumber" name="1563" href="#1563">1563</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="1564" href="#1564">1564</a> <em class="jxr_javadoccomment"> * Wrap the specified {@link Class} in a {@link Typed} wrapper.</em>
<a class="jxr_linenumber" name="1565" href="#1565">1565</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="1566" href="#1566">1566</a> <em class="jxr_javadoccomment"> * @param T generic type</em>
+<a class="jxr_linenumber" name="1566" href="#1566">1566</a> <em class="jxr_javadoccomment"> * @param <T> generic type</em>
<a class="jxr_linenumber" name="1567" href="#1567">1567</a> <em class="jxr_javadoccomment"> * @param type to wrap</em>
<a class="jxr_linenumber" name="1568" href="#1568">1568</a> <em class="jxr_javadoccomment"> * @return Typed<T></em>
<a class="jxr_linenumber" name="1569" href="#1569">1569</a> <em class="jxr_javadoccomment"> */</em>
Modified: websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrSubstitutor.html
==============================================================================
--- websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrSubstitutor.html (original)
+++ websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrSubstitutor.html Sat Oct 19 17:17:55 2013
@@ -129,7 +129,7 @@
<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment"> * {@link #setEnableSubstitutionInVariables(boolean) enableSubstitutionInVariables}</em>
<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_javadoccomment"> * property to <b>true</b>.</em>
<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_javadoccomment"> * @version $Id: StrSubstitutor.java 1527373 2013-09-29 18:06:03Z ggregory $</em>
+<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_javadoccomment"> * @version $Id: StrSubstitutor.java 1533551 2013-10-18 16:49:15Z sebb $</em>
<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_javadoccomment"> * @since 2.2</em>
<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor</a> {
@@ -748,10 +748,10 @@
<a class="jxr_linenumber" name="738" href="#738">738</a> <em class="jxr_javadoccomment"> * represents a boolean flag as to whether any change occurred.</em>
<a class="jxr_linenumber" name="739" href="#739">739</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="740" href="#740">740</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> substitute(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> 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, List<String> priorVariables) {
-<a class="jxr_linenumber" name="741" href="#741">741</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> prefixMatcher = getVariablePrefixMatcher();
-<a class="jxr_linenumber" name="742" href="#742">742</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> suffixMatcher = getVariableSuffixMatcher();
+<a class="jxr_linenumber" name="741" href="#741">741</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> pfxMatcher = getVariablePrefixMatcher();
+<a class="jxr_linenumber" name="742" href="#742">742</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> suffMatcher = getVariableSuffixMatcher();
<a class="jxr_linenumber" name="743" href="#743">743</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> escape = getEscapeChar();
-<a class="jxr_linenumber" name="744" href="#744">744</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> valueDelimiterMatcher = getValueDelimiterMatcher();
+<a class="jxr_linenumber" name="744" href="#744">744</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrMatcher.html">StrMatcher</a> valueDelimMatcher = getValueDelimiterMatcher();
<a class="jxr_linenumber" name="745" href="#745">745</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> substitutionInVariablesEnabled = isEnableSubstitutionInVariables();
<a class="jxr_linenumber" name="746" href="#746">746</a>
<a class="jxr_linenumber" name="747" href="#747">747</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> top = priorVariables == <strong class="jxr_keyword">null</strong>;
@@ -761,7 +761,7 @@
<a class="jxr_linenumber" name="751" href="#751">751</a> <strong class="jxr_keyword">int</strong> bufEnd = offset + length;
<a class="jxr_linenumber" name="752" href="#752">752</a> <strong class="jxr_keyword">int</strong> pos = offset;
<a class="jxr_linenumber" name="753" href="#753">753</a> <strong class="jxr_keyword">while</strong> (pos < bufEnd) {
-<a class="jxr_linenumber" name="754" href="#754">754</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> startMatchLen = prefixMatcher.isMatch(chars, pos, offset,
+<a class="jxr_linenumber" name="754" href="#754">754</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> startMatchLen = pfxMatcher.isMatch(chars, pos, offset,
<a class="jxr_linenumber" name="755" href="#755">755</a> bufEnd);
<a class="jxr_linenumber" name="756" href="#756">756</a> <strong class="jxr_keyword">if</strong> (startMatchLen == 0) {
<a class="jxr_linenumber" name="757" href="#757">757</a> pos++;
@@ -782,7 +782,7 @@
<a class="jxr_linenumber" name="772" href="#772">772</a> <strong class="jxr_keyword">int</strong> nestedVarCount = 0;
<a class="jxr_linenumber" name="773" href="#773">773</a> <strong class="jxr_keyword">while</strong> (pos < bufEnd) {
<a class="jxr_linenumber" name="774" href="#774">774</a> <strong class="jxr_keyword">if</strong> (substitutionInVariablesEnabled
-<a class="jxr_linenumber" name="775" href="#775">775</a> && (endMatchLen = prefixMatcher.isMatch(chars,
+<a class="jxr_linenumber" name="775" href="#775">775</a> && (endMatchLen = pfxMatcher.isMatch(chars,
<a class="jxr_linenumber" name="776" href="#776">776</a> pos, offset, bufEnd)) != 0) {
<a class="jxr_linenumber" name="777" href="#777">777</a> <em class="jxr_comment">// found a nested variable start</em>
<a class="jxr_linenumber" name="778" href="#778">778</a> nestedVarCount++;
@@ -790,7 +790,7 @@
<a class="jxr_linenumber" name="780" href="#780">780</a> <strong class="jxr_keyword">continue</strong>;
<a class="jxr_linenumber" name="781" href="#781">781</a> }
<a class="jxr_linenumber" name="782" href="#782">782</a>
-<a class="jxr_linenumber" name="783" href="#783">783</a> endMatchLen = suffixMatcher.isMatch(chars, pos, offset,
+<a class="jxr_linenumber" name="783" href="#783">783</a> endMatchLen = suffMatcher.isMatch(chars, pos, offset,
<a class="jxr_linenumber" name="784" href="#784">784</a> bufEnd);
<a class="jxr_linenumber" name="785" href="#785">785</a> <strong class="jxr_keyword">if</strong> (endMatchLen == 0) {
<a class="jxr_linenumber" name="786" href="#786">786</a> pos++;
@@ -811,16 +811,16 @@
<a class="jxr_linenumber" name="801" href="#801">801</a> String varName = varNameExpr;
<a class="jxr_linenumber" name="802" href="#802">802</a> String varDefaultValue = <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="803" href="#803">803</a>
-<a class="jxr_linenumber" name="804" href="#804">804</a> <strong class="jxr_keyword">if</strong> (valueDelimiterMatcher != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="804" href="#804">804</a> <strong class="jxr_keyword">if</strong> (valueDelimMatcher != <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="805" href="#805">805</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong> [] varNameExprChars = varNameExpr.toCharArray();
<a class="jxr_linenumber" name="806" href="#806">806</a> <strong class="jxr_keyword">int</strong> valueDelimiterMatchLen = 0;
<a class="jxr_linenumber" name="807" href="#807">807</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < varNameExprChars.length; i++) {
<a class="jxr_linenumber" name="808" href="#808">808</a> <em class="jxr_comment">// if there's any nested variable when nested variable substitution disabled, then stop resolving name and default value.</em>
<a class="jxr_linenumber" name="809" href="#809">809</a> <strong class="jxr_keyword">if</strong> (!substitutionInVariablesEnabled
-<a class="jxr_linenumber" name="810" href="#810">810</a> && prefixMatcher.isMatch(varNameExprChars, i, i, varNameExprChars.length) != 0) {
+<a class="jxr_linenumber" name="810" href="#810">810</a> && pfxMatcher.isMatch(varNameExprChars, i, i, varNameExprChars.length) != 0) {
<a class="jxr_linenumber" name="811" href="#811">811</a> <strong class="jxr_keyword">break</strong>;
<a class="jxr_linenumber" name="812" href="#812">812</a> }
-<a class="jxr_linenumber" name="813" href="#813">813</a> <strong class="jxr_keyword">if</strong> ((valueDelimiterMatchLen = valueDelimiterMatcher.isMatch(varNameExprChars, i)) != 0) {
+<a class="jxr_linenumber" name="813" href="#813">813</a> <strong class="jxr_keyword">if</strong> ((valueDelimiterMatchLen = valueDelimMatcher.isMatch(varNameExprChars, i)) != 0) {
<a class="jxr_linenumber" name="814" href="#814">814</a> varName = varNameExpr.substring(0, i);
<a class="jxr_linenumber" name="815" href="#815">815</a> varDefaultValue = varNameExpr.substring(i + valueDelimiterMatchLen);
<a class="jxr_linenumber" name="816" href="#816">816</a> <strong class="jxr_keyword">break</strong>;
Modified: websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrTokenizer.html
==============================================================================
--- websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrTokenizer.html (original)
+++ websites/production/commons/content/proper/commons-lang/xref/org/apache/commons/lang3/text/StrTokenizer.html Sat Oct 19 17:17:55 2013
@@ -93,7 +93,7 @@
<a class="jxr_linenumber" name="83" href="#83">83</a> <em class="jxr_javadoccomment"> * </table></em>
<a class="jxr_linenumber" name="84" href="#84">84</a> <em class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_javadoccomment"> * @since 2.2</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_javadoccomment"> * @version $Id: StrTokenizer.java 1436770 2013-01-22 07:09:45Z ggregory $</em>
+<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_javadoccomment"> * @version $Id: StrTokenizer.java 1533551 2013-10-18 16:49:15Z sebb $</em>
<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/lang3/text/StrTokenizer.html">StrTokenizer</a> <strong class="jxr_keyword">implements</strong> ListIterator<String>, Cloneable {
<a class="jxr_linenumber" name="89" href="#89">89</a>
@@ -637,30 +637,30 @@
<a class="jxr_linenumber" name="627" href="#627">627</a> <em class="jxr_javadoccomment"> * equal to the length of the array to this method, however a subclass</em>
<a class="jxr_linenumber" name="628" href="#628">628</a> <em class="jxr_javadoccomment"> * may pass other values, or even an entirely different array.</em>
<a class="jxr_linenumber" name="629" href="#629">629</a> <em class="jxr_javadoccomment"> * </em>
-<a class="jxr_linenumber" name="630" href="#630">630</a> <em class="jxr_javadoccomment"> * @param chars the character array being tokenized, may be null</em>
+<a class="jxr_linenumber" name="630" href="#630">630</a> <em class="jxr_javadoccomment"> * @param srcChars the character array being tokenized, may be null</em>
<a class="jxr_linenumber" name="631" href="#631">631</a> <em class="jxr_javadoccomment"> * @param offset the start position within the character array, must be valid</em>
<a class="jxr_linenumber" name="632" href="#632">632</a> <em class="jxr_javadoccomment"> * @param count the number of characters to tokenize, must be valid</em>
<a class="jxr_linenumber" name="633" href="#633">633</a> <em class="jxr_javadoccomment"> * @return the modifiable list of String tokens, unmodifiable if null array or zero count</em>
<a class="jxr_linenumber" name="634" href="#634">634</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="635" href="#635">635</a> <strong class="jxr_keyword">protected</strong> List<String> tokenize(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] chars, <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> count) {
-<a class="jxr_linenumber" name="636" href="#636">636</a> <strong class="jxr_keyword">if</strong> (chars == <strong class="jxr_keyword">null</strong> || count == 0) {
+<a class="jxr_linenumber" name="635" href="#635">635</a> <strong class="jxr_keyword">protected</strong> List<String> tokenize(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] srcChars, <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> count) {
+<a class="jxr_linenumber" name="636" href="#636">636</a> <strong class="jxr_keyword">if</strong> (srcChars == <strong class="jxr_keyword">null</strong> || count == 0) {
<a class="jxr_linenumber" name="637" href="#637">637</a> <strong class="jxr_keyword">return</strong> Collections.emptyList();
<a class="jxr_linenumber" name="638" href="#638">638</a> }
<a class="jxr_linenumber" name="639" href="#639">639</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> buf = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a>();
-<a class="jxr_linenumber" name="640" href="#640">640</a> <strong class="jxr_keyword">final</strong> List<String> tokens = <strong class="jxr_keyword">new</strong> ArrayList<String>();
+<a class="jxr_linenumber" name="640" href="#640">640</a> <strong class="jxr_keyword">final</strong> List<String> tokenList = <strong class="jxr_keyword">new</strong> ArrayList<String>();
<a class="jxr_linenumber" name="641" href="#641">641</a> <strong class="jxr_keyword">int</strong> pos = offset;
<a class="jxr_linenumber" name="642" href="#642">642</a>
<a class="jxr_linenumber" name="643" href="#643">643</a> <em class="jxr_comment">// loop around the entire buffer</em>
<a class="jxr_linenumber" name="644" href="#644">644</a> <strong class="jxr_keyword">while</strong> (pos >= 0 && pos < count) {
<a class="jxr_linenumber" name="645" href="#645">645</a> <em class="jxr_comment">// find next token</em>
-<a class="jxr_linenumber" name="646" href="#646">646</a> pos = readNextToken(chars, pos, count, buf, tokens);
+<a class="jxr_linenumber" name="646" href="#646">646</a> pos = readNextToken(srcChars, pos, count, buf, tokenList);
<a class="jxr_linenumber" name="647" href="#647">647</a>
<a class="jxr_linenumber" name="648" href="#648">648</a> <em class="jxr_comment">// handle case where end of string is a delimiter</em>
<a class="jxr_linenumber" name="649" href="#649">649</a> <strong class="jxr_keyword">if</strong> (pos >= count) {
-<a class="jxr_linenumber" name="650" href="#650">650</a> addToken(tokens, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="650" href="#650">650</a> addToken(tokenList, <span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="651" href="#651">651</a> }
<a class="jxr_linenumber" name="652" href="#652">652</a> }
-<a class="jxr_linenumber" name="653" href="#653">653</a> <strong class="jxr_keyword">return</strong> tokens;
+<a class="jxr_linenumber" name="653" href="#653">653</a> <strong class="jxr_keyword">return</strong> tokenList;
<a class="jxr_linenumber" name="654" href="#654">654</a> }
<a class="jxr_linenumber" name="655" href="#655">655</a>
<a class="jxr_linenumber" name="656" href="#656">656</a> <em class="jxr_javadoccomment">/**</em>
@@ -684,24 +684,24 @@
<a class="jxr_linenumber" name="674" href="#674">674</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="675" href="#675">675</a> <em class="jxr_javadoccomment"> * Reads character by character through the String to get the next token.</em>
<a class="jxr_linenumber" name="676" href="#676">676</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="677" href="#677">677</a> <em class="jxr_javadoccomment"> * @param chars the character array being tokenized</em>
+<a class="jxr_linenumber" name="677" href="#677">677</a> <em class="jxr_javadoccomment"> * @param srcChars the character array being tokenized</em>
<a class="jxr_linenumber" name="678" href="#678">678</a> <em class="jxr_javadoccomment"> * @param start the first character of field</em>
<a class="jxr_linenumber" name="679" href="#679">679</a> <em class="jxr_javadoccomment"> * @param len the length of the character array being tokenized</em>
<a class="jxr_linenumber" name="680" href="#680">680</a> <em class="jxr_javadoccomment"> * @param workArea a temporary work area</em>
-<a class="jxr_linenumber" name="681" href="#681">681</a> <em class="jxr_javadoccomment"> * @param tokens the list of parsed tokens</em>
+<a class="jxr_linenumber" name="681" href="#681">681</a> <em class="jxr_javadoccomment"> * @param tokenList the list of parsed tokens</em>
<a class="jxr_linenumber" name="682" href="#682">682</a> <em class="jxr_javadoccomment"> * @return the starting position of the next field (the character</em>
<a class="jxr_linenumber" name="683" href="#683">683</a> <em class="jxr_javadoccomment"> * immediately after the delimiter), or -1 if end of string found</em>
<a class="jxr_linenumber" name="684" href="#684">684</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="685" href="#685">685</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> readNextToken(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] chars, <strong class="jxr_keyword">int</strong> start, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> workArea, <strong class="jxr_keyword">final</strong> List<String> tokens) {
+<a class="jxr_linenumber" name="685" href="#685">685</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> readNextToken(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] srcChars, <strong class="jxr_keyword">int</strong> start, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> workArea, <strong class="jxr_keyword">final</strong> List<String> tokenList) {
<a class="jxr_linenumber" name="686" href="#686">686</a> <em class="jxr_comment">// skip all leading whitespace, unless it is the</em>
<a class="jxr_linenumber" name="687" href="#687">687</a> <em class="jxr_comment">// field delimiter or the quote character</em>
<a class="jxr_linenumber" name="688" href="#688">688</a> <strong class="jxr_keyword">while</strong> (start < len) {
<a class="jxr_linenumber" name="689" href="#689">689</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> removeLen = Math.max(
-<a class="jxr_linenumber" name="690" href="#690">690</a> getIgnoredMatcher().isMatch(chars, start, start, len),
-<a class="jxr_linenumber" name="691" href="#691">691</a> getTrimmerMatcher().isMatch(chars, start, start, len));
+<a class="jxr_linenumber" name="690" href="#690">690</a> getIgnoredMatcher().isMatch(srcChars, start, start, len),
+<a class="jxr_linenumber" name="691" href="#691">691</a> getTrimmerMatcher().isMatch(srcChars, start, start, len));
<a class="jxr_linenumber" name="692" href="#692">692</a> <strong class="jxr_keyword">if</strong> (removeLen == 0 ||
-<a class="jxr_linenumber" name="693" href="#693">693</a> getDelimiterMatcher().isMatch(chars, start, start, len) > 0 ||
-<a class="jxr_linenumber" name="694" href="#694">694</a> getQuoteMatcher().isMatch(chars, start, start, len) > 0) {
+<a class="jxr_linenumber" name="693" href="#693">693</a> getDelimiterMatcher().isMatch(srcChars, start, start, len) > 0 ||
+<a class="jxr_linenumber" name="694" href="#694">694</a> getQuoteMatcher().isMatch(srcChars, start, start, len) > 0) {
<a class="jxr_linenumber" name="695" href="#695">695</a> <strong class="jxr_keyword">break</strong>;
<a class="jxr_linenumber" name="696" href="#696">696</a> }
<a class="jxr_linenumber" name="697" href="#697">697</a> start += removeLen;
@@ -709,41 +709,41 @@
<a class="jxr_linenumber" name="699" href="#699">699</a>
<a class="jxr_linenumber" name="700" href="#700">700</a> <em class="jxr_comment">// handle reaching end</em>
<a class="jxr_linenumber" name="701" href="#701">701</a> <strong class="jxr_keyword">if</strong> (start >= len) {
-<a class="jxr_linenumber" name="702" href="#702">702</a> addToken(tokens, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="702" href="#702">702</a> addToken(tokenList, <span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="703" href="#703">703</a> <strong class="jxr_keyword">return</strong> -1;
<a class="jxr_linenumber" name="704" href="#704">704</a> }
<a class="jxr_linenumber" name="705" href="#705">705</a>
<a class="jxr_linenumber" name="706" href="#706">706</a> <em class="jxr_comment">// handle empty token</em>
-<a class="jxr_linenumber" name="707" href="#707">707</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> delimLen = getDelimiterMatcher().isMatch(chars, start, start, len);
+<a class="jxr_linenumber" name="707" href="#707">707</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> delimLen = getDelimiterMatcher().isMatch(srcChars, start, start, len);
<a class="jxr_linenumber" name="708" href="#708">708</a> <strong class="jxr_keyword">if</strong> (delimLen > 0) {
-<a class="jxr_linenumber" name="709" href="#709">709</a> addToken(tokens, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="709" href="#709">709</a> addToken(tokenList, <span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="710" href="#710">710</a> <strong class="jxr_keyword">return</strong> start + delimLen;
<a class="jxr_linenumber" name="711" href="#711">711</a> }
<a class="jxr_linenumber" name="712" href="#712">712</a>
<a class="jxr_linenumber" name="713" href="#713">713</a> <em class="jxr_comment">// handle found token</em>
-<a class="jxr_linenumber" name="714" href="#714">714</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen = getQuoteMatcher().isMatch(chars, start, start, len);
+<a class="jxr_linenumber" name="714" href="#714">714</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen = getQuoteMatcher().isMatch(srcChars, start, start, len);
<a class="jxr_linenumber" name="715" href="#715">715</a> <strong class="jxr_keyword">if</strong> (quoteLen > 0) {
-<a class="jxr_linenumber" name="716" href="#716">716</a> <strong class="jxr_keyword">return</strong> readWithQuotes(chars, start + quoteLen, len, workArea, tokens, start, quoteLen);
+<a class="jxr_linenumber" name="716" href="#716">716</a> <strong class="jxr_keyword">return</strong> readWithQuotes(srcChars, start + quoteLen, len, workArea, tokenList, start, quoteLen);
<a class="jxr_linenumber" name="717" href="#717">717</a> }
-<a class="jxr_linenumber" name="718" href="#718">718</a> <strong class="jxr_keyword">return</strong> readWithQuotes(chars, start, len, workArea, tokens, 0, 0);
+<a class="jxr_linenumber" name="718" href="#718">718</a> <strong class="jxr_keyword">return</strong> readWithQuotes(srcChars, start, len, workArea, tokenList, 0, 0);
<a class="jxr_linenumber" name="719" href="#719">719</a> }
<a class="jxr_linenumber" name="720" href="#720">720</a>
<a class="jxr_linenumber" name="721" href="#721">721</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="722" href="#722">722</a> <em class="jxr_javadoccomment"> * Reads a possibly quoted string token.</em>
<a class="jxr_linenumber" name="723" href="#723">723</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="724" href="#724">724</a> <em class="jxr_javadoccomment"> * @param chars the character array being tokenized</em>
+<a class="jxr_linenumber" name="724" href="#724">724</a> <em class="jxr_javadoccomment"> * @param srcChars the character array being tokenized</em>
<a class="jxr_linenumber" name="725" href="#725">725</a> <em class="jxr_javadoccomment"> * @param start the first character of field</em>
<a class="jxr_linenumber" name="726" href="#726">726</a> <em class="jxr_javadoccomment"> * @param len the length of the character array being tokenized</em>
<a class="jxr_linenumber" name="727" href="#727">727</a> <em class="jxr_javadoccomment"> * @param workArea a temporary work area</em>
-<a class="jxr_linenumber" name="728" href="#728">728</a> <em class="jxr_javadoccomment"> * @param tokens the list of parsed tokens</em>
+<a class="jxr_linenumber" name="728" href="#728">728</a> <em class="jxr_javadoccomment"> * @param tokenList the list of parsed tokens</em>
<a class="jxr_linenumber" name="729" href="#729">729</a> <em class="jxr_javadoccomment"> * @param quoteStart the start position of the matched quote, 0 if no quoting</em>
<a class="jxr_linenumber" name="730" href="#730">730</a> <em class="jxr_javadoccomment"> * @param quoteLen the length of the matched quote, 0 if no quoting</em>
<a class="jxr_linenumber" name="731" href="#731">731</a> <em class="jxr_javadoccomment"> * @return the starting position of the next field (the character</em>
<a class="jxr_linenumber" name="732" href="#732">732</a> <em class="jxr_javadoccomment"> * immediately after the delimiter, or if end of string found,</em>
<a class="jxr_linenumber" name="733" href="#733">733</a> <em class="jxr_javadoccomment"> * then the length of string</em>
<a class="jxr_linenumber" name="734" href="#734">734</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="735" href="#735">735</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> readWithQuotes(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] chars, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> start, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> workArea,
-<a class="jxr_linenumber" name="736" href="#736">736</a> <strong class="jxr_keyword">final</strong> List<String> tokens, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteStart, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen) {
+<a class="jxr_linenumber" name="735" href="#735">735</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> readWithQuotes(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] srcChars, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> start, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/commons/lang3/text/StrBuilder.html">StrBuilder</a> workArea,
+<a class="jxr_linenumber" name="736" href="#736">736</a> <strong class="jxr_keyword">final</strong> List<String> tokenList, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteStart, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen) {
<a class="jxr_linenumber" name="737" href="#737">737</a> <em class="jxr_comment">// Loop until we've found the end of the quoted</em>
<a class="jxr_linenumber" name="738" href="#738">738</a> <em class="jxr_comment">// string or the end of the input</em>
<a class="jxr_linenumber" name="739" href="#739">739</a> workArea.clear();
@@ -762,10 +762,10 @@
<a class="jxr_linenumber" name="752" href="#752">752</a> <em class="jxr_comment">// followed by a second quote. If so, then we need</em>
<a class="jxr_linenumber" name="753" href="#753">753</a> <em class="jxr_comment">// to actually put the quote character into the token</em>
<a class="jxr_linenumber" name="754" href="#754">754</a> <em class="jxr_comment">// rather than end the token.</em>
-<a class="jxr_linenumber" name="755" href="#755">755</a> <strong class="jxr_keyword">if</strong> (isQuote(chars, pos, len, quoteStart, quoteLen)) {
-<a class="jxr_linenumber" name="756" href="#756">756</a> <strong class="jxr_keyword">if</strong> (isQuote(chars, pos + quoteLen, len, quoteStart, quoteLen)) {
+<a class="jxr_linenumber" name="755" href="#755">755</a> <strong class="jxr_keyword">if</strong> (isQuote(srcChars, pos, len, quoteStart, quoteLen)) {
+<a class="jxr_linenumber" name="756" href="#756">756</a> <strong class="jxr_keyword">if</strong> (isQuote(srcChars, pos + quoteLen, len, quoteStart, quoteLen)) {
<a class="jxr_linenumber" name="757" href="#757">757</a> <em class="jxr_comment">// matched pair of quotes, thus an escaped quote</em>
-<a class="jxr_linenumber" name="758" href="#758">758</a> workArea.append(chars, pos, quoteLen);
+<a class="jxr_linenumber" name="758" href="#758">758</a> workArea.append(srcChars, pos, quoteLen);
<a class="jxr_linenumber" name="759" href="#759">759</a> pos += quoteLen * 2;
<a class="jxr_linenumber" name="760" href="#760">760</a> trimStart = workArea.size();
<a class="jxr_linenumber" name="761" href="#761">761</a> <strong class="jxr_keyword">continue</strong>;
@@ -778,29 +778,29 @@
<a class="jxr_linenumber" name="768" href="#768">768</a> }
<a class="jxr_linenumber" name="769" href="#769">769</a>
<a class="jxr_linenumber" name="770" href="#770">770</a> <em class="jxr_comment">// copy regular character from inside quotes</em>
-<a class="jxr_linenumber" name="771" href="#771">771</a> workArea.append(chars[pos++]);
+<a class="jxr_linenumber" name="771" href="#771">771</a> workArea.append(srcChars[pos++]);
<a class="jxr_linenumber" name="772" href="#772">772</a> trimStart = workArea.size();
<a class="jxr_linenumber" name="773" href="#773">773</a>
<a class="jxr_linenumber" name="774" href="#774">774</a> } <strong class="jxr_keyword">else</strong> {
<a class="jxr_linenumber" name="775" href="#775">775</a> <em class="jxr_comment">// Not in quoting mode</em>
<a class="jxr_linenumber" name="776" href="#776">776</a>
<a class="jxr_linenumber" name="777" href="#777">777</a> <em class="jxr_comment">// check for delimiter, and thus end of token</em>
-<a class="jxr_linenumber" name="778" href="#778">778</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> delimLen = getDelimiterMatcher().isMatch(chars, pos, start, len);
+<a class="jxr_linenumber" name="778" href="#778">778</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> delimLen = getDelimiterMatcher().isMatch(srcChars, pos, start, len);
<a class="jxr_linenumber" name="779" href="#779">779</a> <strong class="jxr_keyword">if</strong> (delimLen > 0) {
<a class="jxr_linenumber" name="780" href="#780">780</a> <em class="jxr_comment">// return condition when end of token found</em>
-<a class="jxr_linenumber" name="781" href="#781">781</a> addToken(tokens, workArea.substring(0, trimStart));
+<a class="jxr_linenumber" name="781" href="#781">781</a> addToken(tokenList, workArea.substring(0, trimStart));
<a class="jxr_linenumber" name="782" href="#782">782</a> <strong class="jxr_keyword">return</strong> pos + delimLen;
<a class="jxr_linenumber" name="783" href="#783">783</a> }
<a class="jxr_linenumber" name="784" href="#784">784</a>
<a class="jxr_linenumber" name="785" href="#785">785</a> <em class="jxr_comment">// check for quote, and thus back into quoting mode</em>
-<a class="jxr_linenumber" name="786" href="#786">786</a> <strong class="jxr_keyword">if</strong> (quoteLen > 0 && isQuote(chars, pos, len, quoteStart, quoteLen)) {
+<a class="jxr_linenumber" name="786" href="#786">786</a> <strong class="jxr_keyword">if</strong> (quoteLen > 0 && isQuote(srcChars, pos, len, quoteStart, quoteLen)) {
<a class="jxr_linenumber" name="787" href="#787">787</a> quoting = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="788" href="#788">788</a> pos += quoteLen;
<a class="jxr_linenumber" name="789" href="#789">789</a> <strong class="jxr_keyword">continue</strong>;
<a class="jxr_linenumber" name="790" href="#790">790</a> }
<a class="jxr_linenumber" name="791" href="#791">791</a>
<a class="jxr_linenumber" name="792" href="#792">792</a> <em class="jxr_comment">// check for ignored (outside quotes), and ignore</em>
-<a class="jxr_linenumber" name="793" href="#793">793</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ignoredLen = getIgnoredMatcher().isMatch(chars, pos, start, len);
+<a class="jxr_linenumber" name="793" href="#793">793</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ignoredLen = getIgnoredMatcher().isMatch(srcChars, pos, start, len);
<a class="jxr_linenumber" name="794" href="#794">794</a> <strong class="jxr_keyword">if</strong> (ignoredLen > 0) {
<a class="jxr_linenumber" name="795" href="#795">795</a> pos += ignoredLen;
<a class="jxr_linenumber" name="796" href="#796">796</a> <strong class="jxr_keyword">continue</strong>;
@@ -809,21 +809,21 @@
<a class="jxr_linenumber" name="799" href="#799">799</a> <em class="jxr_comment">// check for trimmed character</em>
<a class="jxr_linenumber" name="800" href="#800">800</a> <em class="jxr_comment">// don't yet know if its at the end, so copy to workArea</em>
<a class="jxr_linenumber" name="801" href="#801">801</a> <em class="jxr_comment">// use trimStart to keep track of trim at the end</em>
-<a class="jxr_linenumber" name="802" href="#802">802</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> trimmedLen = getTrimmerMatcher().isMatch(chars, pos, start, len);
+<a class="jxr_linenumber" name="802" href="#802">802</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> trimmedLen = getTrimmerMatcher().isMatch(srcChars, pos, start, len);
<a class="jxr_linenumber" name="803" href="#803">803</a> <strong class="jxr_keyword">if</strong> (trimmedLen > 0) {
-<a class="jxr_linenumber" name="804" href="#804">804</a> workArea.append(chars, pos, trimmedLen);
+<a class="jxr_linenumber" name="804" href="#804">804</a> workArea.append(srcChars, pos, trimmedLen);
<a class="jxr_linenumber" name="805" href="#805">805</a> pos += trimmedLen;
<a class="jxr_linenumber" name="806" href="#806">806</a> <strong class="jxr_keyword">continue</strong>;
<a class="jxr_linenumber" name="807" href="#807">807</a> }
<a class="jxr_linenumber" name="808" href="#808">808</a>
<a class="jxr_linenumber" name="809" href="#809">809</a> <em class="jxr_comment">// copy regular character from outside quotes</em>
-<a class="jxr_linenumber" name="810" href="#810">810</a> workArea.append(chars[pos++]);
+<a class="jxr_linenumber" name="810" href="#810">810</a> workArea.append(srcChars[pos++]);
<a class="jxr_linenumber" name="811" href="#811">811</a> trimStart = workArea.size();
<a class="jxr_linenumber" name="812" href="#812">812</a> }
<a class="jxr_linenumber" name="813" href="#813">813</a> }
<a class="jxr_linenumber" name="814" href="#814">814</a>
<a class="jxr_linenumber" name="815" href="#815">815</a> <em class="jxr_comment">// return condition when end of string found</em>
-<a class="jxr_linenumber" name="816" href="#816">816</a> addToken(tokens, workArea.substring(0, trimStart));
+<a class="jxr_linenumber" name="816" href="#816">816</a> addToken(tokenList, workArea.substring(0, trimStart));
<a class="jxr_linenumber" name="817" href="#817">817</a> <strong class="jxr_keyword">return</strong> -1;
<a class="jxr_linenumber" name="818" href="#818">818</a> }
<a class="jxr_linenumber" name="819" href="#819">819</a>
@@ -831,16 +831,16 @@
<a class="jxr_linenumber" name="821" href="#821">821</a> <em class="jxr_javadoccomment"> * Checks if the characters at the index specified match the quote</em>
<a class="jxr_linenumber" name="822" href="#822">822</a> <em class="jxr_javadoccomment"> * already matched in readNextToken().</em>
<a class="jxr_linenumber" name="823" href="#823">823</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="824" href="#824">824</a> <em class="jxr_javadoccomment"> * @param chars the character array being tokenized</em>
+<a class="jxr_linenumber" name="824" href="#824">824</a> <em class="jxr_javadoccomment"> * @param srcChars the character array being tokenized</em>
<a class="jxr_linenumber" name="825" href="#825">825</a> <em class="jxr_javadoccomment"> * @param pos the position to check for a quote</em>
<a class="jxr_linenumber" name="826" href="#826">826</a> <em class="jxr_javadoccomment"> * @param len the length of the character array being tokenized</em>
<a class="jxr_linenumber" name="827" href="#827">827</a> <em class="jxr_javadoccomment"> * @param quoteStart the start position of the matched quote, 0 if no quoting</em>
<a class="jxr_linenumber" name="828" href="#828">828</a> <em class="jxr_javadoccomment"> * @param quoteLen the length of the matched quote, 0 if no quoting</em>
<a class="jxr_linenumber" name="829" href="#829">829</a> <em class="jxr_javadoccomment"> * @return true if a quote is matched</em>
<a class="jxr_linenumber" name="830" href="#830">830</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="831" href="#831">831</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isQuote(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] chars, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pos, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteStart, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen) {
+<a class="jxr_linenumber" name="831" href="#831">831</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isQuote(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">char</strong>[] srcChars, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> pos, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> len, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteStart, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> quoteLen) {
<a class="jxr_linenumber" name="832" href="#832">832</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < quoteLen; i++) {
-<a class="jxr_linenumber" name="833" href="#833">833</a> <strong class="jxr_keyword">if</strong> (pos + i >= len || chars[pos + i] != chars[quoteStart + i]) {
+<a class="jxr_linenumber" name="833" href="#833">833</a> <strong class="jxr_keyword">if</strong> (pos + i >= len || srcChars[pos + i] != srcChars[quoteStart + i]) {
<a class="jxr_linenumber" name="834" href="#834">834</a> <strong class="jxr_keyword">return</strong> false;
<a class="jxr_linenumber" name="835" href="#835">835</a> }
<a class="jxr_linenumber" name="836" href="#836">836</a> }