http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/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 8c98b2a..54afe32 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 @@ -119,461 +119,499 @@ <span class="sourceLineNo">111</span> boolean isValid = true;<a name="line.111"></a> <span class="sourceLineNo">112</span> HtmlTag tag = (event == CHARACTERS ? null : HtmlTag.forString(r.getName().getLocalPart(), false));<a name="line.112"></a> <span class="sourceLineNo">113</span><a name="line.113"></a> -<span class="sourceLineNo">114</span> if (isEmpty) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> o = "";<a name="line.115"></a> -<span class="sourceLineNo">116</span> } else if (tag == null || tag.isOneOf(BR,BS,FF,SP)) {<a name="line.116"></a> -<span class="sourceLineNo">117</span> String text = session.parseText(r);<a name="line.117"></a> -<span class="sourceLineNo">118</span> if (sType.isObject() || sType.isCharSequence())<a name="line.118"></a> -<span class="sourceLineNo">119</span> o = text;<a name="line.119"></a> -<span class="sourceLineNo">120</span> else if (sType.isChar())<a name="line.120"></a> -<span class="sourceLineNo">121</span> o = text.charAt(0);<a name="line.121"></a> -<span class="sourceLineNo">122</span> else if (sType.isBoolean())<a name="line.122"></a> -<span class="sourceLineNo">123</span> o = Boolean.parseBoolean(text);<a name="line.123"></a> -<span class="sourceLineNo">124</span> else if (sType.isNumber())<a name="line.124"></a> -<span class="sourceLineNo">125</span> o = parseNumber(text, (Class<? extends Number>)eType.getInnerClass());<a name="line.125"></a> -<span class="sourceLineNo">126</span> else if (sType.canCreateNewInstanceFromString(outer))<a name="line.126"></a> -<span class="sourceLineNo">127</span> o = sType.newInstanceFromString(outer, text);<a name="line.127"></a> -<span class="sourceLineNo">128</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.128"></a> -<span class="sourceLineNo">129</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.129"></a> -<span class="sourceLineNo">130</span> else<a name="line.130"></a> -<span class="sourceLineNo">131</span> isValid = false;<a name="line.131"></a> -<span class="sourceLineNo">132</span><a name="line.132"></a> -<span class="sourceLineNo">133</span> } else if (tag == STRING) {<a name="line.133"></a> -<span class="sourceLineNo">134</span> String text = session.getElementText(r);<a name="line.134"></a> -<span class="sourceLineNo">135</span> if (sType.isObject() || sType.isCharSequence())<a name="line.135"></a> -<span class="sourceLineNo">136</span> o = text;<a name="line.136"></a> -<span class="sourceLineNo">137</span> else if (sType.isChar())<a name="line.137"></a> -<span class="sourceLineNo">138</span> o = text.charAt(0);<a name="line.138"></a> -<span class="sourceLineNo">139</span> else if (sType.canCreateNewInstanceFromString(outer))<a name="line.139"></a> -<span class="sourceLineNo">140</span> o = sType.newInstanceFromString(outer, text);<a name="line.140"></a> -<span class="sourceLineNo">141</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.141"></a> -<span class="sourceLineNo">142</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.142"></a> -<span class="sourceLineNo">143</span> else<a name="line.143"></a> -<span class="sourceLineNo">144</span> isValid = false;<a name="line.144"></a> -<span class="sourceLineNo">145</span> skipTag(r, xSTRING);<a name="line.145"></a> -<span class="sourceLineNo">146</span><a name="line.146"></a> -<span class="sourceLineNo">147</span> } else if (tag == NUMBER) {<a name="line.147"></a> -<span class="sourceLineNo">148</span> String text = session.getElementText(r);<a name="line.148"></a> -<span class="sourceLineNo">149</span> if (sType.isObject())<a name="line.149"></a> -<span class="sourceLineNo">150</span> o = parseNumber(text, Number.class);<a name="line.150"></a> -<span class="sourceLineNo">151</span> else if (sType.isNumber())<a name="line.151"></a> -<span class="sourceLineNo">152</span> o = parseNumber(text, (Class<? extends Number>)sType.getInnerClass());<a name="line.152"></a> -<span class="sourceLineNo">153</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.153"></a> -<span class="sourceLineNo">154</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.154"></a> -<span class="sourceLineNo">155</span> else<a name="line.155"></a> -<span class="sourceLineNo">156</span> isValid = false;<a name="line.156"></a> -<span class="sourceLineNo">157</span> skipTag(r, xNUMBER);<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> -<span class="sourceLineNo">159</span> } else if (tag == BOOLEAN) {<a name="line.159"></a> -<span class="sourceLineNo">160</span> String text = session.getElementText(r);<a name="line.160"></a> -<span class="sourceLineNo">161</span> if (sType.isObject() || sType.isBoolean())<a name="line.161"></a> -<span class="sourceLineNo">162</span> o = Boolean.parseBoolean(text);<a name="line.162"></a> -<span class="sourceLineNo">163</span> else<a name="line.163"></a> -<span class="sourceLineNo">164</span> isValid = false;<a name="line.164"></a> -<span class="sourceLineNo">165</span> skipTag(r, xBOOLEAN);<a name="line.165"></a> -<span class="sourceLineNo">166</span><a name="line.166"></a> -<span class="sourceLineNo">167</span> } else if (tag == NULL) {<a name="line.167"></a> -<span class="sourceLineNo">168</span> skipTag(r, NULL);<a name="line.168"></a> -<span class="sourceLineNo">169</span> skipTag(r, xNULL);<a name="line.169"></a> -<span class="sourceLineNo">170</span><a name="line.170"></a> -<span class="sourceLineNo">171</span> } else if (tag == A) {<a name="line.171"></a> -<span class="sourceLineNo">172</span> o = parseAnchor(session, r, eType);<a name="line.172"></a> -<span class="sourceLineNo">173</span> skipTag(r, xA);<a name="line.173"></a> -<span class="sourceLineNo">174</span><a name="line.174"></a> -<span class="sourceLineNo">175</span> } else if (tag == TABLE) {<a name="line.175"></a> -<span class="sourceLineNo">176</span><a name="line.176"></a> -<span class="sourceLineNo">177</span> String typeName = getAttribute(r, session.getBeanTypePropertyName(), "object");<a name="line.177"></a> -<span class="sourceLineNo">178</span> ClassMeta cm = session.getClassMeta(typeName, pMeta, eType);<a name="line.178"></a> +<span class="sourceLineNo">114</span> if (tag == HTML)<a name="line.114"></a> +<span class="sourceLineNo">115</span> tag = skipToData(r);<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> if (isEmpty) {<a name="line.117"></a> +<span class="sourceLineNo">118</span> o = "";<a name="line.118"></a> +<span class="sourceLineNo">119</span> } else if (tag == null || tag.isOneOf(BR,BS,FF,SP)) {<a name="line.119"></a> +<span class="sourceLineNo">120</span> String text = session.parseText(r);<a name="line.120"></a> +<span class="sourceLineNo">121</span> if (sType.isObject() || sType.isCharSequence())<a name="line.121"></a> +<span class="sourceLineNo">122</span> o = text;<a name="line.122"></a> +<span class="sourceLineNo">123</span> else if (sType.isChar())<a name="line.123"></a> +<span class="sourceLineNo">124</span> o = text.charAt(0);<a name="line.124"></a> +<span class="sourceLineNo">125</span> else if (sType.isBoolean())<a name="line.125"></a> +<span class="sourceLineNo">126</span> o = Boolean.parseBoolean(text);<a name="line.126"></a> +<span class="sourceLineNo">127</span> else if (sType.isNumber())<a name="line.127"></a> +<span class="sourceLineNo">128</span> o = parseNumber(text, (Class<? extends Number>)eType.getInnerClass());<a name="line.128"></a> +<span class="sourceLineNo">129</span> else if (sType.canCreateNewInstanceFromString(outer))<a name="line.129"></a> +<span class="sourceLineNo">130</span> o = sType.newInstanceFromString(outer, text);<a name="line.130"></a> +<span class="sourceLineNo">131</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.131"></a> +<span class="sourceLineNo">132</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.132"></a> +<span class="sourceLineNo">133</span> else<a name="line.133"></a> +<span class="sourceLineNo">134</span> isValid = false;<a name="line.134"></a> +<span class="sourceLineNo">135</span><a name="line.135"></a> +<span class="sourceLineNo">136</span> } else if (tag == STRING) {<a name="line.136"></a> +<span class="sourceLineNo">137</span> String text = session.getElementText(r);<a name="line.137"></a> +<span class="sourceLineNo">138</span> if (sType.isObject() || sType.isCharSequence())<a name="line.138"></a> +<span class="sourceLineNo">139</span> o = text;<a name="line.139"></a> +<span class="sourceLineNo">140</span> else if (sType.isChar())<a name="line.140"></a> +<span class="sourceLineNo">141</span> o = text.charAt(0);<a name="line.141"></a> +<span class="sourceLineNo">142</span> else if (sType.canCreateNewInstanceFromString(outer))<a name="line.142"></a> +<span class="sourceLineNo">143</span> o = sType.newInstanceFromString(outer, text);<a name="line.143"></a> +<span class="sourceLineNo">144</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.144"></a> +<span class="sourceLineNo">145</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.145"></a> +<span class="sourceLineNo">146</span> else<a name="line.146"></a> +<span class="sourceLineNo">147</span> isValid = false;<a name="line.147"></a> +<span class="sourceLineNo">148</span> skipTag(r, xSTRING);<a name="line.148"></a> +<span class="sourceLineNo">149</span><a name="line.149"></a> +<span class="sourceLineNo">150</span> } else if (tag == NUMBER) {<a name="line.150"></a> +<span class="sourceLineNo">151</span> String text = session.getElementText(r);<a name="line.151"></a> +<span class="sourceLineNo">152</span> if (sType.isObject())<a name="line.152"></a> +<span class="sourceLineNo">153</span> o = parseNumber(text, Number.class);<a name="line.153"></a> +<span class="sourceLineNo">154</span> else if (sType.isNumber())<a name="line.154"></a> +<span class="sourceLineNo">155</span> o = parseNumber(text, (Class<? extends Number>)sType.getInnerClass());<a name="line.155"></a> +<span class="sourceLineNo">156</span> else if (sType.canCreateNewInstanceFromNumber(outer))<a name="line.156"></a> +<span class="sourceLineNo">157</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));<a name="line.157"></a> +<span class="sourceLineNo">158</span> else<a name="line.158"></a> +<span class="sourceLineNo">159</span> isValid = false;<a name="line.159"></a> +<span class="sourceLineNo">160</span> skipTag(r, xNUMBER);<a name="line.160"></a> +<span class="sourceLineNo">161</span><a name="line.161"></a> +<span class="sourceLineNo">162</span> } else if (tag == BOOLEAN) {<a name="line.162"></a> +<span class="sourceLineNo">163</span> String text = session.getElementText(r);<a name="line.163"></a> +<span class="sourceLineNo">164</span> if (sType.isObject() || sType.isBoolean())<a name="line.164"></a> +<span class="sourceLineNo">165</span> o = Boolean.parseBoolean(text);<a name="line.165"></a> +<span class="sourceLineNo">166</span> else<a name="line.166"></a> +<span class="sourceLineNo">167</span> isValid = false;<a name="line.167"></a> +<span class="sourceLineNo">168</span> skipTag(r, xBOOLEAN);<a name="line.168"></a> +<span class="sourceLineNo">169</span><a name="line.169"></a> +<span class="sourceLineNo">170</span> } else if (tag == P) {<a name="line.170"></a> +<span class="sourceLineNo">171</span> String text = session.getElementText(r);<a name="line.171"></a> +<span class="sourceLineNo">172</span> if (! "No Results".equals(text))<a name="line.172"></a> +<span class="sourceLineNo">173</span> isValid = false;<a name="line.173"></a> +<span class="sourceLineNo">174</span> skipTag(r, xP);<a name="line.174"></a> +<span class="sourceLineNo">175</span><a name="line.175"></a> +<span class="sourceLineNo">176</span> } else if (tag == NULL) {<a name="line.176"></a> +<span class="sourceLineNo">177</span> skipTag(r, NULL);<a name="line.177"></a> +<span class="sourceLineNo">178</span> skipTag(r, xNULL);<a name="line.178"></a> <span class="sourceLineNo">179</span><a name="line.179"></a> -<span class="sourceLineNo">180</span> if (cm != null) {<a name="line.180"></a> -<span class="sourceLineNo">181</span> sType = eType = cm;<a name="line.181"></a> -<span class="sourceLineNo">182</span> typeName = sType.isArray() ? "array" : "object";<a name="line.182"></a> -<span class="sourceLineNo">183</span> } else if (! "array".equals(typeName)) {<a name="line.183"></a> -<span class="sourceLineNo">184</span> // Type name could be a subtype name.<a name="line.184"></a> -<span class="sourceLineNo">185</span> typeName = "object";<a name="line.185"></a> -<span class="sourceLineNo">186</span> }<a name="line.186"></a> -<span class="sourceLineNo">187</span><a name="line.187"></a> -<span class="sourceLineNo">188</span> if (typeName.equals("object")) {<a name="line.188"></a> -<span class="sourceLineNo">189</span> if (sType.isObject()) {<a name="line.189"></a> -<span class="sourceLineNo">190</span> o = parseIntoMap(session, r, (Map)new ObjectMap(session), sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.190"></a> -<span class="sourceLineNo">191</span> } else if (sType.isMap()) {<a name="line.191"></a> -<span class="sourceLineNo">192</span> o = parseIntoMap(session, r, (Map)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectMap(session)), sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.192"></a> -<span class="sourceLineNo">193</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.193"></a> -<span class="sourceLineNo">194</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.194"></a> -<span class="sourceLineNo">195</span> o = parseIntoBean(session, r, m).getBean();<a name="line.195"></a> -<span class="sourceLineNo">196</span> } else {<a name="line.196"></a> -<span class="sourceLineNo">197</span> isValid = false;<a name="line.197"></a> -<span class="sourceLineNo">198</span> }<a name="line.198"></a> -<span class="sourceLineNo">199</span> skipTag(r, xTABLE);<a name="line.199"></a> -<span class="sourceLineNo">200</span><a name="line.200"></a> -<span class="sourceLineNo">201</span> } else if (typeName.equals("array")) {<a name="line.201"></a> -<span class="sourceLineNo">202</span> if (sType.isObject())<a name="line.202"></a> -<span class="sourceLineNo">203</span> o = parseTableIntoCollection(session, r, (Collection)new ObjectList(session), sType.getElementType(), pMeta);<a name="line.203"></a> -<span class="sourceLineNo">204</span> else if (sType.isCollection())<a name="line.204"></a> -<span class="sourceLineNo">205</span> o = parseTableIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType.getElementType(), pMeta);<a name="line.205"></a> -<span class="sourceLineNo">206</span> else if (sType.isArray()) {<a name="line.206"></a> -<span class="sourceLineNo">207</span> ArrayList l = (ArrayList)parseTableIntoCollection(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.207"></a> -<span class="sourceLineNo">208</span> o = session.toArray(sType, l);<a name="line.208"></a> -<span class="sourceLineNo">209</span> }<a name="line.209"></a> -<span class="sourceLineNo">210</span> else<a name="line.210"></a> -<span class="sourceLineNo">211</span> isValid = false;<a name="line.211"></a> -<span class="sourceLineNo">212</span> skipTag(r, xTABLE);<a name="line.212"></a> -<span class="sourceLineNo">213</span><a name="line.213"></a> -<span class="sourceLineNo">214</span> } else {<a name="line.214"></a> -<span class="sourceLineNo">215</span> isValid = false;<a name="line.215"></a> -<span class="sourceLineNo">216</span> }<a name="line.216"></a> -<span class="sourceLineNo">217</span><a name="line.217"></a> -<span class="sourceLineNo">218</span> } else if (tag == UL) {<a name="line.218"></a> -<span class="sourceLineNo">219</span> String typeName = getAttribute(r, session.getBeanTypePropertyName(), "array");<a name="line.219"></a> -<span class="sourceLineNo">220</span> ClassMeta cm = session.getClassMeta(typeName, pMeta, eType);<a name="line.220"></a> -<span class="sourceLineNo">221</span> if (cm != null)<a name="line.221"></a> -<span class="sourceLineNo">222</span> sType = eType = cm;<a name="line.222"></a> -<span class="sourceLineNo">223</span><a name="line.223"></a> -<span class="sourceLineNo">224</span> if (sType.isObject())<a name="line.224"></a> -<span class="sourceLineNo">225</span> o = parseIntoCollection(session, r, (Collection)new ObjectList(session), sType.getElementType(), pMeta);<a name="line.225"></a> -<span class="sourceLineNo">226</span> else if (sType.isCollection() || sType.isObject())<a name="line.226"></a> -<span class="sourceLineNo">227</span> o = parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(session)), sType.getElementType(), pMeta);<a name="line.227"></a> -<span class="sourceLineNo">228</span> else if (sType.isArray())<a name="line.228"></a> -<span class="sourceLineNo">229</span> o = session.toArray(sType, parseIntoCollection(session, r, new ArrayList(), sType.getElementType(), pMeta));<a name="line.229"></a> -<span class="sourceLineNo">230</span> else<a name="line.230"></a> -<span class="sourceLineNo">231</span> isValid = false;<a name="line.231"></a> -<span class="sourceLineNo">232</span> skipTag(r, xUL);<a name="line.232"></a> -<span class="sourceLineNo">233</span><a name="line.233"></a> -<span class="sourceLineNo">234</span> }<a name="line.234"></a> -<span class="sourceLineNo">235</span><a name="line.235"></a> -<span class="sourceLineNo">236</span> if (! isValid)<a name="line.236"></a> -<span class="sourceLineNo">237</span> throw new XMLStreamException("Unexpected tag '"+tag+"' for type '"+eType+"'", r.getLocation());<a name="line.237"></a> -<span class="sourceLineNo">238</span><a name="line.238"></a> -<span class="sourceLineNo">239</span> if (transform != null && o != null)<a name="line.239"></a> -<span class="sourceLineNo">240</span> o = transform.unswap(session, o, eType);<a name="line.240"></a> -<span class="sourceLineNo">241</span><a name="line.241"></a> -<span class="sourceLineNo">242</span> if (outer != null)<a name="line.242"></a> -<span class="sourceLineNo">243</span> setParent(eType, o, outer);<a name="line.243"></a> +<span class="sourceLineNo">180</span> } else if (tag == A) {<a name="line.180"></a> +<span class="sourceLineNo">181</span> o = parseAnchor(session, r, eType);<a name="line.181"></a> +<span class="sourceLineNo">182</span> skipTag(r, xA);<a name="line.182"></a> +<span class="sourceLineNo">183</span><a name="line.183"></a> +<span class="sourceLineNo">184</span> } else if (tag == TABLE) {<a name="line.184"></a> +<span class="sourceLineNo">185</span><a name="line.185"></a> +<span class="sourceLineNo">186</span> String typeName = getAttribute(r, session.getBeanTypePropertyName(), "object");<a name="line.186"></a> +<span class="sourceLineNo">187</span> ClassMeta cm = session.getClassMeta(typeName, pMeta, eType);<a name="line.187"></a> +<span class="sourceLineNo">188</span><a name="line.188"></a> +<span class="sourceLineNo">189</span> if (cm != null) {<a name="line.189"></a> +<span class="sourceLineNo">190</span> sType = eType = cm;<a name="line.190"></a> +<span class="sourceLineNo">191</span> typeName = sType.isArray() ? "array" : "object";<a name="line.191"></a> +<span class="sourceLineNo">192</span> } else if (! "array".equals(typeName)) {<a name="line.192"></a> +<span class="sourceLineNo">193</span> // Type name could be a subtype name.<a name="line.193"></a> +<span class="sourceLineNo">194</span> typeName = "object";<a name="line.194"></a> +<span class="sourceLineNo">195</span> }<a name="line.195"></a> +<span class="sourceLineNo">196</span><a name="line.196"></a> +<span class="sourceLineNo">197</span> if (typeName.equals("object")) {<a name="line.197"></a> +<span class="sourceLineNo">198</span> if (sType.isObject()) {<a name="line.198"></a> +<span class="sourceLineNo">199</span> o = parseIntoMap(session, r, (Map)new ObjectMap(session), sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.199"></a> +<span class="sourceLineNo">200</span> } else if (sType.isMap()) {<a name="line.200"></a> +<span class="sourceLineNo">201</span> o = parseIntoMap(session, r, (Map)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectMap(session)), sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.201"></a> +<span class="sourceLineNo">202</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.202"></a> +<span class="sourceLineNo">203</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.203"></a> +<span class="sourceLineNo">204</span> o = parseIntoBean(session, r, m).getBean();<a name="line.204"></a> +<span class="sourceLineNo">205</span> } else {<a name="line.205"></a> +<span class="sourceLineNo">206</span> isValid = false;<a name="line.206"></a> +<span class="sourceLineNo">207</span> }<a name="line.207"></a> +<span class="sourceLineNo">208</span> skipTag(r, xTABLE);<a name="line.208"></a> +<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">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">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> +<span class="sourceLineNo">220</span> isValid = false;<a name="line.220"></a> +<span class="sourceLineNo">221</span> skipTag(r, xTABLE);<a name="line.221"></a> +<span class="sourceLineNo">222</span><a name="line.222"></a> +<span class="sourceLineNo">223</span> } else {<a name="line.223"></a> +<span class="sourceLineNo">224</span> isValid = false;<a name="line.224"></a> +<span class="sourceLineNo">225</span> }<a name="line.225"></a> +<span class="sourceLineNo">226</span><a name="line.226"></a> +<span class="sourceLineNo">227</span> } else if (tag == UL) {<a name="line.227"></a> +<span class="sourceLineNo">228</span> String typeName = getAttribute(r, session.getBeanTypePropertyName(), "array");<a name="line.228"></a> +<span class="sourceLineNo">229</span> ClassMeta cm = session.getClassMeta(typeName, pMeta, eType);<a name="line.229"></a> +<span class="sourceLineNo">230</span> if (cm != null)<a name="line.230"></a> +<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">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">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> +<span class="sourceLineNo">242</span><a name="line.242"></a> +<span class="sourceLineNo">243</span> }<a name="line.243"></a> <span class="sourceLineNo">244</span><a name="line.244"></a> -<span class="sourceLineNo">245</span> skipWs(r);<a name="line.245"></a> -<span class="sourceLineNo">246</span> return (T)o;<a name="line.246"></a> -<span class="sourceLineNo">247</span> }<a name="line.247"></a> -<span class="sourceLineNo">248</span><a name="line.248"></a> -<span class="sourceLineNo">249</span> private static String getAttribute(XMLStreamReader r, String name, String def) {<a name="line.249"></a> -<span class="sourceLineNo">250</span> for (int i = 0; i < r.getAttributeCount(); i++)<a name="line.250"></a> -<span class="sourceLineNo">251</span> if (r.getAttributeLocalName(i).equals(name))<a name="line.251"></a> -<span class="sourceLineNo">252</span> return r.getAttributeValue(i);<a name="line.252"></a> -<span class="sourceLineNo">253</span> return def;<a name="line.253"></a> -<span class="sourceLineNo">254</span> }<a name="line.254"></a> -<span class="sourceLineNo">255</span><a name="line.255"></a> -<span class="sourceLineNo">256</span> /*<a name="line.256"></a> -<span class="sourceLineNo">257</span> * Reads an anchor tag and converts it into a bean.<a name="line.257"></a> -<span class="sourceLineNo">258</span> */<a name="line.258"></a> -<span class="sourceLineNo">259</span> private static <T> T parseAnchor(HtmlParserSession session, XMLStreamReader r, ClassMeta<T> beanType) throws XMLStreamException {<a name="line.259"></a> -<span class="sourceLineNo">260</span> String href = r.getAttributeValue(null, "href");<a name="line.260"></a> -<span class="sourceLineNo">261</span> String name = session.getElementText(r);<a name="line.261"></a> -<span class="sourceLineNo">262</span> Class<T> beanClass = beanType.getInnerClass();<a name="line.262"></a> -<span class="sourceLineNo">263</span> if (beanClass.isAnnotationPresent(HtmlLink.class)) {<a name="line.263"></a> -<span class="sourceLineNo">264</span> HtmlLink h = beanClass.getAnnotation(HtmlLink.class);<a name="line.264"></a> -<span class="sourceLineNo">265</span> BeanMap<T> m = session.newBeanMap(beanClass);<a name="line.265"></a> -<span class="sourceLineNo">266</span> m.put(h.hrefProperty(), href);<a name="line.266"></a> -<span class="sourceLineNo">267</span> m.put(h.nameProperty(), name);<a name="line.267"></a> -<span class="sourceLineNo">268</span> return m.getBean();<a name="line.268"></a> -<span class="sourceLineNo">269</span> }<a name="line.269"></a> -<span class="sourceLineNo">270</span> return session.convertToType(href, beanType);<a name="line.270"></a> -<span class="sourceLineNo">271</span> }<a name="line.271"></a> -<span class="sourceLineNo">272</span><a name="line.272"></a> -<span class="sourceLineNo">273</span> private static Map<String,String> getAttributes(XMLStreamReader r) {<a name="line.273"></a> -<span class="sourceLineNo">274</span> Map<String,String> m = new TreeMap<String,String>() ;<a name="line.274"></a> -<span class="sourceLineNo">275</span> for (int i = 0; i < r.getAttributeCount(); i++)<a name="line.275"></a> -<span class="sourceLineNo">276</span> m.put(r.getAttributeLocalName(i), r.getAttributeValue(i));<a name="line.276"></a> -<span class="sourceLineNo">277</span> return m;<a name="line.277"></a> -<span class="sourceLineNo">278</span> }<a name="line.278"></a> -<span class="sourceLineNo">279</span><a name="line.279"></a> -<span class="sourceLineNo">280</span> /*<a name="line.280"></a> -<span class="sourceLineNo">281</span> * Reads contents of <table> element.<a name="line.281"></a> -<span class="sourceLineNo">282</span> * Precondition: Must be pointing at <table> event.<a name="line.282"></a> -<span class="sourceLineNo">283</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.283"></a> -<span class="sourceLineNo">284</span> */<a name="line.284"></a> -<span class="sourceLineNo">285</span> private <K,V> Map<K,V> parseIntoMap(HtmlParserSession session, XMLStreamReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.285"></a> -<span class="sourceLineNo">286</span> while (true) {<a name="line.286"></a> -<span class="sourceLineNo">287</span> HtmlTag tag = nextTag(r, TR, xTABLE);<a name="line.287"></a> -<span class="sourceLineNo">288</span> if (tag == xTABLE)<a name="line.288"></a> -<span class="sourceLineNo">289</span> break;<a name="line.289"></a> -<span class="sourceLineNo">290</span> tag = nextTag(r, TD, TH);<a name="line.290"></a> -<span class="sourceLineNo">291</span> // Skip over the column headers.<a name="line.291"></a> -<span class="sourceLineNo">292</span> if (tag == TH) {<a name="line.292"></a> -<span class="sourceLineNo">293</span> skipTag(r);<a name="line.293"></a> -<span class="sourceLineNo">294</span> r.nextTag();<a name="line.294"></a> -<span class="sourceLineNo">295</span> skipTag(r);<a name="line.295"></a> -<span class="sourceLineNo">296</span> } else {<a name="line.296"></a> -<span class="sourceLineNo">297</span> K key = parseAnything(session, keyType, r, m, false, pMeta);<a name="line.297"></a> -<span class="sourceLineNo">298</span> nextTag(r, TD);<a name="line.298"></a> -<span class="sourceLineNo">299</span> V value = parseAnything(session, valueType, r, m, false, pMeta);<a name="line.299"></a> -<span class="sourceLineNo">300</span> setName(valueType, value, key);<a name="line.300"></a> -<span class="sourceLineNo">301</span> m.put(key, value);<a name="line.301"></a> -<span class="sourceLineNo">302</span> }<a name="line.302"></a> -<span class="sourceLineNo">303</span> nextTag(r, xTR);<a name="line.303"></a> -<span class="sourceLineNo">304</span> }<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> +<span class="sourceLineNo">245</span> if (! isValid)<a name="line.245"></a> +<span class="sourceLineNo">246</span> throw new XMLStreamException("Unexpected tag '"+tag+"' for type '"+eType+"'", r.getLocation());<a name="line.246"></a> +<span class="sourceLineNo">247</span><a name="line.247"></a> +<span class="sourceLineNo">248</span> if (transform != null && o != null)<a name="line.248"></a> +<span class="sourceLineNo">249</span> o = transform.unswap(session, o, eType);<a name="line.249"></a> +<span class="sourceLineNo">250</span><a name="line.250"></a> +<span class="sourceLineNo">251</span> if (outer != null)<a name="line.251"></a> +<span class="sourceLineNo">252</span> setParent(eType, o, outer);<a name="line.252"></a> +<span class="sourceLineNo">253</span><a name="line.253"></a> +<span class="sourceLineNo">254</span> skipWs(r);<a name="line.254"></a> +<span class="sourceLineNo">255</span> return (T)o;<a name="line.255"></a> +<span class="sourceLineNo">256</span> }<a name="line.256"></a> +<span class="sourceLineNo">257</span><a name="line.257"></a> +<span class="sourceLineNo">258</span> /**<a name="line.258"></a> +<span class="sourceLineNo">259</span> * For parsing output from HtmlDocSerializer, this skips over the head, title, and links.<a name="line.259"></a> +<span class="sourceLineNo">260</span> */<a name="line.260"></a> +<span class="sourceLineNo">261</span> private static HtmlTag skipToData(XMLStreamReader r) throws XMLStreamException {<a name="line.261"></a> +<span class="sourceLineNo">262</span> while (true) {<a name="line.262"></a> +<span class="sourceLineNo">263</span> int event = r.next();<a name="line.263"></a> +<span class="sourceLineNo">264</span> if (event == START_ELEMENT && "div".equals(r.getLocalName()) && "data".equals(r.getAttributeValue(null, "id"))) {<a name="line.264"></a> +<span class="sourceLineNo">265</span> r.nextTag();<a name="line.265"></a> +<span class="sourceLineNo">266</span> event = r.getEventType();<a name="line.266"></a> +<span class="sourceLineNo">267</span> boolean isEmpty = (event == END_ELEMENT);<a name="line.267"></a> +<span class="sourceLineNo">268</span> // Skip until we find a start element, end document, or non-empty text.<a name="line.268"></a> +<span class="sourceLineNo">269</span> if (! isEmpty)<a name="line.269"></a> +<span class="sourceLineNo">270</span> event = skipWs(r);<a name="line.270"></a> +<span class="sourceLineNo">271</span> if (event == END_DOCUMENT)<a name="line.271"></a> +<span class="sourceLineNo">272</span> throw new XMLStreamException("Unexpected end of stream looking for data.", r.getLocation());<a name="line.272"></a> +<span class="sourceLineNo">273</span> return (event == CHARACTERS ? null : HtmlTag.forString(r.getName().getLocalPart(), false));<a name="line.273"></a> +<span class="sourceLineNo">274</span> }<a name="line.274"></a> +<span class="sourceLineNo">275</span> }<a name="line.275"></a> +<span class="sourceLineNo">276</span> }<a name="line.276"></a> +<span class="sourceLineNo">277</span><a name="line.277"></a> +<span class="sourceLineNo">278</span> private static String getAttribute(XMLStreamReader r, String name, String def) {<a name="line.278"></a> +<span class="sourceLineNo">279</span> for (int i = 0; i < r.getAttributeCount(); i++)<a name="line.279"></a> +<span class="sourceLineNo">280</span> if (r.getAttributeLocalName(i).equals(name))<a name="line.280"></a> +<span class="sourceLineNo">281</span> return r.getAttributeValue(i);<a name="line.281"></a> +<span class="sourceLineNo">282</span> return def;<a name="line.282"></a> +<span class="sourceLineNo">283</span> }<a name="line.283"></a> +<span class="sourceLineNo">284</span><a name="line.284"></a> +<span class="sourceLineNo">285</span> /*<a name="line.285"></a> +<span class="sourceLineNo">286</span> * Reads an anchor tag and converts it into a bean.<a name="line.286"></a> +<span class="sourceLineNo">287</span> */<a name="line.287"></a> +<span class="sourceLineNo">288</span> private static <T> T parseAnchor(HtmlParserSession session, XMLStreamReader r, ClassMeta<T> beanType) throws XMLStreamException {<a name="line.288"></a> +<span class="sourceLineNo">289</span> String href = r.getAttributeValue(null, "href");<a name="line.289"></a> +<span class="sourceLineNo">290</span> String name = session.getElementText(r);<a name="line.290"></a> +<span class="sourceLineNo">291</span> Class<T> beanClass = beanType.getInnerClass();<a name="line.291"></a> +<span class="sourceLineNo">292</span> if (beanClass.isAnnotationPresent(HtmlLink.class)) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> HtmlLink h = beanClass.getAnnotation(HtmlLink.class);<a name="line.293"></a> +<span class="sourceLineNo">294</span> BeanMap<T> m = session.newBeanMap(beanClass);<a name="line.294"></a> +<span class="sourceLineNo">295</span> m.put(h.hrefProperty(), href);<a name="line.295"></a> +<span class="sourceLineNo">296</span> m.put(h.nameProperty(), name);<a name="line.296"></a> +<span class="sourceLineNo">297</span> return m.getBean();<a name="line.297"></a> +<span class="sourceLineNo">298</span> }<a name="line.298"></a> +<span class="sourceLineNo">299</span> return session.convertToType(href, beanType);<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span><a name="line.301"></a> +<span class="sourceLineNo">302</span> private static Map<String,String> getAttributes(XMLStreamReader r) {<a name="line.302"></a> +<span class="sourceLineNo">303</span> Map<String,String> m = new TreeMap<String,String>() ;<a name="line.303"></a> +<span class="sourceLineNo">304</span> for (int i = 0; i < r.getAttributeCount(); i++)<a name="line.304"></a> +<span class="sourceLineNo">305</span> m.put(r.getAttributeLocalName(i), r.getAttributeValue(i));<a name="line.305"></a> <span class="sourceLineNo">306</span> return m;<a name="line.306"></a> <span class="sourceLineNo">307</span> }<a name="line.307"></a> <span class="sourceLineNo">308</span><a name="line.308"></a> <span class="sourceLineNo">309</span> /*<a name="line.309"></a> -<span class="sourceLineNo">310</span> * Reads contents of <ul> element.<a name="line.310"></a> -<span class="sourceLineNo">311</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.311"></a> +<span class="sourceLineNo">310</span> * Reads contents of <table> element.<a name="line.310"></a> +<span class="sourceLineNo">311</span> * Precondition: Must be pointing at <table> event.<a name="line.311"></a> <span class="sourceLineNo">312</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.312"></a> <span class="sourceLineNo">313</span> */<a name="line.313"></a> -<span class="sourceLineNo">314</span> private <E> Collection<E> parseIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.314"></a> +<span class="sourceLineNo">314</span> private <K,V> Map<K,V> parseIntoMap(HtmlParserSession session, XMLStreamReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.314"></a> <span class="sourceLineNo">315</span> while (true) {<a name="line.315"></a> -<span class="sourceLineNo">316</span> HtmlTag tag = nextTag(r, LI, xUL);<a name="line.316"></a> -<span class="sourceLineNo">317</span> if (tag == xUL)<a name="line.317"></a> +<span class="sourceLineNo">316</span> HtmlTag tag = nextTag(r, TR, xTABLE);<a name="line.316"></a> +<span class="sourceLineNo">317</span> if (tag == xTABLE)<a name="line.317"></a> <span class="sourceLineNo">318</span> break;<a name="line.318"></a> -<span class="sourceLineNo">319</span> l.add(parseAnything(session, elementType, r, l, false, pMeta));<a name="line.319"></a> -<span class="sourceLineNo">320</span> }<a name="line.320"></a> -<span class="sourceLineNo">321</span> return l;<a name="line.321"></a> -<span class="sourceLineNo">322</span> }<a name="line.322"></a> -<span class="sourceLineNo">323</span><a name="line.323"></a> -<span class="sourceLineNo">324</span> /*<a name="line.324"></a> -<span class="sourceLineNo">325</span> * Reads contents of <ul> element into an Object array.<a name="line.325"></a> -<span class="sourceLineNo">326</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.326"></a> -<span class="sourceLineNo">327</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.327"></a> -<span class="sourceLineNo">328</span> */<a name="line.328"></a> -<span class="sourceLineNo">329</span> private Object[] parseArgs(HtmlParserSession session, XMLStreamReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.329"></a> -<span class="sourceLineNo">330</span> Object[] o = new Object[argTypes.length];<a name="line.330"></a> -<span class="sourceLineNo">331</span> int i = 0;<a name="line.331"></a> -<span class="sourceLineNo">332</span> while (true) {<a name="line.332"></a> -<span class="sourceLineNo">333</span> HtmlTag tag = nextTag(r, LI, xUL);<a name="line.333"></a> -<span class="sourceLineNo">334</span> if (tag == xUL)<a name="line.334"></a> -<span class="sourceLineNo">335</span> break;<a name="line.335"></a> -<span class="sourceLineNo">336</span> o[i] = parseAnything(session, argTypes[i], r, session.getOuter(), false, null);<a name="line.336"></a> -<span class="sourceLineNo">337</span> i++;<a name="line.337"></a> -<span class="sourceLineNo">338</span> }<a name="line.338"></a> -<span class="sourceLineNo">339</span> return o;<a name="line.339"></a> -<span class="sourceLineNo">340</span> }<a name="line.340"></a> -<span class="sourceLineNo">341</span><a name="line.341"></a> -<span class="sourceLineNo">342</span> /*<a name="line.342"></a> -<span class="sourceLineNo">343</span> * Reads contents of <ul> element.<a name="line.343"></a> -<span class="sourceLineNo">344</span> * Precondition: Must be pointing at event following <ul> event.<a name="line.344"></a> -<span class="sourceLineNo">345</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.345"></a> -<span class="sourceLineNo">346</span> */<a name="line.346"></a> -<span class="sourceLineNo">347</span> private <E> Collection<E> parseTableIntoCollection(HtmlParserSession session, XMLStreamReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.347"></a> -<span class="sourceLineNo">348</span><a name="line.348"></a> -<span class="sourceLineNo">349</span> if (elementType == null)<a name="line.349"></a> -<span class="sourceLineNo">350</span> elementType = (ClassMeta<E>)object();<a name="line.350"></a> -<span class="sourceLineNo">351</span><a name="line.351"></a> -<span class="sourceLineNo">352</span> HtmlTag tag = nextTag(r, TR);<a name="line.352"></a> -<span class="sourceLineNo">353</span> List<String> keys = new ArrayList<String>();<a name="line.353"></a> -<span class="sourceLineNo">354</span> while (true) {<a name="line.354"></a> -<span class="sourceLineNo">355</span> tag = nextTag(r, TH, xTR);<a name="line.355"></a> -<span class="sourceLineNo">356</span> if (tag == xTR)<a name="line.356"></a> -<span class="sourceLineNo">357</span> break;<a name="line.357"></a> -<span class="sourceLineNo">358</span> keys.add(session.getElementText(r));<a name="line.358"></a> -<span class="sourceLineNo">359</span> }<a name="line.359"></a> +<span class="sourceLineNo">319</span> tag = nextTag(r, TD, TH);<a name="line.319"></a> +<span class="sourceLineNo">320</span> // Skip over the column headers.<a name="line.320"></a> +<span class="sourceLineNo">321</span> if (tag == TH) {<a name="line.321"></a> +<span class="sourceLineNo">322</span> skipTag(r);<a name="line.322"></a> +<span class="sourceLineNo">323</span> r.nextTag();<a name="line.323"></a> +<span class="sourceLineNo">324</span> skipTag(r);<a name="line.324"></a> +<span class="sourceLineNo">325</span> } else {<a name="line.325"></a> +<span class="sourceLineNo">326</span> K key = parseAnything(session, keyType, r, m, false, pMeta);<a name="line.326"></a> +<span class="sourceLineNo">327</span> nextTag(r, TD);<a name="line.327"></a> +<span class="sourceLineNo">328</span> V value = parseAnything(session, valueType, r, m, false, pMeta);<a name="line.328"></a> +<span class="sourceLineNo">329</span> setName(valueType, value, key);<a name="line.329"></a> +<span class="sourceLineNo">330</span> m.put(key, value);<a name="line.330"></a> +<span class="sourceLineNo">331</span> }<a name="line.331"></a> +<span class="sourceLineNo">332</span> nextTag(r, xTR);<a name="line.332"></a> +<span class="sourceLineNo">333</span> }<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span> return m;<a name="line.335"></a> +<span class="sourceLineNo">336</span> }<a name="line.336"></a> +<span class="sourceLineNo">337</span><a name="line.337"></a> +<span class="sourceLineNo">338</span> /*<a name="line.338"></a> +<span class="sourceLineNo">339</span> * Reads contents of <ul> element.<a name="line.339"></a> +<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> while (true) {<a name="line.361"></a> -<span class="sourceLineNo">362</span> r.nextTag();<a name="line.362"></a> -<span class="sourceLineNo">363</span> tag = HtmlTag.forEvent(r);<a name="line.363"></a> -<span class="sourceLineNo">364</span> if (tag == xTABLE)<a name="line.364"></a> -<span class="sourceLineNo">365</span> break;<a name="line.365"></a> -<span class="sourceLineNo">366</span><a name="line.366"></a> -<span class="sourceLineNo">367</span> String type = getAttribute(r, session.getBeanTypePropertyName(), null);<a name="line.367"></a> -<span class="sourceLineNo">368</span> ClassMeta elementType2 = session.getClassMeta(type, pMeta, null);<a name="line.368"></a> -<span class="sourceLineNo">369</span> if (elementType2 != null)<a name="line.369"></a> -<span class="sourceLineNo">370</span> elementType = elementType2;<a name="line.370"></a> -<span class="sourceLineNo">371</span><a name="line.371"></a> -<span class="sourceLineNo">372</span> if (elementType.canCreateNewBean(l)) {<a name="line.372"></a> -<span class="sourceLineNo">373</span> BeanMap m = session.newBeanMap(l, elementType.getInnerClass());<a name="line.373"></a> -<span class="sourceLineNo">374</span> for (int i = 0; i < keys.size(); i++) {<a name="line.374"></a> -<span class="sourceLineNo">375</span> tag = nextTag(r, TD, NULL);<a name="line.375"></a> -<span class="sourceLineNo">376</span> if (tag == NULL) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> m = null;<a name="line.377"></a> -<span class="sourceLineNo">378</span> nextTag(r, xNULL);<a name="line.378"></a> -<span class="sourceLineNo">379</span> break;<a name="line.379"></a> -<span class="sourceLineNo">380</span> }<a name="line.380"></a> -<span class="sourceLineNo">381</span> String key = keys.get(i);<a name="line.381"></a> -<span class="sourceLineNo">382</span> BeanMapEntry e = m.getProperty(key);<a name="line.382"></a> -<span class="sourceLineNo">383</span> if (e == null) {<a name="line.383"></a> -<span class="sourceLineNo">384</span> //onUnknownProperty(key, m, -1, -1);<a name="line.384"></a> -<span class="sourceLineNo">385</span> parseAnything(session, object(), r, l, false, null);<a name="line.385"></a> -<span class="sourceLineNo">386</span> } else {<a name="line.386"></a> -<span class="sourceLineNo">387</span> BeanPropertyMeta bpm = e.getMeta();<a name="line.387"></a> -<span class="sourceLineNo">388</span> ClassMeta<?> cm = bpm.getClassMeta();<a name="line.388"></a> -<span class="sourceLineNo">389</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, bpm);<a name="line.389"></a> -<span class="sourceLineNo">390</span> setName(cm, value, key);<a name="line.390"></a> -<span class="sourceLineNo">391</span> bpm.set(m, value);<a name="line.391"></a> -<span class="sourceLineNo">392</span> }<a name="line.392"></a> -<span class="sourceLineNo">393</span> }<a name="line.393"></a> -<span class="sourceLineNo">394</span> l.add(m == null ? null : (E)m.getBean());<a name="line.394"></a> -<span class="sourceLineNo">395</span> } else {<a name="line.395"></a> -<span class="sourceLineNo">396</span> String c = getAttributes(r).get(session.getBeanTypePropertyName());<a name="line.396"></a> -<span class="sourceLineNo">397</span> Map m = (Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ? elementType.newInstance(l) : new ObjectMap(session));<a name="line.397"></a> -<span class="sourceLineNo">398</span> for (int i = 0; i < keys.size(); i++) {<a name="line.398"></a> -<span class="sourceLineNo">399</span> tag = nextTag(r, TD, NULL);<a name="line.399"></a> -<span class="sourceLineNo">400</span> if (tag == NULL) {<a name="line.400"></a> -<span class="sourceLineNo">401</span> m = null;<a name="line.401"></a> -<span class="sourceLineNo">402</span> nextTag(r, xNULL);<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 key = keys.get(i);<a name="line.405"></a> -<span class="sourceLineNo">406</span> if (m != null) {<a name="line.406"></a> -<span class="sourceLineNo">407</span> ClassMeta<?> et = elementType.getElementType();<a name="line.407"></a> -<span class="sourceLineNo">408</span> Object value = parseAnything(session, et, r, l, false, pMeta);<a name="line.408"></a> -<span class="sourceLineNo">409</span> setName(et, value, key);<a name="line.409"></a> -<span class="sourceLineNo">410</span> m.put(key, value);<a name="line.410"></a> -<span class="sourceLineNo">411</span> }<a name="line.411"></a> -<span class="sourceLineNo">412</span> }<a name="line.412"></a> -<span class="sourceLineNo">413</span> if (m != null && c != null) {<a name="line.413"></a> -<span class="sourceLineNo">414</span> ObjectMap m2 = (m instanceof ObjectMap ? (ObjectMap)m : new ObjectMap(m).setBeanSession(session));<a name="line.414"></a> -<span class="sourceLineNo">415</span> m2.put(session.getBeanTypePropertyName(), c);<a name="line.415"></a> -<span class="sourceLineNo">416</span> l.add((E)session.cast(m2, pMeta, null));<a name="line.416"></a> -<span class="sourceLineNo">417</span> } else {<a name="line.417"></a> -<span class="sourceLineNo">418</span> l.add((E)m);<a name="line.418"></a> -<span class="sourceLineNo">419</span> }<a name="line.419"></a> -<span class="sourceLineNo">420</span> }<a name="line.420"></a> -<span class="sourceLineNo">421</span> nextTag(r, xTR);<a name="line.421"></a> -<span class="sourceLineNo">422</span> }<a name="line.422"></a> -<span class="sourceLineNo">423</span> return l;<a name="line.423"></a> -<span class="sourceLineNo">424</span> }<a name="line.424"></a> -<span class="sourceLineNo">425</span><a name="line.425"></a> -<span class="sourceLineNo">426</span> /*<a name="line.426"></a> -<span class="sourceLineNo">427</span> * Reads contents of <table> element.<a name="line.427"></a> -<span class="sourceLineNo">428</span> * Precondition: Must be pointing at event following <table> event.<a name="line.428"></a> -<span class="sourceLineNo">429</span> * Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.<a name="line.429"></a> -<span class="sourceLineNo">430</span> */<a name="line.430"></a> -<span class="sourceLineNo">431</span> private <T> BeanMap<T> parseIntoBean(HtmlParserSession session, XMLStreamReader r, BeanMap<T> m) throws Exception {<a name="line.431"></a> -<span class="sourceLineNo">432</span> while (true) {<a name="line.432"></a> -<span class="sourceLineNo">433</span> HtmlTag tag = nextTag(r, TR, xTABLE);<a name="line.433"></a> -<span class="sourceLineNo">434</span> if (tag == xTABLE)<a name="line.434"></a> -<span class="sourceLineNo">435</span> break;<a name="line.435"></a> -<span class="sourceLineNo">436</span> tag = nextTag(r, TD, TH);<a name="line.436"></a> -<span class="sourceLineNo">437</span> // Skip over the column headers.<a name="line.437"></a> -<span class="sourceLineNo">438</span> if (tag == TH) {<a name="line.438"></a> -<span class="sourceLineNo">439</span> skipTag(r);<a name="line.439"></a> -<span class="sourceLineNo">440</span> r.nextTag();<a name="line.440"></a> -<span class="sourceLineNo">441</span> skipTag(r);<a name="line.441"></a> -<span class="sourceLineNo">442</span> } else {<a name="line.442"></a> -<span class="sourceLineNo">443</span> String key = session.getElementText(r);<a name="line.443"></a> -<span class="sourceLineNo">444</span> nextTag(r, TD);<a name="line.444"></a> -<span class="sourceLineNo">445</span> BeanPropertyMeta pMeta = m.getPropertyMeta(key);<a name="line.445"></a> -<span class="sourceLineNo">446</span> if (pMeta == null) {<a name="line.446"></a> -<span class="sourceLineNo">447</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.447"></a> -<span class="sourceLineNo">448</span> parseAnything(session, object(), r, null, false, null);<a name="line.448"></a> -<span class="sourceLineNo">449</span> } else {<a name="line.449"></a> -<span class="sourceLineNo">450</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.450"></a> -<span class="sourceLineNo">451</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a name="line.451"></a> -<span class="sourceLineNo">452</span> setName(cm, value, key);<a name="line.452"></a> -<span class="sourceLineNo">453</span> pMeta.set(m, value);<a name="line.453"></a> -<span class="sourceLineNo">454</span> }<a name="line.454"></a> -<span class="sourceLineNo">455</span> }<a name="line.455"></a> -<span class="sourceLineNo">456</span> nextTag(r, xTR);<a name="line.456"></a> -<span class="sourceLineNo">457</span> }<a name="line.457"></a> -<span class="sourceLineNo">458</span> return m;<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span><a name="line.460"></a> -<span class="sourceLineNo">461</span> /*<a name="line.461"></a> -<span class="sourceLineNo">462</span> * Reads the next tag. Advances past anything that's not a start or end tag. Throws an exception if<a name="line.462"></a> -<span class="sourceLineNo">463</span> * it's not one of the expected tags.<a name="line.463"></a> -<span class="sourceLineNo">464</span> * Precondition: Must be pointing before the event we want to parse.<a name="line.464"></a> -<span class="sourceLineNo">465</span> * Postcondition: Pointing at the tag just parsed.<a name="line.465"></a> -<span class="sourceLineNo">466</span> */<a name="line.466"></a> -<span class="sourceLineNo">467</span> private static HtmlTag nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.467"></a> -<span class="sourceLineNo">468</span> int et = r.next();<a name="line.468"></a> -<span class="sourceLineNo">469</span><a name="line.469"></a> -<span class="sourceLineNo">470</span> while (et != START_ELEMENT && et != END_ELEMENT && et != END_DOCUMENT)<a name="line.470"></a> -<span class="sourceLineNo">471</span> et = r.next();<a name="line.471"></a> -<span class="sourceLineNo">472</span><a name="line.472"></a> -<span class="sourceLineNo">473</span> if (et == END_DOCUMENT)<a name="line.473"></a> -<span class="sourceLineNo">474</span> throw new XMLStreamException("Unexpected end of document: " + r.getLocation());<a name="line.474"></a> -<span class="sourceLineNo">475</span><a name="line.475"></a> -<span class="sourceLineNo">476</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.476"></a> -<span class="sourceLineNo">477</span> if (expected.length == 0)<a name="line.477"></a> -<span class="sourceLineNo">478</span> return tag;<a name="line.478"></a> -<span class="sourceLineNo">479</span> for (HtmlTag t : expected)<a name="line.479"></a> -<span class="sourceLineNo">480</span> if (t == tag)<a name="line.480"></a> -<span class="sourceLineNo">481</span> return tag;<a name="line.481"></a> -<span class="sourceLineNo">482</span><a name="line.482"></a> -<span class="sourceLineNo">483</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.483"></a> -<span class="sourceLineNo">484</span> }<a name="line.484"></a> -<span class="sourceLineNo">485</span><a name="line.485"></a> -<span class="sourceLineNo">486</span> /**<a name="line.486"></a> -<span class="sourceLineNo">487</span> * Skips over the current element and advances to the next element.<a name="line.487"></a> -<span class="sourceLineNo">488</span> * <p><a name="line.488"></a> -<span class="sourceLineNo">489</span> * Precondition: Pointing to opening tag.<a name="line.489"></a> -<span class="sourceLineNo">490</span> * Postcondition: Pointing to next opening tag.<a name="line.490"></a> -<span class="sourceLineNo">491</span> *<a name="line.491"></a> -<span class="sourceLineNo">492</span> * @param r The stream being read from.<a name="line.492"></a> -<span class="sourceLineNo">493</span> * @throws XMLStreamException<a name="line.493"></a> -<span class="sourceLineNo">494</span> */<a name="line.494"></a> -<span class="sourceLineNo">495</span> private static void skipTag(XMLStreamReader r) throws XMLStreamException {<a name="line.495"></a> -<span class="sourceLineNo">496</span> int et = r.getEventType();<a name="line.496"></a> -<span class="sourceLineNo">497</span><a name="line.497"></a> -<span class="sourceLineNo">498</span> if (et != START_ELEMENT)<a name="line.498"></a> -<span class="sourceLineNo">499</span> throw new XMLStreamException("skipToNextTag() call on invalid event ["+XmlUtils.toReadableEvent(r)+"]. Must only be called on START_ELEMENT events.");<a name="line.499"></a> -<span class="sourceLineNo">500</span><a name="line.500"></a> -<span class="sourceLineNo">501</span> String n = r.getLocalName();<a name="line.501"></a> -<span class="sourceLineNo">502</span><a name="line.502"></a> -<span class="sourceLineNo">503</span> int depth = 0;<a name="line.503"></a> -<span class="sourceLineNo">504</span> while (true) {<a name="line.504"></a> -<span class="sourceLineNo">505</span> et = r.next();<a name="line.505"></a> -<span class="sourceLineNo">506</span> if (et == START_ELEMENT) {<a name="line.506"></a> -<span class="sourceLineNo">507</span> String n2 = r.getLocalName();<a name="line.507"></a> -<span class="sourceLineNo">508</span> if (n.equals(n2))<a name="line.508"></a> -<span class="sourceLineNo">509</span> depth++;<a name="line.509"></a> -<span class="sourceLineNo">510</span> } else if (et == END_ELEMENT) {<a name="line.510"></a> -<span class="sourceLineNo">511</span> String n2 = r.getLocalName();<a name="line.511"></a> -<span class="sourceLineNo">512</span> if (n.equals(n2))<a name="line.512"></a> -<span class="sourceLineNo">513</span> depth--;<a name="line.513"></a> -<span class="sourceLineNo">514</span> if (depth < 0)<a name="line.514"></a> -<span class="sourceLineNo">515</span> return;<a name="line.515"></a> -<span class="sourceLineNo">516</span> }<a name="line.516"></a> -<span class="sourceLineNo">517</span> }<a name="line.517"></a> -<span class="sourceLineNo">518</span> }<a name="line.518"></a> -<span class="sourceLineNo">519</span><a name="line.519"></a> -<span class="sourceLineNo">520</span> private static void skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {<a name="line.520"></a> -<span class="sourceLineNo">521</span> HtmlTag tag = HtmlTag.forEvent(r);<a name="line.521"></a> -<span class="sourceLineNo">522</span> if (tag.isOneOf(expected))<a name="line.522"></a> -<span class="sourceLineNo">523</span> r.next();<a name="line.523"></a> -<span class="sourceLineNo">524</span> else<a name="line.524"></a> -<span class="sourceLineNo">525</span> throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());<a name="line.525"></a> -<span class="sourceLineNo">526</span> }<a name="line.526"></a> -<span class="sourceLineNo">527</span><a name="line.527"></a> -<span class="sourceLineNo">528</span> private static int skipWs(XMLStreamReader r) throws XMLStreamException {<a name="line.528"></a> -<span class="sourceLineNo">529</span> int event = r.getEventType();<a name="line.529"></a> -<span class="sourceLineNo">530</span> while (event != START_ELEMENT && event != END_ELEMENT && event != END_DOCUMENT && r.isWhiteSpace())<a name="line.530"></a> -<span class="sourceLineNo">531</span> event = r.next();<a name="line.531"></a> -<span class="sourceLineNo">532</span> return event;<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">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">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">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">535</span><a name="line.535"></a> -<span class="sourceLineNo">536</span> //--------------------------------------------------------------------------------<a name="line.536"></a> -<span class="sourceLineNo">537</span> // Entry point methods<a name="line.537"></a> -<span class="sourceLineNo">538</span> //--------------------------------------------------------------------------------<a name="line.538"></a> -<span class="sourceLineNo">539</span><a name="line.539"></a> -<span class="sourceLineNo">540</span> @Override /* Parser */<a name="line.540"></a> -<span class="sourceLineNo">541</span> public HtmlParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.541"></a> -<span class="sourceLineNo">542</span> return new HtmlParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.542"></a> -<span class="sourceLineNo">543</span> }<a name="line.543"></a> -<span class="sourceLineNo">544</span><a name="line.544"></a> -<span class="sourceLineNo">545</span> @Override /* Parser */<a name="line.545"></a> -<span class="sourceLineNo">546</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.546"></a> -<span class="sourceLineNo">547</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.547"></a> -<span class="sourceLineNo">548</span> return parseAnything(s, type, s.getXmlStreamReader(), s.getOuter(), true, null);<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> @Override /* ReaderParser */<a name="line.551"></a> -<span class="sourceLineNo">552</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.552"></a> -<span class="sourceLineNo">553</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.553"></a> -<span class="sourceLineNo">554</span> return parseIntoMap(s, s.getXmlStreamReader(), m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<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> @Override /* ReaderParser */<a name="line.557"></a> -<span class="sourceLineNo">558</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.558"></a> -<span class="sourceLineNo">559</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.559"></a> -<span class="sourceLineNo">560</span> return parseIntoCollection(s, s.getXmlStreamReader(), c, (ClassMeta<E>)s.getClassMeta(elementType), null);<a name="line.560"></a> -<span class="sourceLineNo">561</span> }<a name="line.561"></a> -<span class="sourceLineNo">562</span><a name="line.562"></a> -<span class="sourceLineNo">563</span> @Override /* ReaderParser */<a name="line.563"></a> -<span class="sourceLineNo">564</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.564"></a> -<span class="sourceLineNo">565</span> HtmlParserSession s = (HtmlParserSession)session;<a name="line.565"></a> -<span class="sourceLineNo">566</span> return parseArgs(s, s.getXmlStreamReader(), argTypes);<a name="line.566"></a> -<span class="sourceLineNo">567</span> }<a name="line.567"></a> -<span class="sourceLineNo">568</span>}<a name="line.568"></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="sourceL
<TRUNCATED>
