http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
----------------------------------------------------------------------
diff --git
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
index 54afe32..a41172b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html
@@ -217,11 +217,11 @@
<span class="sourceLineNo">209</span><a name="line.209"></a>
<span class="sourceLineNo">210</span> } else if
(typeName.equals("array")) {<a name="line.210"></a>
<span class="sourceLineNo">211</span> if (sType.isObject())<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> o =
parseTableIntoCollection(session, r, (Collection)new ObjectList(session),
sType.getElementType(), pMeta);<a name="line.212"></a>
+<span class="sourceLineNo">212</span> o =
parseTableIntoCollection(session, r, (Collection)new ObjectList(session),
sType, pMeta);<a name="line.212"></a>
<span class="sourceLineNo">213</span> else if
(sType.isCollection())<a name="line.213"></a>
-<span class="sourceLineNo">214</span> o =
parseTableIntoCollection(session, r,
(Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new
ObjectList(session)), sType.getElementType(), pMeta);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> else if (sType.isArray()) {<a
name="line.215"></a>
-<span class="sourceLineNo">216</span> ArrayList l =
(ArrayList)parseTableIntoCollection(session, r, new ArrayList(),
sType.getElementType(), pMeta);<a name="line.216"></a>
+<span class="sourceLineNo">214</span> o =
parseTableIntoCollection(session, r,
(Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new
ObjectList(session)), sType, pMeta);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> else if (sType.isArray() ||
sType.isArgs()) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> ArrayList l =
(ArrayList)parseTableIntoCollection(session, r, new ArrayList(), sType,
pMeta);<a name="line.216"></a>
<span class="sourceLineNo">217</span> o = session.toArray(sType,
l);<a name="line.217"></a>
<span class="sourceLineNo">218</span> }<a name="line.218"></a>
<span class="sourceLineNo">219</span> else<a name="line.219"></a>
@@ -239,11 +239,11 @@
<span class="sourceLineNo">231</span> sType = eType = cm;<a
name="line.231"></a>
<span class="sourceLineNo">232</span><a name="line.232"></a>
<span class="sourceLineNo">233</span> if (sType.isObject())<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> o =
parseIntoCollection(session, r, (Collection)new ObjectList(session),
sType.getElementType(), pMeta);<a name="line.234"></a>
+<span class="sourceLineNo">234</span> o =
parseIntoCollection(session, r, new ObjectList(session), sType, pMeta);<a
name="line.234"></a>
<span class="sourceLineNo">235</span> else if (sType.isCollection() ||
sType.isObject())<a name="line.235"></a>
-<span class="sourceLineNo">236</span> o =
parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer)
? sType.newInstance(outer) : new ObjectList(session)), sType.getElementType(),
pMeta);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> else if (sType.isArray())<a
name="line.237"></a>
-<span class="sourceLineNo">238</span> o = session.toArray(sType,
parseIntoCollection(session, r, new ArrayList(), sType.getElementType(),
pMeta));<a name="line.238"></a>
+<span class="sourceLineNo">236</span> o =
parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer)
? sType.newInstance(outer) : new ObjectList(session)), sType, pMeta);<a
name="line.236"></a>
+<span class="sourceLineNo">237</span> else if (sType.isArray() ||
sType.isArgs())<a name="line.237"></a>
+<span class="sourceLineNo">238</span> o = session.toArray(sType,
parseIntoCollection(session, r, new ArrayList(), sType, pMeta));<a
name="line.238"></a>
<span class="sourceLineNo">239</span> else<a name="line.239"></a>
<span class="sourceLineNo">240</span> isValid = false;<a
name="line.240"></a>
<span class="sourceLineNo">241</span> skipTag(r, xUL);<a
name="line.241"></a>
@@ -348,270 +348,242 @@
<span class="sourceLineNo">340</span> * Precondition: Must be pointing at
event following <ul> event.<a name="line.340"></a>
<span class="sourceLineNo">341</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.341"></a>
<span class="sourceLineNo">342</span> */<a name="line.342"></a>
-<span class="sourceLineNo">343</span> private <E> Collection<E>
parseIntoCollection(HtmlParserSession session, XMLStreamReader r,
Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta)
throws Exception {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> while (true) {<a
name="line.344"></a>
-<span class="sourceLineNo">345</span> HtmlTag tag = nextTag(r, LI,
xUL);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (tag == xUL)<a
name="line.346"></a>
-<span class="sourceLineNo">347</span> break;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> l.add(parseAnything(session,
elementType, r, l, false, pMeta));<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return l;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> /*<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * Reads contents of <ul>
element into an Object array.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * Precondition: Must be pointing at
event following <ul> event.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> */<a name="line.357"></a>
-<span class="sourceLineNo">358</span> private Object[]
parseArgs(HtmlParserSession session, XMLStreamReader r, ClassMeta<?>[]
argTypes) throws Exception {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> HtmlTag tag =
HtmlTag.forEvent(r);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Special case:<a
name="line.361"></a>
-<span class="sourceLineNo">362</span> // Serializing args containing a
single bean (or multiple beans of the same type) will end up serialized as a
<table _type='array'><a name="line.362"></a>
-<span class="sourceLineNo">363</span> if (tag == TABLE) {<a
name="line.363"></a>
-<span class="sourceLineNo">364</span> List<Object> l =
(List<Object>)parseAnything(session, session.getClassMeta(List.class,
argTypes[0]), r, session.getOuter(), true, null);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return l.toArray(new
Object[l.size()]);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> Object[] o = new
Object[argTypes.length];<a name="line.368"></a>
-<span class="sourceLineNo">369</span> int i = 0;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> while (true) {<a
name="line.370"></a>
-<span class="sourceLineNo">371</span> tag = nextTag(r, LI, xUL);<a
name="line.371"></a>
-<span class="sourceLineNo">372</span> if (tag == xUL)<a
name="line.372"></a>
-<span class="sourceLineNo">373</span> break;<a name="line.373"></a>
-<span class="sourceLineNo">374</span> o[i] = parseAnything(session,
argTypes[i], r, session.getOuter(), false, null);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> i++;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> }<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return o;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /*<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Reads contents of <ul>
element.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Precondition: Must be pointing at
event following <ul> event.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.383"></a>
-<span class="sourceLineNo">384</span> */<a name="line.384"></a>
-<span class="sourceLineNo">385</span> private <E> Collection<E>
parseTableIntoCollection(HtmlParserSession session, XMLStreamReader r,
Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta)
throws Exception {<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> if (elementType == null)<a
name="line.387"></a>
-<span class="sourceLineNo">388</span> elementType =
(ClassMeta<E>)object();<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> HtmlTag tag = nextTag(r, TR);<a
name="line.390"></a>
-<span class="sourceLineNo">391</span> List<String> keys = new
ArrayList<String>();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> while (true) {<a
name="line.392"></a>
-<span class="sourceLineNo">393</span> tag = nextTag(r, TH, xTR);<a
name="line.393"></a>
-<span class="sourceLineNo">394</span> if (tag == xTR)<a
name="line.394"></a>
-<span class="sourceLineNo">395</span> break;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>
keys.add(session.getElementText(r));<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> while (true) {<a
name="line.399"></a>
-<span class="sourceLineNo">400</span> r.nextTag();<a
name="line.400"></a>
-<span class="sourceLineNo">401</span> tag = HtmlTag.forEvent(r);<a
name="line.401"></a>
-<span class="sourceLineNo">402</span> if (tag == xTABLE)<a
name="line.402"></a>
-<span class="sourceLineNo">403</span> break;<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> String type = getAttribute(r,
session.getBeanTypePropertyName(), null);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> ClassMeta elementType2 =
session.getClassMeta(type, pMeta, null);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (elementType2 != null)<a
name="line.407"></a>
-<span class="sourceLineNo">408</span> elementType = elementType2;<a
name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> if
(elementType.canCreateNewBean(l)) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> BeanMap m =
session.newBeanMap(l, elementType.getInnerClass());<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (int i = 0; i <
keys.size(); i++) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> tag = nextTag(r, TD,
NULL);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (tag == NULL) {<a
name="line.414"></a>
-<span class="sourceLineNo">415</span> m = null;<a
name="line.415"></a>
-<span class="sourceLineNo">416</span> nextTag(r, xNULL);<a
name="line.416"></a>
-<span class="sourceLineNo">417</span> break;<a
name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span> String key =
keys.get(i);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> BeanMapEntry e =
m.getProperty(key);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> if (e == null) {<a
name="line.421"></a>
-<span class="sourceLineNo">422</span>
//onUnknownProperty(key, m, -1, -1);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> parseAnything(session,
object(), r, l, false, null);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a
name="line.424"></a>
-<span class="sourceLineNo">425</span> BeanPropertyMeta bpm =
e.getMeta();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> ClassMeta<?> cm =
bpm.getClassMeta();<a name="line.426"></a>
-<span class="sourceLineNo">427</span> Object value =
parseAnything(session, cm, r, m.getBean(false), false, bpm);<a
name="line.427"></a>
-<span class="sourceLineNo">428</span> setName(cm, value,
key);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> bpm.set(m, value);<a
name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> l.add(m == null ? null :
(E)m.getBean());<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> String c =
getAttributes(r).get(session.getBeanTypePropertyName());<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Map m =
(Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ?
elementType.newInstance(l) : new ObjectMap(session));<a name="line.435"></a>
-<span class="sourceLineNo">436</span> for (int i = 0; i <
keys.size(); i++) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> tag = nextTag(r, TD,
NULL);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (tag == NULL) {<a
name="line.438"></a>
-<span class="sourceLineNo">439</span> m = null;<a
name="line.439"></a>
-<span class="sourceLineNo">440</span> nextTag(r, xNULL);<a
name="line.440"></a>
-<span class="sourceLineNo">441</span> break;<a
name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> String key =
keys.get(i);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (m != null) {<a
name="line.444"></a>
-<span class="sourceLineNo">445</span> ClassMeta<?> kt =
elementType.getKeyType(), vt = elementType.getValueType();<a
name="line.445"></a>
-<span class="sourceLineNo">446</span> Object value =
parseAnything(session, vt, r, l, false, pMeta);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> setName(vt, value,
key);<a name="line.447"></a>
-<span class="sourceLineNo">448</span>
m.put(session.convertToType(key, kt), value);<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> if (m != null && c !=
null) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> ObjectMap m2 = (m
instanceof ObjectMap ? (ObjectMap)m : new
ObjectMap(m).setBeanSession(session));<a name="line.452"></a>
-<span class="sourceLineNo">453</span>
m2.put(session.getBeanTypePropertyName(), c);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> l.add((E)session.cast(m2,
pMeta, null));<a name="line.454"></a>
-<span class="sourceLineNo">455</span> } else {<a
name="line.455"></a>
-<span class="sourceLineNo">456</span> l.add((E)m);<a
name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> nextTag(r, xTR);<a
name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span> return l;<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> /*<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * Reads contents of <table>
element.<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * Precondition: Must be pointing at
event following <table> event.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> */<a name="line.468"></a>
-<span class="sourceLineNo">469</span> private <T> BeanMap<T>
parseIntoBean(HtmlParserSession session, XMLStreamReader r, BeanMap<T> m)
throws Exception {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> while (true) {<a
name="line.470"></a>
-<span class="sourceLineNo">471</span> HtmlTag tag = nextTag(r, TR,
xTABLE);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (tag == xTABLE)<a
name="line.472"></a>
-<span class="sourceLineNo">473</span> break;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> tag = nextTag(r, TD, TH);<a
name="line.474"></a>
-<span class="sourceLineNo">475</span> // Skip over the column
headers.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> if (tag == TH) {<a
name="line.476"></a>
-<span class="sourceLineNo">477</span> skipTag(r);<a
name="line.477"></a>
-<span class="sourceLineNo">478</span> r.nextTag();<a
name="line.478"></a>
-<span class="sourceLineNo">479</span> skipTag(r);<a
name="line.479"></a>
-<span class="sourceLineNo">480</span> } else {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> String key =
session.getElementText(r);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> nextTag(r, TD);<a
name="line.482"></a>
-<span class="sourceLineNo">483</span> BeanPropertyMeta pMeta =
m.getPropertyMeta(key);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> if (pMeta == null) {<a
name="line.484"></a>
-<span class="sourceLineNo">485</span> onUnknownProperty(session,
key, m, -1, -1);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> parseAnything(session,
object(), r, null, false, null);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else {<a
name="line.487"></a>
-<span class="sourceLineNo">488</span> ClassMeta<?> cm =
pMeta.getClassMeta();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> Object value =
parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a
name="line.489"></a>
-<span class="sourceLineNo">490</span> setName(cm, value, key);<a
name="line.490"></a>
-<span class="sourceLineNo">491</span> pMeta.set(m, value);<a
name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> nextTag(r, xTR);<a
name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span> return m;<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">343</span> private <E> Collection<E>
parseIntoCollection(HtmlParserSession session, XMLStreamReader r,
Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws
Exception {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> int argIndex = 0;<a
name="line.344"></a>
+<span class="sourceLineNo">345</span> while (true) {<a
name="line.345"></a>
+<span class="sourceLineNo">346</span> HtmlTag tag = nextTag(r, LI,
xUL);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (tag == xUL)<a
name="line.347"></a>
+<span class="sourceLineNo">348</span> break;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> ClassMeta<?> elementType =
type.isArgs() ? type.getArg(argIndex++) : type.getElementType();<a
name="line.349"></a>
+<span class="sourceLineNo">350</span> l.add((E)parseAnything(session,
elementType, r, l, false, pMeta));<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return l;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> /*<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * Reads contents of <ul>
element.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> * Precondition: Must be pointing at
event following <ul> event.<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.358"></a>
+<span class="sourceLineNo">359</span> */<a name="line.359"></a>
+<span class="sourceLineNo">360</span> private <E> Collection<E>
parseTableIntoCollection(HtmlParserSession session, XMLStreamReader r,
Collection<E> l, ClassMeta<E> type, BeanPropertyMeta pMeta) throws
Exception {<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> HtmlTag tag = nextTag(r, TR);<a
name="line.362"></a>
+<span class="sourceLineNo">363</span> List<String> keys = new
ArrayList<String>();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> while (true) {<a
name="line.364"></a>
+<span class="sourceLineNo">365</span> tag = nextTag(r, TH, xTR);<a
name="line.365"></a>
+<span class="sourceLineNo">366</span> if (tag == xTR)<a
name="line.366"></a>
+<span class="sourceLineNo">367</span> break;<a name="line.367"></a>
+<span class="sourceLineNo">368</span>
keys.add(session.getElementText(r));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> int argIndex = 0;<a
name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> while (true) {<a
name="line.373"></a>
+<span class="sourceLineNo">374</span> r.nextTag();<a
name="line.374"></a>
+<span class="sourceLineNo">375</span> tag = HtmlTag.forEvent(r);<a
name="line.375"></a>
+<span class="sourceLineNo">376</span> if (tag == xTABLE)<a
name="line.376"></a>
+<span class="sourceLineNo">377</span> break;<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> ClassMeta elementType = null;<a
name="line.379"></a>
+<span class="sourceLineNo">380</span> String beanType =
getAttribute(r, session.getBeanTypePropertyName(), null);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (beanType != null)<a
name="line.381"></a>
+<span class="sourceLineNo">382</span> elementType =
session.getClassMeta(beanType, pMeta, null);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (elementType == null)<a
name="line.383"></a>
+<span class="sourceLineNo">384</span> elementType = type.isArgs() ?
type.getArg(argIndex++) : type.getElementType();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (elementType == null)<a
name="line.385"></a>
+<span class="sourceLineNo">386</span> elementType =
session.object();<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> if
(elementType.canCreateNewBean(l)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> BeanMap m =
session.newBeanMap(l, elementType.getInnerClass());<a name="line.389"></a>
+<span class="sourceLineNo">390</span> for (int i = 0; i <
keys.size(); i++) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> tag = nextTag(r, TD,
NULL);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> if (tag == NULL) {<a
name="line.392"></a>
+<span class="sourceLineNo">393</span> m = null;<a
name="line.393"></a>
+<span class="sourceLineNo">394</span> nextTag(r, xNULL);<a
name="line.394"></a>
+<span class="sourceLineNo">395</span> break;<a
name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> String key =
keys.get(i);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> BeanMapEntry e =
m.getProperty(key);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (e == null) {<a
name="line.399"></a>
+<span class="sourceLineNo">400</span>
//onUnknownProperty(key, m, -1, -1);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> parseAnything(session,
object(), r, l, false, null);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> } else {<a
name="line.402"></a>
+<span class="sourceLineNo">403</span> BeanPropertyMeta bpm =
e.getMeta();<a name="line.403"></a>
+<span class="sourceLineNo">404</span> ClassMeta<?> cm =
bpm.getClassMeta();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> Object value =
parseAnything(session, cm, r, m.getBean(false), false, bpm);<a
name="line.405"></a>
+<span class="sourceLineNo">406</span> setName(cm, value,
key);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> bpm.set(m, value);<a
name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> l.add(m == null ? null :
(E)m.getBean());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> } else {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> String c =
getAttributes(r).get(session.getBeanTypePropertyName());<a name="line.412"></a>
+<span class="sourceLineNo">413</span> Map m =
(Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ?
elementType.newInstance(l) : new ObjectMap(session));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> for (int i = 0; i <
keys.size(); i++) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> tag = nextTag(r, TD,
NULL);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (tag == NULL) {<a
name="line.416"></a>
+<span class="sourceLineNo">417</span> m = null;<a
name="line.417"></a>
+<span class="sourceLineNo">418</span> nextTag(r, xNULL);<a
name="line.418"></a>
+<span class="sourceLineNo">419</span> break;<a
name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> String key =
keys.get(i);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (m != null) {<a
name="line.422"></a>
+<span class="sourceLineNo">423</span> ClassMeta<?> kt =
elementType.getKeyType(), vt = elementType.getValueType();<a
name="line.423"></a>
+<span class="sourceLineNo">424</span> Object value =
parseAnything(session, vt, r, l, false, pMeta);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> setName(vt, value,
key);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>
m.put(session.convertToType(key, kt), value);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (m != null && c !=
null) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> ObjectMap m2 = (m
instanceof ObjectMap ? (ObjectMap)m : new
ObjectMap(m).setBeanSession(session));<a name="line.430"></a>
+<span class="sourceLineNo">431</span>
m2.put(session.getBeanTypePropertyName(), c);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> l.add((E)session.cast(m2,
pMeta, null));<a name="line.432"></a>
+<span class="sourceLineNo">433</span> } else {<a
name="line.433"></a>
+<span class="sourceLineNo">434</span> l.add((E)m);<a
name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span> nextTag(r, xTR);<a
name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return l;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /*<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * Reads contents of <table>
element.<a name="line.443"></a>
+<span class="sourceLineNo">444</span> * Precondition: Must be pointing at
event following <table> event.<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Postcondition: Pointing at next
START_ELEMENT or END_DOCUMENT event.<a name="line.445"></a>
+<span class="sourceLineNo">446</span> */<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private <T> BeanMap<T>
parseIntoBean(HtmlParserSession session, XMLStreamReader r, BeanMap<T> m)
throws Exception {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> while (true) {<a
name="line.448"></a>
+<span class="sourceLineNo">449</span> HtmlTag tag = nextTag(r, TR,
xTABLE);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (tag == xTABLE)<a
name="line.450"></a>
+<span class="sourceLineNo">451</span> break;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> tag = nextTag(r, TD, TH);<a
name="line.452"></a>
+<span class="sourceLineNo">453</span> // Skip over the column
headers.<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (tag == TH) {<a
name="line.454"></a>
+<span class="sourceLineNo">455</span> skipTag(r);<a
name="line.455"></a>
+<span class="sourceLineNo">456</span> r.nextTag();<a
name="line.456"></a>
+<span class="sourceLineNo">457</span> skipTag(r);<a
name="line.457"></a>
+<span class="sourceLineNo">458</span> } else {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> String key =
session.getElementText(r);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> nextTag(r, TD);<a
name="line.460"></a>
+<span class="sourceLineNo">461</span> BeanPropertyMeta pMeta =
m.getPropertyMeta(key);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> if (pMeta == null) {<a
name="line.462"></a>
+<span class="sourceLineNo">463</span> onUnknownProperty(session,
key, m, -1, -1);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> parseAnything(session,
object(), r, null, false, null);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> } else {<a
name="line.465"></a>
+<span class="sourceLineNo">466</span> ClassMeta<?> cm =
pMeta.getClassMeta();<a name="line.466"></a>
+<span class="sourceLineNo">467</span> Object value =
parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a
name="line.467"></a>
+<span class="sourceLineNo">468</span> setName(cm, value, key);<a
name="line.468"></a>
+<span class="sourceLineNo">469</span> pMeta.set(m, value);<a
name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> nextTag(r, xTR);<a
name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> return m;<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> /*<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * Reads the next tag. Advances past
anything that's not a start or end tag. Throws an exception if<a
name="line.478"></a>
+<span class="sourceLineNo">479</span> * it's not one of the expected
tags.<a name="line.479"></a>
+<span class="sourceLineNo">480</span> * Precondition: Must be pointing
before the event we want to parse.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * Postcondition: Pointing at the tag
just parsed.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> */<a name="line.482"></a>
+<span class="sourceLineNo">483</span> private static HtmlTag
nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a
name="line.483"></a>
+<span class="sourceLineNo">484</span> int et = r.next();<a
name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> while (et != START_ELEMENT
&& et != END_ELEMENT && et != END_DOCUMENT)<a
name="line.486"></a>
+<span class="sourceLineNo">487</span> et = r.next();<a
name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (et == END_DOCUMENT)<a
name="line.489"></a>
+<span class="sourceLineNo">490</span> throw new
XMLStreamException("Unexpected end of document: " + r.getLocation());<a
name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> HtmlTag tag =
HtmlTag.forEvent(r);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (expected.length == 0)<a
name="line.493"></a>
+<span class="sourceLineNo">494</span> return tag;<a
name="line.494"></a>
+<span class="sourceLineNo">495</span> for (HtmlTag t : expected)<a
name="line.495"></a>
+<span class="sourceLineNo">496</span> if (t == tag)<a
name="line.496"></a>
+<span class="sourceLineNo">497</span> return tag;<a
name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> /*<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * Reads the next tag. Advances past
anything that's not a start or end tag. Throws an exception if<a
name="line.500"></a>
-<span class="sourceLineNo">501</span> * it's not one of the expected
tags.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * Precondition: Must be pointing
before the event we want to parse.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * Postcondition: Pointing at the tag
just parsed.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> */<a name="line.504"></a>
-<span class="sourceLineNo">505</span> private static HtmlTag
nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a
name="line.505"></a>
-<span class="sourceLineNo">506</span> int et = r.next();<a
name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> while (et != START_ELEMENT
&& et != END_ELEMENT && et != END_DOCUMENT)<a
name="line.508"></a>
-<span class="sourceLineNo">509</span> et = r.next();<a
name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span> if (et == END_DOCUMENT)<a
name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new
XMLStreamException("Unexpected end of document: " + r.getLocation());<a
name="line.512"></a>
+<span class="sourceLineNo">499</span> throw new
XMLStreamException("Unexpected tag: " + tag + ". Expected one of the
following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a
name="line.499"></a>
+<span class="sourceLineNo">500</span> }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> /**<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * Skips over the current element and
advances to the next element.<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * <p><a name="line.504"></a>
+<span class="sourceLineNo">505</span> * Precondition: Pointing to opening
tag.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * Postcondition: Pointing to next
opening tag.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> *<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * @param r The stream being read
from.<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * @throws XMLStreamException<a
name="line.509"></a>
+<span class="sourceLineNo">510</span> */<a name="line.510"></a>
+<span class="sourceLineNo">511</span> private static void
skipTag(XMLStreamReader r) throws XMLStreamException {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> int et = r.getEventType();<a
name="line.512"></a>
<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span> HtmlTag tag =
HtmlTag.forEvent(r);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (expected.length == 0)<a
name="line.515"></a>
-<span class="sourceLineNo">516</span> return tag;<a
name="line.516"></a>
-<span class="sourceLineNo">517</span> for (HtmlTag t : expected)<a
name="line.517"></a>
-<span class="sourceLineNo">518</span> if (t == tag)<a
name="line.518"></a>
-<span class="sourceLineNo">519</span> return tag;<a
name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> throw new
XMLStreamException("Unexpected tag: " + tag + ". Expected one of the
following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a
name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Skips over the current element and
advances to the next element.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <p><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Precondition: Pointing to opening
tag.<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * Postcondition: Pointing to next
opening tag.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * @param r The stream being read
from.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * @throws XMLStreamException<a
name="line.531"></a>
-<span class="sourceLineNo">532</span> */<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private static void
skipTag(XMLStreamReader r) throws XMLStreamException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> int et = r.getEventType();<a
name="line.534"></a>
+<span class="sourceLineNo">514</span> if (et != START_ELEMENT)<a
name="line.514"></a>
+<span class="sourceLineNo">515</span> throw new
XMLStreamException("skipToNextTag() call on invalid event
["+XmlUtils.toReadableEvent(r)+"]. Must only be called on START_ELEMENT
events.");<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> String n = r.getLocalName();<a
name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span> int depth = 0;<a
name="line.519"></a>
+<span class="sourceLineNo">520</span> while (true) {<a
name="line.520"></a>
+<span class="sourceLineNo">521</span> et = r.next();<a
name="line.521"></a>
+<span class="sourceLineNo">522</span> if (et == START_ELEMENT) {<a
name="line.522"></a>
+<span class="sourceLineNo">523</span> String n2 =
r.getLocalName();<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (n.equals(n2))<a
name="line.524"></a>
+<span class="sourceLineNo">525</span> depth++;<a
name="line.525"></a>
+<span class="sourceLineNo">526</span> } else if (et == END_ELEMENT)
{<a name="line.526"></a>
+<span class="sourceLineNo">527</span> String n2 =
r.getLocalName();<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (n.equals(n2))<a
name="line.528"></a>
+<span class="sourceLineNo">529</span> depth--;<a
name="line.529"></a>
+<span class="sourceLineNo">530</span> if (depth < 0)<a
name="line.530"></a>
+<span class="sourceLineNo">531</span> return;<a
name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span> }<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> if (et != START_ELEMENT)<a
name="line.536"></a>
-<span class="sourceLineNo">537</span> throw new
XMLStreamException("skipToNextTag() call on invalid event
["+XmlUtils.toReadableEvent(r)+"]. Must only be called on START_ELEMENT
events.");<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> String n = r.getLocalName();<a
name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> int depth = 0;<a
name="line.541"></a>
-<span class="sourceLineNo">542</span> while (true) {<a
name="line.542"></a>
-<span class="sourceLineNo">543</span> et = r.next();<a
name="line.543"></a>
-<span class="sourceLineNo">544</span> if (et == START_ELEMENT) {<a
name="line.544"></a>
-<span class="sourceLineNo">545</span> String n2 =
r.getLocalName();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (n.equals(n2))<a
name="line.546"></a>
-<span class="sourceLineNo">547</span> depth++;<a
name="line.547"></a>
-<span class="sourceLineNo">548</span> } else if (et == END_ELEMENT)
{<a name="line.548"></a>
-<span class="sourceLineNo">549</span> String n2 =
r.getLocalName();<a name="line.549"></a>
-<span class="sourceLineNo">550</span> if (n.equals(n2))<a
name="line.550"></a>
-<span class="sourceLineNo">551</span> depth--;<a
name="line.551"></a>
-<span class="sourceLineNo">552</span> if (depth < 0)<a
name="line.552"></a>
-<span class="sourceLineNo">553</span> return;<a
name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> private static void
skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a
name="line.558"></a>
-<span class="sourceLineNo">559</span> HtmlTag tag =
HtmlTag.forEvent(r);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> if (tag.isOneOf(expected))<a
name="line.560"></a>
-<span class="sourceLineNo">561</span> r.next();<a name="line.561"></a>
-<span class="sourceLineNo">562</span> else<a name="line.562"></a>
-<span class="sourceLineNo">563</span> throw new
XMLStreamException("Unexpected tag: " + tag + ". Expected one of the
following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a
name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> private static int
skipWs(XMLStreamReader r) throws XMLStreamException {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> int event = r.getEventType();<a
name="line.567"></a>
-<span class="sourceLineNo">568</span> while (event != START_ELEMENT
&& event != END_ELEMENT && event != END_DOCUMENT &&
r.isWhiteSpace())<a name="line.568"></a>
-<span class="sourceLineNo">569</span> event = r.next();<a
name="line.569"></a>
-<span class="sourceLineNo">570</span> return event;<a name="line.570"></a>
+<span class="sourceLineNo">536</span> private static void
skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a
name="line.536"></a>
+<span class="sourceLineNo">537</span> HtmlTag tag =
HtmlTag.forEvent(r);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> if (tag.isOneOf(expected))<a
name="line.538"></a>
+<span class="sourceLineNo">539</span> r.next();<a name="line.539"></a>
+<span class="sourceLineNo">540</span> else<a name="line.540"></a>
+<span class="sourceLineNo">541</span> throw new
XMLStreamException("Unexpected tag: " + tag + ". Expected one of the
following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a
name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> private static int
skipWs(XMLStreamReader r) throws XMLStreamException {<a name="line.544"></a>
+<span class="sourceLineNo">545</span> int event = r.getEventType();<a
name="line.545"></a>
+<span class="sourceLineNo">546</span> while (event != START_ELEMENT
&& event != END_ELEMENT && event != END_DOCUMENT &&
r.isWhiteSpace())<a name="line.546"></a>
+<span class="sourceLineNo">547</span> event = r.next();<a
name="line.547"></a>
+<span class="sourceLineNo">548</span> return event;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> }<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span>
//--------------------------------------------------------------------------------<a
name="line.552"></a>
+<span class="sourceLineNo">553</span> // Entry point methods<a
name="line.553"></a>
+<span class="sourceLineNo">554</span>
//--------------------------------------------------------------------------------<a
name="line.554"></a>
+<span class="sourceLineNo">555</span><a name="line.555"></a>
+<span class="sourceLineNo">556</span> @Override /* Parser */<a
name="line.556"></a>
+<span class="sourceLineNo">557</span> public HtmlParserSession
createSession(Object input, ObjectMap op, Method javaMethod, Object outer,
Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> return new HtmlParserSession(ctx,
op, input, javaMethod, outer, locale, timeZone, mediaType);<a
name="line.558"></a>
+<span class="sourceLineNo">559</span> }<a name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> @Override /* Parser */<a
name="line.561"></a>
+<span class="sourceLineNo">562</span> protected <T> T
doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a
name="line.562"></a>
+<span class="sourceLineNo">563</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return parseAnything(s, type,
s.getXmlStreamReader(), s.getOuter(), true, null);<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> @Override /* ReaderParser */<a
name="line.567"></a>
+<span class="sourceLineNo">568</span> protected <K,V> Map<K,V>
doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type
valueType) throws Exception {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.569"></a>
+<span class="sourceLineNo">570</span> return parseIntoMap(s,
s.getXmlStreamReader(), m, (ClassMeta<K>)s.getClassMeta(keyType),
(ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.570"></a>
<span class="sourceLineNo">571</span> }<a name="line.571"></a>
<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span>
//--------------------------------------------------------------------------------<a
name="line.574"></a>
-<span class="sourceLineNo">575</span> // Entry point methods<a
name="line.575"></a>
-<span class="sourceLineNo">576</span>
//--------------------------------------------------------------------------------<a
name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> @Override /* Parser */<a
name="line.578"></a>
-<span class="sourceLineNo">579</span> public HtmlParserSession
createSession(Object input, ObjectMap op, Method javaMethod, Object outer,
Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> return new HtmlParserSession(ctx,
op, input, javaMethod, outer, locale, timeZone, mediaType);<a
name="line.580"></a>
-<span class="sourceLineNo">581</span> }<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span> @Override /* Parser */<a
name="line.583"></a>
-<span class="sourceLineNo">584</span> protected <T> T
doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a
name="line.584"></a>
-<span class="sourceLineNo">585</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return parseAnything(s, type,
s.getXmlStreamReader(), s.getOuter(), true, null);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span> @Override /* ReaderParser */<a
name="line.589"></a>
-<span class="sourceLineNo">590</span> protected <K,V> Map<K,V>
doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type
valueType) throws Exception {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return parseIntoMap(s,
s.getXmlStreamReader(), m, (ClassMeta<K>)s.getClassMeta(keyType),
(ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> @Override /* ReaderParser */<a
name="line.595"></a>
-<span class="sourceLineNo">596</span> protected <E>
Collection<E> doParseIntoCollection(ParserSession session,
Collection<E> c, Type elementType) throws Exception {<a
name="line.596"></a>
-<span class="sourceLineNo">597</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.597"></a>
-<span class="sourceLineNo">598</span> return parseIntoCollection(s,
s.getXmlStreamReader(), c, (ClassMeta<E>)s.getClassMeta(elementType),
null);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span> @Override /* ReaderParser */<a
name="line.601"></a>
-<span class="sourceLineNo">602</span> protected Object[]
doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws
Exception {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return parseArgs(s,
s.getXmlStreamReader(), argTypes);<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span>}<a name="line.606"></a>
+<span class="sourceLineNo">573</span> @Override /* ReaderParser */<a
name="line.573"></a>
+<span class="sourceLineNo">574</span> protected <E>
Collection<E> doParseIntoCollection(ParserSession session,
Collection<E> c, Type elementType) throws Exception {<a
name="line.574"></a>
+<span class="sourceLineNo">575</span> HtmlParserSession s =
(HtmlParserSession)session;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return parseIntoCollection(s,
s.getXmlStreamReader(), c, s.getClassMeta(elementType), null);<a
name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span>}<a name="line.578"></a>
