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