http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html 
b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
index f0cdf4a..ea2d295 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
@@ -310,439 +310,440 @@
 <span class="sourceLineNo">302</span>            eType = aType = 
((Delegate&lt;?&gt;)o).getClassMeta();<a name="line.302"></a>
 <span class="sourceLineNo">303</span>         }<a name="line.303"></a>
 <span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>         sType = 
aType.getSerializedClassMeta();<a name="line.305"></a>
+<span class="sourceLineNo">305</span>         sType = aType;<a 
name="line.305"></a>
 <span class="sourceLineNo">306</span><a name="line.306"></a>
 <span class="sourceLineNo">307</span>         // Swap if necessary<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>         PojoSwap swap = 
aType.getPojoSwap();<a name="line.308"></a>
+<span class="sourceLineNo">308</span>         PojoSwap swap = 
aType.getPojoSwap(this);<a name="line.308"></a>
 <span class="sourceLineNo">309</span>         if (swap != null) {<a 
name="line.309"></a>
 <span class="sourceLineNo">310</span>            o = swap.swap(this, o);<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>            // If the getSwapClass() 
method returns Object, we need to figure out<a name="line.312"></a>
-<span class="sourceLineNo">313</span>            // the actual type now.<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>            if (sType.isObject())<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>               sType = 
getClassMetaForObject(o);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>         }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      } else {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>         sType = 
eType.getSerializedClassMeta();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>      // Does the actual type match the 
expected type?<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      boolean isExpectedType = true;<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>      if (o == null || ! 
eType.same(aType)) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>         if (eType.isNumber())<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>            isExpectedType = 
aType.isNumber();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>         else if (eType.isMap())<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>            isExpectedType = 
aType.isMap();<a name="line.327"></a>
-<span class="sourceLineNo">328</span>         else if 
(eType.isCollectionOrArray())<a name="line.328"></a>
-<span class="sourceLineNo">329</span>            isExpectedType = 
aType.isCollectionOrArray();<a name="line.329"></a>
-<span class="sourceLineNo">330</span>         else<a name="line.330"></a>
-<span class="sourceLineNo">331</span>            isExpectedType = false;<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>      }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>      String resolvedDictionaryName = 
isExpectedType ? null : aType.getDictionaryName();<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>      // Note that the dictionary name 
may be specified on the actual type or the serialized type.<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>      // HTML templates will have them 
defined on the serialized type.<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      String dictionaryName = 
aType.getDictionaryName();<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      if (dictionaryName == null)<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>         dictionaryName = 
sType.getDictionaryName();<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span>      // char '\0' is interpreted as 
null.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      if (o != null &amp;&amp; 
sType.isChar() &amp;&amp; ((Character)o).charValue() == 0)<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>         o = null;<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>      boolean isCollapsed = false;     // 
If 'true', this is a collection and we're not rendering the outer element.<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>      boolean isRaw = (sType.isReader() 
|| sType.isInputStream()) &amp;&amp; o != null;<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>      // Get the JSON type string.<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>      if (o == null) {<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>         type = NULL;<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>      } else if (sType.isCharSequence() 
|| sType.isChar()) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         type = STRING;<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>      } else if (sType.isNumber()) {<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>         type = NUMBER;<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>      } else if (sType.isBoolean()) {<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>         type = BOOLEAN;<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>      } else if (sType.isMapOrBean()) {<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>         isCollapsed = 
sType.getExtendedMeta(XmlClassMeta.class).getFormat() == COLLAPSED;<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>         type = OBJECT;<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>      } else if 
(sType.isCollectionOrArray()) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span>         isCollapsed = (format == 
COLLAPSED &amp;&amp; ! addNamespaceUris);<a name="line.362"></a>
-<span class="sourceLineNo">363</span>         type = ARRAY;<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>      } else {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         type = STRING;<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>      if 
(format.isOneOf(MIXED,MIXED_PWS,TEXT,TEXT_PWS,XMLTEXT) &amp;&amp; 
type.isOneOf(NULL,STRING,NUMBER,BOOLEAN))<a name="line.368"></a>
-<span class="sourceLineNo">369</span>         isCollapsed = true;<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>      // Is there a name associated with 
this bean?<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      if (elementName == null &amp;&amp; 
dictionaryName != null) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>         elementName = dictionaryName;<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>         isExpectedType = true;<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>      if (enableNamespaces) {<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>         if (elementNamespace == null)<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>            elementNamespace = 
sType.getExtendedMeta(XmlClassMeta.class).getNamespace();<a name="line.379"></a>
-<span class="sourceLineNo">380</span>         if (elementNamespace == null)<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>            elementNamespace = 
aType.getExtendedMeta(XmlClassMeta.class).getNamespace();<a name="line.381"></a>
-<span class="sourceLineNo">382</span>         if (elementNamespace != null 
&amp;&amp; elementNamespace.uri == null)<a name="line.382"></a>
-<span class="sourceLineNo">383</span>            elementNamespace = null;<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>         if (elementNamespace == null)<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>            elementNamespace = 
defaultNamespace;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      } else {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>         elementNamespace = null;<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>      // Do we need a carriage return 
after the start tag?<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      boolean cr = o != null &amp;&amp; 
(sType.isMapOrBean() || sType.isCollectionOrArray()) &amp;&amp; ! isMixed;<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>      String en = elementName;<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>      if (en == null &amp;&amp; ! isRaw) 
{<a name="line.394"></a>
-<span class="sourceLineNo">395</span>         en = type.toString();<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>         type = null;<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>      }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      boolean encodeEn = elementName != 
null;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      String ns = (elementNamespace == 
null ? null : elementNamespace.name);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      String dns = null, elementNs = 
null;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      if (enableNamespaces) {<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>         dns = elementName == null 
&amp;&amp; defaultNamespace != null ? defaultNamespace.name : null;<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>         elementNs = elementName == null 
? dns : ns;<a name="line.403"></a>
-<span class="sourceLineNo">404</span>         if (elementName == null)<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>            elementNamespace = null;<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>      }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>      // Render the start tag.<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>      if (! isCollapsed) {<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>         if (en != null) {<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>            out.oTag(i, elementNs, en, 
encodeEn);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>            if (addNamespaceUris) {<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>               out.attr((String)null, 
"xmlns", defaultNamespace.getUri());<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>               for (Namespace n : 
namespaces)<a name="line.415"></a>
-<span class="sourceLineNo">416</span>                  out.attr("xmlns", 
n.getName(), n.getUri());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            }<a name="line.417"></a>
-<span class="sourceLineNo">418</span>            if (! isExpectedType) {<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>               if (resolvedDictionaryName 
!= null)<a name="line.419"></a>
-<span class="sourceLineNo">420</span>                  out.attr(dns, 
getBeanTypePropertyName(eType), resolvedDictionaryName);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>               else if (type != null 
&amp;&amp; type != STRING)<a name="line.421"></a>
-<span class="sourceLineNo">422</span>                  out.attr(dns, 
getBeanTypePropertyName(eType), type);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>            }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>         } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>            out.i(i);<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>         }<a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (o == null) {<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>            if ((sType.isBoolean() || 
sType.isNumber()) &amp;&amp; ! sType.isNullable())<a name="line.428"></a>
-<span class="sourceLineNo">429</span>               o = 
sType.getPrimitiveDefault();<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>         if (o != null &amp;&amp; ! 
(sType.isMapOrBean() || en == null))<a name="line.432"></a>
-<span class="sourceLineNo">433</span>            out.append('&gt;');<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>         if (cr &amp;&amp; ! 
(sType.isMapOrBean()))<a name="line.435"></a>
-<span class="sourceLineNo">436</span>            out.nl(i+1);<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>      }<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span>      ContentResult rc = CR_ELEMENTS;<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span>      // Render the tag contents.<a 
name="line.441"></a>
-<span class="sourceLineNo">442</span>      if (o != null) {<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>         if (sType.isUri() || (pMeta != 
null &amp;&amp; pMeta.isUri())) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>            out.textUri(o);<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>         } else if 
(sType.isCharSequence() || sType.isChar()) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            if (format == XMLTEXT)<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>               out.append(o);<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>            else<a name="line.448"></a>
-<span class="sourceLineNo">449</span>               out.text(o, 
preserveWhitespace);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>         } else if (sType.isNumber() || 
sType.isBoolean()) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>            out.append(o);<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>         } else if (sType.isMap() || 
(wType != null &amp;&amp; wType.isMap())) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            if (o instanceof BeanMap)<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>               rc = serializeBeanMap(out, 
(BeanMap)o, elementNamespace, isCollapsed, isMixed);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>            else<a name="line.455"></a>
-<span class="sourceLineNo">456</span>               rc = serializeMap(out, 
(Map)o, sType, eType.getKeyType(), eType.getValueType(), isMixed);<a 
name="line.456"></a>
-<span class="sourceLineNo">457</span>         } else if (sType.isBean()) {<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>            rc = serializeBeanMap(out, 
toBeanMap(o), elementNamespace, isCollapsed, isMixed);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         } else if (sType.isCollection() 
|| (wType != null &amp;&amp; wType.isCollection())) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>            if (isCollapsed)<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>               this.indent--;<a 
name="line.461"></a>
-<span class="sourceLineNo">462</span>            serializeCollection(out, o, 
sType, eType, pMeta, isMixed);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>            if (isCollapsed)<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>               this.indent++;<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>         } else if (sType.isArray()) {<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>            if (isCollapsed)<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>               this.indent--;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>            serializeCollection(out, o, 
sType, eType, pMeta, isMixed);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>            if (isCollapsed)<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>               this.indent++;<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>         } else if (sType.isReader() || 
sType.isInputStream()) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>            IOUtils.pipe(o, out);<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>         } else {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>            if (format == XMLTEXT)<a 
name="line.474"></a>
-<span class="sourceLineNo">475</span>               out.append(toString(o));<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>            else<a name="line.476"></a>
-<span class="sourceLineNo">477</span>               out.text(toString(o));<a 
name="line.477"></a>
-<span class="sourceLineNo">478</span>         }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>      pop();<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>      // Render the end tag.<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>      if (! isCollapsed) {<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>         if (en != null) {<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>            if (rc == CR_EMPTY) {<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>               if (isHtmlMode())<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>                  
out.append('&gt;').eTag(elementNs, en, encodeEn);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>               else<a name="line.489"></a>
-<span class="sourceLineNo">490</span>                  
out.append('/').append('&gt;');<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            } else if (rc == CR_VOID || o 
== null) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>               
out.append('/').append('&gt;');<a name="line.492"></a>
-<span class="sourceLineNo">493</span>            }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>            else<a name="line.494"></a>
-<span class="sourceLineNo">495</span>               out.ie(cr &amp;&amp; rc != 
CR_MIXED ? i : 0).eTag(elementNs, en, encodeEn);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>         }<a name="line.496"></a>
-<span class="sourceLineNo">497</span>         if (! isMixed)<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>            out.nl(i);<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span>      }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span>      return out;<a name="line.501"></a>
-<span class="sourceLineNo">502</span>   }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>   private ContentResult 
serializeMap(XmlWriter out, Map m, ClassMeta&lt;?&gt; sType,<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span>         ClassMeta&lt;?&gt; eKeyType, 
ClassMeta&lt;?&gt; eValueType, boolean isMixed) throws Exception {<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>      m = sort(m);<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>      ClassMeta&lt;?&gt; keyType = 
eKeyType == null ? sType.getKeyType() : eKeyType;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      ClassMeta&lt;?&gt; valueType = 
eValueType == null ? sType.getValueType() : eValueType;<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>      boolean hasChildren = false;<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      for (Iterator i = 
m.entrySet().iterator(); i.hasNext();) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>         Map.Entry e = 
(Map.Entry)i.next();<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>         Object k = e.getKey();<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>         if (k == null) {<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>            k = "\u0000";<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>         } else {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            k = generalize(k, keyType);<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>            if (isTrimStrings() 
&amp;&amp; k instanceof String)<a name="line.521"></a>
-<span class="sourceLineNo">522</span>               k = k.toString().trim();<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>         Object value = e.getValue();<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>         if (! hasChildren) {<a 
name="line.527"></a>
-<span class="sourceLineNo">528</span>            hasChildren = true;<a 
name="line.528"></a>
-<span class="sourceLineNo">529</span>            out.append('&gt;').nlIf(! 
isMixed, indent);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>         }<a name="line.530"></a>
-<span class="sourceLineNo">531</span>         serializeAnything(out, value, 
valueType, toString(k), null, false, XmlFormat.DEFAULT, isMixed, false, 
null);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      }<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      return hasChildren ? CR_ELEMENTS : 
CR_EMPTY;<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>   private ContentResult 
serializeBeanMap(XmlWriter out, BeanMap&lt;?&gt; m,<a name="line.536"></a>
-<span class="sourceLineNo">537</span>         Namespace elementNs, boolean 
isCollapsed, boolean isMixed) throws Exception {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      boolean hasChildren = false;<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>      BeanMeta&lt;?&gt; bm = 
m.getMeta();<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>      List&lt;BeanPropertyValue&gt; lp = 
m.getValues(isTrimNulls());<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span>      XmlBeanMeta xbm = 
bm.getExtendedMeta(XmlBeanMeta.class);<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span>      Set&lt;String&gt;<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>         attrs = 
xbm.getAttrPropertyNames(),<a name="line.546"></a>
-<span class="sourceLineNo">547</span>         elements = 
xbm.getElementPropertyNames(),<a name="line.547"></a>
-<span class="sourceLineNo">548</span>         collapsedElements = 
xbm.getCollapsedPropertyNames();<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      String<a name="line.549"></a>
-<span class="sourceLineNo">550</span>         attrsProperty = 
xbm.getAttrsPropertyName(),<a name="line.550"></a>
-<span class="sourceLineNo">551</span>         contentProperty = 
xbm.getContentPropertyName();<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span>      XmlFormat cf = null;<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>      Object content = null;<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>      ClassMeta&lt;?&gt; contentType = 
null;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      for (BeanPropertyValue p : lp) {<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>         String n = p.getName();<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>         if (attrs.contains(n) || 
attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>            BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.560"></a>
-<span class="sourceLineNo">561</span>            ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span>            String key = p.getName();<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>            Object value = 
p.getValue();<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            Throwable t = 
p.getThrown();<a name="line.565"></a>
-<span class="sourceLineNo">566</span>            if (t != null)<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>               
onBeanGetterException(pMeta, t);<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>            if (canIgnoreValue(cMeta, 
key, value))<a name="line.569"></a>
-<span class="sourceLineNo">570</span>               continue;<a 
name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span>            Namespace ns = 
(enableNamespaces &amp;&amp; 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() != elementNs ? 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() : null);<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span>            if (pMeta.isUri()  ) {<a 
name="line.574"></a>
-<span class="sourceLineNo">575</span>               out.attrUri(ns, key, 
value);<a name="line.575"></a>
-<span class="sourceLineNo">576</span>            } else if 
(n.equals(attrsProperty)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>               if (value instanceof 
BeanMap) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>                  BeanMap&lt;?&gt; bm2 = 
(BeanMap)value;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                  for (BeanPropertyValue 
p2 : bm2.getValues(true)) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                     String key2 = 
p2.getName();<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                     Object value2 = 
p2.getValue();<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                     Throwable t2 = 
p2.getThrown();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>                     if (t2 != null)<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>                        
onBeanGetterException(pMeta, t);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>                     out.attr(ns, key2, 
value2);<a name="line.585"></a>
-<span class="sourceLineNo">586</span>                  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span>               } else /* Map */ {<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>                  Map m2 = (Map)value;<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>                  for (Map.Entry e : 
(Set&lt;Map.Entry&gt;)(m2.entrySet())) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span>                     out.attr(ns, 
toString(e.getKey()), e.getValue());<a name="line.590"></a>
-<span class="sourceLineNo">591</span>                  }<a name="line.591"></a>
-<span class="sourceLineNo">592</span>               }<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            } else {<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>               out.attr(ns, key, 
value);<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            }<a name="line.595"></a>
-<span class="sourceLineNo">596</span>         }<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span>      boolean<a name="line.599"></a>
-<span class="sourceLineNo">600</span>         hasContent = false,<a 
name="line.600"></a>
-<span class="sourceLineNo">601</span>         preserveWhitespace = false,<a 
name="line.601"></a>
-<span class="sourceLineNo">602</span>         isVoidElement = 
xbm.getContentFormat() == VOID;<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>      for (BeanPropertyValue p : lp) {<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span>         String n = p.getName();<a 
name="line.608"></a>
-<span class="sourceLineNo">609</span>         if (n.equals(contentProperty)) 
{<a name="line.609"></a>
-<span class="sourceLineNo">610</span>            content = p.getValue();<a 
name="line.610"></a>
-<span class="sourceLineNo">611</span>            contentType = 
p.getClassMeta();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>            hasContent = true;<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span>            cf = 
xbm.getContentFormat();<a name="line.613"></a>
-<span class="sourceLineNo">614</span>            if 
(cf.isOneOf(MIXED,MIXED_PWS,TEXT,TEXT_PWS,XMLTEXT))<a name="line.614"></a>
-<span class="sourceLineNo">615</span>               isMixed = true;<a 
name="line.615"></a>
-<span class="sourceLineNo">616</span>            if (cf.isOneOf(MIXED_PWS, 
TEXT_PWS))<a name="line.616"></a>
-<span class="sourceLineNo">617</span>               preserveWhitespace = 
true;<a name="line.617"></a>
-<span class="sourceLineNo">618</span>            if 
(contentType.isCollection() &amp;&amp; ((Collection)content).isEmpty())<a 
name="line.618"></a>
-<span class="sourceLineNo">619</span>               hasContent = false;<a 
name="line.619"></a>
-<span class="sourceLineNo">620</span>            else if 
(contentType.isArray() &amp;&amp; Array.getLength(content) == 0)<a 
name="line.620"></a>
-<span class="sourceLineNo">621</span>               hasContent = false;<a 
name="line.621"></a>
-<span class="sourceLineNo">622</span>         } else if (elements.contains(n) 
|| collapsedElements.contains(n) || elements.contains("*") || 
collapsedElements.contains("*") ) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>            String key = p.getName();<a 
name="line.623"></a>
-<span class="sourceLineNo">624</span>            Object value = 
p.getValue();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>            Throwable t = 
p.getThrown();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>            if (t != null)<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>               
onBeanGetterException(pMeta, t);<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>            if (canIgnoreValue(cMeta, 
key, value))<a name="line.629"></a>
-<span class="sourceLineNo">630</span>               continue;<a 
name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span>            if (! hasChildren) {<a 
name="line.632"></a>
-<span class="sourceLineNo">633</span>               hasChildren = true;<a 
name="line.633"></a>
-<span class="sourceLineNo">634</span>               out.appendIf(! 
isCollapsed, '&gt;').nlIf(! isMixed, indent);<a name="line.634"></a>
-<span class="sourceLineNo">635</span>            }<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span>            XmlBeanPropertyMeta xbpm = 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            serializeAnything(out, value, 
cMeta, key, xbpm.getNamespace(), false, xbpm.getXmlFormat(), isMixed, false, 
pMeta);<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      }<a name="line.640"></a>
-<span class="sourceLineNo">641</span>      if (! hasContent)<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span>         return (hasChildren ? 
CR_ELEMENTS : isVoidElement ? CR_VOID : CR_EMPTY);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>      out.append('&gt;').nlIf(! isMixed, 
indent);<a name="line.643"></a>
-<span class="sourceLineNo">644</span><a name="line.644"></a>
-<span class="sourceLineNo">645</span>      // Serialize XML content.<a 
name="line.645"></a>
-<span class="sourceLineNo">646</span>      if (content != null) {<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>         if (contentType == null) {<a 
name="line.647"></a>
-<span class="sourceLineNo">648</span>         } else if 
(contentType.isCollection()) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span>            Collection c = 
(Collection)content;<a name="line.649"></a>
-<span class="sourceLineNo">650</span>            for (Iterator i = 
c.iterator(); i.hasNext();) {<a name="line.650"></a>
-<span class="sourceLineNo">651</span>               Object value = i.next();<a 
name="line.651"></a>
-<span class="sourceLineNo">652</span>               serializeAnything(out, 
value, contentType.getElementType(), null, null, false, cf, isMixed, 
preserveWhitespace, null);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>            }<a name="line.653"></a>
-<span class="sourceLineNo">654</span>         } else if 
(contentType.isArray()) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span>            Collection c = 
toList(Object[].class, content);<a name="line.655"></a>
-<span class="sourceLineNo">656</span>            for (Iterator i = 
c.iterator(); i.hasNext();) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span>               Object value = i.next();<a 
name="line.657"></a>
-<span class="sourceLineNo">658</span>               serializeAnything(out, 
value, contentType.getElementType(), null, null, false, cf, isMixed, 
preserveWhitespace, null);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>            }<a name="line.659"></a>
-<span class="sourceLineNo">660</span>         } else {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>            serializeAnything(out, 
content, contentType, null, null, false, cf, isMixed, preserveWhitespace, 
null);<a name="line.661"></a>
-<span class="sourceLineNo">662</span>         }<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      } else {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>         if (! isTrimNulls()) {<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>            if (! isMixed)<a 
name="line.665"></a>
-<span class="sourceLineNo">666</span>               out.i(indent);<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>            out.text(content);<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>            if (! isMixed)<a 
name="line.668"></a>
-<span class="sourceLineNo">669</span>               out.nl(indent);<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>         }<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      }<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      return isMixed ? CR_MIXED : 
CR_ELEMENTS;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>   private XmlWriter 
serializeCollection(XmlWriter out, Object in, ClassMeta&lt;?&gt; sType,<a 
name="line.675"></a>
-<span class="sourceLineNo">676</span>         ClassMeta&lt;?&gt; eType, 
BeanPropertyMeta ppMeta, boolean isMixed) throws Exception {<a 
name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span>      ClassMeta&lt;?&gt; seType = 
sType.getElementType();<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      if (seType == null)<a 
name="line.679"></a>
-<span class="sourceLineNo">680</span>         seType = object();<a 
name="line.680"></a>
-<span class="sourceLineNo">681</span>      ClassMeta&lt;?&gt; eeType = 
eType.getElementType();<a name="line.681"></a>
-<span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>      Collection c = 
(sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span><a name="line.684"></a>
-<span class="sourceLineNo">685</span>      c = sort(c);<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span>      String type2 = null;<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>      if (sType != eType)<a 
name="line.688"></a>
-<span class="sourceLineNo">689</span>         type2 = 
sType.getDictionaryName();<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>      String eName = type2;<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>      Namespace eNs = null;<a 
name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>      if (ppMeta != null) {<a 
name="line.694"></a>
-<span class="sourceLineNo">695</span>         XmlBeanPropertyMeta xbpm = 
ppMeta.getExtendedMeta(XmlBeanPropertyMeta.class);<a name="line.695"></a>
-<span class="sourceLineNo">696</span>         eName = xbpm.getChildName();<a 
name="line.696"></a>
-<span class="sourceLineNo">697</span>         eNs = xbpm.getNamespace();<a 
name="line.697"></a>
-<span class="sourceLineNo">698</span>      }<a name="line.698"></a>
-<span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span>      for (Iterator i = c.iterator(); 
i.hasNext();) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span>         Object value = i.next();<a 
name="line.701"></a>
-<span class="sourceLineNo">702</span>         serializeAnything(out, value, 
eeType, eName, eNs, false, XmlFormat.DEFAULT, isMixed, false, null);<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>      }<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      return out;<a name="line.704"></a>
-<span class="sourceLineNo">705</span>   }<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>   static enum JsonType {<a 
name="line.707"></a>
-<span class="sourceLineNo">708</span>      
STRING("string"),BOOLEAN("boolean"),NUMBER("number"),ARRAY("array"),OBJECT("object"),NULL("null");<a
 name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>      private final String value;<a 
name="line.710"></a>
-<span class="sourceLineNo">711</span>      private JsonType(String value) {<a 
name="line.711"></a>
-<span class="sourceLineNo">712</span>         this.value = value;<a 
name="line.712"></a>
-<span class="sourceLineNo">713</span>      }<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span>      @Override<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      public String toString() {<a 
name="line.716"></a>
-<span class="sourceLineNo">717</span>         return value;<a 
name="line.717"></a>
-<span class="sourceLineNo">718</span>      }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>      boolean isOneOf(JsonType...types) 
{<a name="line.720"></a>
-<span class="sourceLineNo">721</span>         for (JsonType type : types)<a 
name="line.721"></a>
-<span class="sourceLineNo">722</span>            if (type == this)<a 
name="line.722"></a>
-<span class="sourceLineNo">723</span>               return true;<a 
name="line.723"></a>
-<span class="sourceLineNo">724</span>         return false;<a 
name="line.724"></a>
-<span class="sourceLineNo">725</span>      }<a name="line.725"></a>
-<span class="sourceLineNo">726</span>   }<a name="line.726"></a>
-<span class="sourceLineNo">727</span><a name="line.727"></a>
-<span class="sourceLineNo">728</span>   /**<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    * Identifies what the contents were 
of a serialized bean.<a name="line.729"></a>
-<span class="sourceLineNo">730</span>    */<a name="line.730"></a>
-<span class="sourceLineNo">731</span>   static enum ContentResult {<a 
name="line.731"></a>
-<span class="sourceLineNo">732</span>      CR_VOID,      // No 
content...append "/&gt;" to the start tag.<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      CR_EMPTY,     // No 
content...append "/&gt;" to the start tag if XML, "/&gt;&lt;/end&gt;" if 
HTML.<a name="line.733"></a>
-<span class="sourceLineNo">734</span>      CR_MIXED,     // Mixed 
content...don't add whitespace.<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      CR_ELEMENTS   // Elements...use 
normal whitespace rules.<a name="line.735"></a>
-<span class="sourceLineNo">736</span>   }<a name="line.736"></a>
-<span class="sourceLineNo">737</span>}<a name="line.737"></a>
+<span class="sourceLineNo">311</span>            sType = 
swap.getSwapClassMeta(this);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>            // If the getSwapClass() 
method returns Object, we need to figure out<a name="line.313"></a>
+<span class="sourceLineNo">314</span>            // the actual type now.<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>            if (sType.isObject())<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>               sType = 
getClassMetaForObject(o);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>         }<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         sType = 
eType.getSerializedClassMeta(this);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>      // Does the actual type match the 
expected type?<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      boolean isExpectedType = true;<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>      if (o == null || ! 
eType.same(aType)) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>         if (eType.isNumber())<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>            isExpectedType = 
aType.isNumber();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>         else if (eType.isMap())<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>            isExpectedType = 
aType.isMap();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>         else if 
(eType.isCollectionOrArray())<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            isExpectedType = 
aType.isCollectionOrArray();<a name="line.330"></a>
+<span class="sourceLineNo">331</span>         else<a name="line.331"></a>
+<span class="sourceLineNo">332</span>            isExpectedType = false;<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>      String resolvedDictionaryName = 
isExpectedType ? null : aType.getDictionaryName();<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>      // Note that the dictionary name 
may be specified on the actual type or the serialized type.<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>      // HTML templates will have them 
defined on the serialized type.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      String dictionaryName = 
aType.getDictionaryName();<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      if (dictionaryName == null)<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>         dictionaryName = 
sType.getDictionaryName();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>      // char '\0' is interpreted as 
null.<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      if (o != null &amp;&amp; 
sType.isChar() &amp;&amp; ((Character)o).charValue() == 0)<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>         o = null;<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>      boolean isCollapsed = false;     // 
If 'true', this is a collection and we're not rendering the outer element.<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>      boolean isRaw = (sType.isReader() 
|| sType.isInputStream()) &amp;&amp; o != null;<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>      // Get the JSON type string.<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      if (o == null) {<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>         type = NULL;<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>      } else if (sType.isCharSequence() 
|| sType.isChar()) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         type = STRING;<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>      } else if (sType.isNumber()) {<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>         type = NUMBER;<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>      } else if (sType.isBoolean()) {<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>         type = BOOLEAN;<a 
name="line.358"></a>
+<span class="sourceLineNo">359</span>      } else if (sType.isMapOrBean()) {<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>         isCollapsed = 
sType.getExtendedMeta(XmlClassMeta.class).getFormat() == COLLAPSED;<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>         type = OBJECT;<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>      } else if 
(sType.isCollectionOrArray()) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>         isCollapsed = (format == 
COLLAPSED &amp;&amp; ! addNamespaceUris);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>         type = ARRAY;<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>      } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>         type = STRING;<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>      }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if 
(format.isOneOf(MIXED,MIXED_PWS,TEXT,TEXT_PWS,XMLTEXT) &amp;&amp; 
type.isOneOf(NULL,STRING,NUMBER,BOOLEAN))<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         isCollapsed = true;<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>      // Is there a name associated with 
this bean?<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      if (elementName == null &amp;&amp; 
dictionaryName != null) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>         elementName = dictionaryName;<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>         isExpectedType = true;<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>      if (enableNamespaces) {<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>         if (elementNamespace == null)<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>            elementNamespace = 
sType.getExtendedMeta(XmlClassMeta.class).getNamespace();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>         if (elementNamespace == null)<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>            elementNamespace = 
aType.getExtendedMeta(XmlClassMeta.class).getNamespace();<a name="line.382"></a>
+<span class="sourceLineNo">383</span>         if (elementNamespace != null 
&amp;&amp; elementNamespace.uri == null)<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            elementNamespace = null;<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>         if (elementNamespace == null)<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>            elementNamespace = 
defaultNamespace;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      } else {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>         elementNamespace = null;<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>      }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>      // Do we need a carriage return 
after the start tag?<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      boolean cr = o != null &amp;&amp; 
(sType.isMapOrBean() || sType.isCollectionOrArray()) &amp;&amp; ! isMixed;<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span>      String en = elementName;<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>      if (en == null &amp;&amp; ! isRaw) 
{<a name="line.395"></a>
+<span class="sourceLineNo">396</span>         en = type.toString();<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>         type = null;<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>      }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      boolean encodeEn = elementName != 
null;<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      String ns = (elementNamespace == 
null ? null : elementNamespace.name);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      String dns = null, elementNs = 
null;<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      if (enableNamespaces) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>         dns = elementName == null 
&amp;&amp; defaultNamespace != null ? defaultNamespace.name : null;<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>         elementNs = elementName == null 
? dns : ns;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>         if (elementName == null)<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>            elementNamespace = null;<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>      }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>      // Render the start tag.<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>      if (! isCollapsed) {<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>         if (en != null) {<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>            out.oTag(i, elementNs, en, 
encodeEn);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>            if (addNamespaceUris) {<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>               out.attr((String)null, 
"xmlns", defaultNamespace.getUri());<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>               for (Namespace n : 
namespaces)<a name="line.416"></a>
+<span class="sourceLineNo">417</span>                  out.attr("xmlns", 
n.getName(), n.getUri());<a name="line.417"></a>
+<span class="sourceLineNo">418</span>            }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>            if (! isExpectedType) {<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>               if (resolvedDictionaryName 
!= null)<a name="line.420"></a>
+<span class="sourceLineNo">421</span>                  out.attr(dns, 
getBeanTypePropertyName(eType), resolvedDictionaryName);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>               else if (type != null 
&amp;&amp; type != STRING)<a name="line.422"></a>
+<span class="sourceLineNo">423</span>                  out.attr(dns, 
getBeanTypePropertyName(eType), type);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>            }<a name="line.424"></a>
+<span class="sourceLineNo">425</span>         } else {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>            out.i(i);<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>         }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>         if (o == null) {<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>            if ((sType.isBoolean() || 
sType.isNumber()) &amp;&amp; ! sType.isNullable())<a name="line.429"></a>
+<span class="sourceLineNo">430</span>               o = 
sType.getPrimitiveDefault();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>         if (o != null &amp;&amp; ! 
(sType.isMapOrBean() || en == null))<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            out.append('&gt;');<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span>         if (cr &amp;&amp; ! 
(sType.isMapOrBean()))<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            out.nl(i+1);<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>      ContentResult rc = CR_ELEMENTS;<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>      // Render the tag contents.<a 
name="line.442"></a>
+<span class="sourceLineNo">443</span>      if (o != null) {<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>         if (sType.isUri() || (pMeta != 
null &amp;&amp; pMeta.isUri())) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>            out.textUri(o);<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>         } else if 
(sType.isCharSequence() || sType.isChar()) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>            if (format == XMLTEXT)<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>               out.append(o);<a 
name="line.448"></a>
+<span class="sourceLineNo">449</span>            else<a name="line.449"></a>
+<span class="sourceLineNo">450</span>               out.text(o, 
preserveWhitespace);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>         } else if (sType.isNumber() || 
sType.isBoolean()) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>            out.append(o);<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>         } else if (sType.isMap() || 
(wType != null &amp;&amp; wType.isMap())) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            if (o instanceof BeanMap)<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>               rc = serializeBeanMap(out, 
(BeanMap)o, elementNamespace, isCollapsed, isMixed);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            else<a name="line.456"></a>
+<span class="sourceLineNo">457</span>               rc = serializeMap(out, 
(Map)o, sType, eType.getKeyType(), eType.getValueType(), isMixed);<a 
name="line.457"></a>
+<span class="sourceLineNo">458</span>         } else if (sType.isBean()) {<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>            rc = serializeBeanMap(out, 
toBeanMap(o), elementNamespace, isCollapsed, isMixed);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         } else if (sType.isCollection() 
|| (wType != null &amp;&amp; wType.isCollection())) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span>            if (isCollapsed)<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>               this.indent--;<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>            serializeCollection(out, o, 
sType, eType, pMeta, isMixed);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>            if (isCollapsed)<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>               this.indent++;<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>         } else if (sType.isArray()) {<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>            if (isCollapsed)<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>               this.indent--;<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>            serializeCollection(out, o, 
sType, eType, pMeta, isMixed);<a name="line.469"></a>
+<span class="sourceLineNo">470</span>            if (isCollapsed)<a 
name="line.470"></a>
+<span class="sourceLineNo">471</span>               this.indent++;<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>         } else if (sType.isReader() || 
sType.isInputStream()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            IOUtils.pipe(o, out);<a 
name="line.473"></a>
+<span class="sourceLineNo">474</span>         } else {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>            if (format == XMLTEXT)<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>               out.append(toString(o));<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>            else<a name="line.477"></a>
+<span class="sourceLineNo">478</span>               out.text(toString(o));<a 
name="line.478"></a>
+<span class="sourceLineNo">479</span>         }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      }<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      pop();<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>      // Render the end tag.<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (! isCollapsed) {<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>         if (en != null) {<a 
name="line.486"></a>
+<span class="sourceLineNo">487</span>            if (rc == CR_EMPTY) {<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>               if (isHtmlMode())<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>                  
out.append('&gt;').eTag(elementNs, en, encodeEn);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>               else<a name="line.490"></a>
+<span class="sourceLineNo">491</span>                  
out.append('/').append('&gt;');<a name="line.491"></a>
+<span class="sourceLineNo">492</span>            } else if (rc == CR_VOID || o 
== null) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>               
out.append('/').append('&gt;');<a name="line.493"></a>
+<span class="sourceLineNo">494</span>            }<a name="line.494"></a>
+<span class="sourceLineNo">495</span>            else<a name="line.495"></a>
+<span class="sourceLineNo">496</span>               out.ie(cr &amp;&amp; rc != 
CR_MIXED ? i : 0).eTag(elementNs, en, encodeEn);<a name="line.496"></a>
+<span class="sourceLineNo">497</span>         }<a name="line.497"></a>
+<span class="sourceLineNo">498</span>         if (! isMixed)<a 
name="line.498"></a>
+<span class="sourceLineNo">499</span>            out.nl(i);<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>      return out;<a name="line.502"></a>
+<span class="sourceLineNo">503</span>   }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>   private ContentResult 
serializeMap(XmlWriter out, Map m, ClassMeta&lt;?&gt; sType,<a 
name="line.505"></a>
+<span class="sourceLineNo">506</span>         ClassMeta&lt;?&gt; eKeyType, 
ClassMeta&lt;?&gt; eValueType, boolean isMixed) throws Exception {<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>      m = sort(m);<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>      ClassMeta&lt;?&gt; keyType = 
eKeyType == null ? sType.getKeyType() : eKeyType;<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      ClassMeta&lt;?&gt; valueType = 
eValueType == null ? sType.getValueType() : eValueType;<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>      boolean hasChildren = false;<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>      for (Iterator i = 
m.entrySet().iterator(); i.hasNext();) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>         Map.Entry e = 
(Map.Entry)i.next();<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>         Object k = e.getKey();<a 
name="line.517"></a>
+<span class="sourceLineNo">518</span>         if (k == null) {<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>            k = "\u0000";<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>         } else {<a name="line.520"></a>
+<span class="sourceLineNo">521</span>            k = generalize(k, keyType);<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span>            if (isTrimStrings() 
&amp;&amp; k instanceof String)<a name="line.522"></a>
+<span class="sourceLineNo">523</span>               k = k.toString().trim();<a 
name="line.523"></a>
+<span class="sourceLineNo">524</span>         }<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>         Object value = e.getValue();<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span>         if (! hasChildren) {<a 
name="line.528"></a>
+<span class="sourceLineNo">529</span>            hasChildren = true;<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>            out.append('&gt;').nlIf(! 
isMixed, indent);<a name="line.530"></a>
+<span class="sourceLineNo">531</span>         }<a name="line.531"></a>
+<span class="sourceLineNo">532</span>         serializeAnything(out, value, 
valueType, toString(k), null, false, XmlFormat.DEFAULT, isMixed, false, 
null);<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      }<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      return hasChildren ? CR_ELEMENTS : 
CR_EMPTY;<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>   private ContentResult 
serializeBeanMap(XmlWriter out, BeanMap&lt;?&gt; m,<a name="line.537"></a>
+<span class="sourceLineNo">538</span>         Namespace elementNs, boolean 
isCollapsed, boolean isMixed) throws Exception {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      boolean hasChildren = false;<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>      BeanMeta&lt;?&gt; bm = 
m.getMeta();<a name="line.540"></a>
+<span class="sourceLineNo">541</span><a name="line.541"></a>
+<span class="sourceLineNo">542</span>      List&lt;BeanPropertyValue&gt; lp = 
m.getValues(isTrimNulls());<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span>      XmlBeanMeta xbm = 
bm.getExtendedMeta(XmlBeanMeta.class);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>      Set&lt;String&gt;<a 
name="line.546"></a>
+<span class="sourceLineNo">547</span>         attrs = 
xbm.getAttrPropertyNames(),<a name="line.547"></a>
+<span class="sourceLineNo">548</span>         elements = 
xbm.getElementPropertyNames(),<a name="line.548"></a>
+<span class="sourceLineNo">549</span>         collapsedElements = 
xbm.getCollapsedPropertyNames();<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      String<a name="line.550"></a>
+<span class="sourceLineNo">551</span>         attrsProperty = 
xbm.getAttrsPropertyName(),<a name="line.551"></a>
+<span class="sourceLineNo">552</span>         contentProperty = 
xbm.getContentPropertyName();<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>      XmlFormat cf = null;<a 
name="line.554"></a>
+<span class="sourceLineNo">555</span><a name="line.555"></a>
+<span class="sourceLineNo">556</span>      Object content = null;<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>      ClassMeta&lt;?&gt; contentType = 
null;<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      for (BeanPropertyValue p : lp) {<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>         String n = p.getName();<a 
name="line.559"></a>
+<span class="sourceLineNo">560</span>         if (attrs.contains(n) || 
attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>            BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>            ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.562"></a>
+<span class="sourceLineNo">563</span><a name="line.563"></a>
+<span class="sourceLineNo">564</span>            String key = p.getName();<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>            Object value = 
p.getValue();<a name="line.565"></a>
+<span class="sourceLineNo">566</span>            Throwable t = 
p.getThrown();<a name="line.566"></a>
+<span class="sourceLineNo">567</span>            if (t != null)<a 
name="line.567"></a>
+<span class="sourceLineNo">568</span>               
onBeanGetterException(pMeta, t);<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span>            if (canIgnoreValue(cMeta, 
key, value))<a name="line.570"></a>
+<span class="sourceLineNo">571</span>               continue;<a 
name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span>            Namespace ns = 
(enableNamespaces &amp;&amp; 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() != elementNs ? 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace() : null);<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span>            if (pMeta.isUri()  ) {<a 
name="line.575"></a>
+<span class="sourceLineNo">576</span>               out.attrUri(ns, key, 
value);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            } else if 
(n.equals(attrsProperty)) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>               if (value instanceof 
BeanMap) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span>                  BeanMap&lt;?&gt; bm2 = 
(BeanMap)value;<a name="line.579"></a>
+<span class="sourceLineNo">580</span>                  for (BeanPropertyValue 
p2 : bm2.getValues(true)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                     String key2 = 
p2.getName();<a name="line.581"></a>
+<span class="sourceLineNo">582</span>                     Object value2 = 
p2.getValue();<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                     Throwable t2 = 
p2.getThrown();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                     if (t2 != null)<a 
name="line.584"></a>
+<span class="sourceLineNo">585</span>                        
onBeanGetterException(pMeta, t);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                     out.attr(ns, key2, 
value2);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>                  }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>               } else /* Map */ {<a 
name="line.588"></a>
+<span class="sourceLineNo">589</span>                  Map m2 = (Map)value;<a 
name="line.589"></a>
+<span class="sourceLineNo">590</span>                  for (Map.Entry e : 
(Set&lt;Map.Entry&gt;)(m2.entrySet())) {<a name="line.590"></a>
+<span class="sourceLineNo">591</span>                     out.attr(ns, 
toString(e.getKey()), e.getValue());<a name="line.591"></a>
+<span class="sourceLineNo">592</span>                  }<a name="line.592"></a>
+<span class="sourceLineNo">593</span>               }<a name="line.593"></a>
+<span class="sourceLineNo">594</span>            } else {<a 
name="line.594"></a>
+<span class="sourceLineNo">595</span>               out.attr(ns, key, 
value);<a name="line.595"></a>
+<span class="sourceLineNo">596</span>            }<a name="line.596"></a>
+<span class="sourceLineNo">597</span>         }<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>      boolean<a name="line.600"></a>
+<span class="sourceLineNo">601</span>         hasContent = false,<a 
name="line.601"></a>
+<span class="sourceLineNo">602</span>         preserveWhitespace = false,<a 
name="line.602"></a>
+<span class="sourceLineNo">603</span>         isVoidElement = 
xbm.getContentFormat() == VOID;<a name="line.603"></a>
+<span class="sourceLineNo">604</span><a name="line.604"></a>
+<span class="sourceLineNo">605</span>      for (BeanPropertyValue p : lp) {<a 
name="line.605"></a>
+<span class="sourceLineNo">606</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.606"></a>
+<span class="sourceLineNo">607</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.607"></a>
+<span class="sourceLineNo">608</span><a name="line.608"></a>
+<span class="sourceLineNo">609</span>         String n = p.getName();<a 
name="line.609"></a>
+<span class="sourceLineNo">610</span>         if (n.equals(contentProperty)) 
{<a name="line.610"></a>
+<span class="sourceLineNo">611</span>            content = p.getValue();<a 
name="line.611"></a>
+<span class="sourceLineNo">612</span>            contentType = 
p.getClassMeta();<a name="line.612"></a>
+<span class="sourceLineNo">613</span>            hasContent = true;<a 
name="line.613"></a>
+<span class="sourceLineNo">614</span>            cf = 
xbm.getContentFormat();<a name="line.614"></a>
+<span class="sourceLineNo">615</span>            if 
(cf.isOneOf(MIXED,MIXED_PWS,TEXT,TEXT_PWS,XMLTEXT))<a name="line.615"></a>
+<span class="sourceLineNo">616</span>               isMixed = true;<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>            if (cf.isOneOf(MIXED_PWS, 
TEXT_PWS))<a name="line.617"></a>
+<span class="sourceLineNo">618</span>               preserveWhitespace = 
true;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>            if 
(contentType.isCollection() &amp;&amp; ((Collection)content).isEmpty())<a 
name="line.619"></a>
+<span class="sourceLineNo">620</span>               hasContent = false;<a 
name="line.620"></a>
+<span class="sourceLineNo">621</span>            else if 
(contentType.isArray() &amp;&amp; Array.getLength(content) == 0)<a 
name="line.621"></a>
+<span class="sourceLineNo">622</span>               hasContent = false;<a 
name="line.622"></a>
+<span class="sourceLineNo">623</span>         } else if (elements.contains(n) 
|| collapsedElements.contains(n) || elements.contains("*") || 
collapsedElements.contains("*") ) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span>            String key = p.getName();<a 
name="line.624"></a>
+<span class="sourceLineNo">625</span>            Object value = 
p.getValue();<a name="line.625"></a>
+<span class="sourceLineNo">626</span>            Throwable t = 
p.getThrown();<a name="line.626"></a>
+<span class="sourceLineNo">627</span>            if (t != null)<a 
name="line.627"></a>
+<span class="sourceLineNo">628</span>               
onBeanGetterException(pMeta, t);<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span>            if (canIgnoreValue(cMeta, 
key, value))<a name="line.630"></a>
+<span class="sourceLineNo">631</span>               continue;<a 
name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span>            if (! hasChildren) {<a 
name="line.633"></a>
+<span class="sourceLineNo">634</span>               hasChildren = true;<a 
name="line.634"></a>
+<span class="sourceLineNo">635</span>               out.appendIf(! 
isCollapsed, '&gt;').nlIf(! isMixed, indent);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>            }<a name="line.636"></a>
+<span class="sourceLineNo">637</span><a name="line.637"></a>
+<span class="sourceLineNo">638</span>            XmlBeanPropertyMeta xbpm = 
pMeta.getExtendedMeta(XmlBeanPropertyMeta.class);<a name="line.638"></a>
+<span class="sourceLineNo">639</span>            serializeAnything(out, value, 
cMeta, key, xbpm.getNamespace(), false, xbpm.getXmlFormat(), isMixed, false, 
pMeta);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>         }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      }<a name="line.641"></a>
+<span class="sourceLineNo">642</span>      if (! hasContent)<a 
name="line.642"></a>
+<span class="sourceLineNo">643</span>         return (hasChildren ? 
CR_ELEMENTS : isVoidElement ? CR_VOID : CR_EMPTY);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>      out.append('&gt;').nlIf(! isMixed, 
indent);<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span>      // Serialize XML content.<a 
name="line.646"></a>
+<span class="sourceLineNo">647</span>      if (content != null) {<a 
name="line.647"></a>
+<span class="sourceLineNo">648</span>         if (contentType == null) {<a 
name="line.648"></a>
+<span class="sourceLineNo">649</span>         } else if 
(contentType.isCollection()) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span>            Collection c = 
(Collection)content;<a name="line.650"></a>
+<span class="sourceLineNo">651</span>            for (Iterator i = 
c.iterator(); i.hasNext();) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span>               Object value = i.next();<a 
name="line.652"></a>
+<span class="sourceLineNo">653</span>               serializeAnything(out, 
value, contentType.getElementType(), null, null, false, cf, isMixed, 
preserveWhitespace, null);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>            }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>         } else if 
(contentType.isArray()) {<a name="line.655"></a>
+<span class="sourceLineNo">656</span>            Collection c = 
toList(Object[].class, content);<a name="line.656"></a>
+<span class="sourceLineNo">657</span>            for (Iterator i = 
c.iterator(); i.hasNext();) {<a name="line.657"></a>
+<span class="sourceLineNo">658</span>               Object value = i.next();<a 
name="line.658"></a>
+<span class="sourceLineNo">659</span>               serializeAnything(out, 
value, contentType.getElementType(), null, null, false, cf, isMixed, 
preserveWhitespace, null);<a name="line.659"></a>
+<span class="sourceLineNo">660</span>            }<a name="line.660"></a>
+<span class="sourceLineNo">661</span>         } else {<a name="line.661"></a>
+<span class="sourceLineNo">662</span>            serializeAnything(out, 
content, contentType, null, null, false, cf, isMixed, preserveWhitespace, 
null);<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         }<a name="line.663"></a>
+<span class="sourceLineNo">664</span>      } else {<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         if (! isTrimNulls()) {<a 
name="line.665"></a>
+<span class="sourceLineNo">666</span>            if (! isMixed)<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>               out.i(indent);<a 
name="line.667"></a>
+<span class="sourceLineNo">668</span>            out.text(content);<a 
name="line.668"></a>
+<span class="sourceLineNo">669</span>            if (! isMixed)<a 
name="line.669"></a>
+<span class="sourceLineNo">670</span>               out.nl(indent);<a 
name="line.670"></a>
+<span class="sourceLineNo">671</span>         }<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      }<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      return isMixed ? CR_MIXED : 
CR_ELEMENTS;<a name="line.673"></a>
+<span class="sourceLineNo">674</span>   }<a name="line.674"></a>
+<span class="sourceLineNo">675</span><a name="line.675"></a>
+<span class="sourceLineNo">676</span>   private XmlWriter 
serializeCollection(XmlWriter out, Object in, ClassMeta&lt;?&gt; sType,<a 
name="line.676"></a>
+<span class="sourceLineNo">677</span>         ClassMeta&lt;?&gt; eType, 
BeanPropertyMeta ppMeta, boolean isMixed) throws Exception {<a 
name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span>      ClassMeta&lt;?&gt; seType = 
sType.getElementType();<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      if (seType == null)<a 
name="line.680"></a>
+<span class="sourceLineNo">681</span>         seType = object();<a 
name="line.681"></a>
+<span class="sourceLineNo">682</span>      ClassMeta&lt;?&gt; eeType = 
eType.getElementType();<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span>      Collection c = 
(sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a 
name="line.684"></a>
+<span class="sourceLineNo">685</span><a name="line.685"></a>
+<span class="sourceLineNo">686</span>      c = sort(c);<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span>      String type2 = null;<a 
name="line.688"></a>
+<span class="sourceLineNo">689</span>      if (sType != eType)<a 
name="line.689"></a>
+<span class="sourceLineNo">690</span>         type2 = 
sType.getDictionaryName();<a name="line.690"></a>
+<span class="sourceLineNo">691</span><a name="line.691"></a>
+<span class="sourceLineNo">692</span>      String eName = type2;<a 
name="line.692"></a>
+<span class="sourceLineNo">693</span>      Namespace eNs = null;<a 
name="line.693"></a>
+<span class="sourceLineNo">694</span><a name="line.694"></a>
+<span class="sourceLineNo">695</span>      if (ppMeta != null) {<a 
name="line.695"></a>
+<span class="sourceLineNo">696</span>         XmlBeanPropertyMeta xbpm = 
ppMeta.getExtendedMeta(XmlBeanPropertyMeta.class);<a name="line.696"></a>
+<span class="sourceLineNo">697</span>         eName = xbpm.getChildName();<a 
name="line.697"></a>
+<span class="sourceLineNo">698</span>         eNs = xbpm.getNamespace();<a 
name="line.698"></a>
+<span class="sourceLineNo">699</span>      }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span>      for (Iterator i = c.iterator(); 
i.hasNext();) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>         Object value = i.next();<a 
name="line.702"></a>
+<span class="sourceLineNo">703</span>         serializeAnything(out, value, 
eeType, eName, eNs, false, XmlFormat.DEFAULT, isMixed, false, null);<a 
name="line.703"></a>
+<span class="sourceLineNo">704</span>      }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>      return out;<a name="line.705"></a>
+<span class="sourceLineNo">706</span>   }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>   static enum JsonType {<a 
name="line.708"></a>
+<span class="sourceLineNo">709</span>      
STRING("string"),BOOLEAN("boolean"),NUMBER("number"),ARRAY("array"),OBJECT("object"),NULL("null");<a
 name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span>      private final String value;<a 
name="line.711"></a>
+<span class="sourceLineNo">712</span>      private JsonType(String value) {<a 
name="line.712"></a>
+<span class="sourceLineNo">713</span>         this.value = value;<a 
name="line.713"></a>
+<span class="sourceLineNo">714</span>      }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span>      @Override<a name="line.716"></a>
+<span class="sourceLineNo">717</span>      public String toString() {<a 
name="line.717"></a>
+<span class="sourceLineNo">718</span>         return value;<a 
name="line.718"></a>
+<span class="sourceLineNo">719</span>      }<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>      boolean isOneOf(JsonType...types) 
{<a name="line.721"></a>
+<span class="sourceLineNo">722</span>         for (JsonType type : types)<a 
name="line.722"></a>
+<span class="sourceLineNo">723</span>            if (type == this)<a 
name="line.723"></a>
+<span class="sourceLineNo">724</span>               return true;<a 
name="line.724"></a>
+<span class="sourceLineNo">725</span>         return false;<a 
name="line.725"></a>
+<span class="sourceLineNo">726</span>      }<a name="line.726"></a>
+<span class="sourceLineNo">727</span>   }<a name="line.727"></a>
+<span class="sourceLineNo">728</span><a name="line.728"></a>
+<span class="sourceLineNo">729</span>   /**<a name="line.729"></a>
+<span class="sourceLineNo">730</span>    * Identifies what the contents were 
of a serialized bean.<a name="line.730"></a>
+<span class="sourceLineNo">731</span>    */<a name="line.731"></a>
+<span class="sourceLineNo">732</span>   static enum ContentResult {<a 
name="line.732"></a>
+<span class="sourceLineNo">733</span>      CR_VOID,      // No 
content...append "/&gt;" to the start tag.<a name="line.733"></a>
+<span class="sourceLineNo">734</span>      CR_EMPTY,     // No 
content...append "/&gt;" to the start tag if XML, "/&gt;&lt;/end&gt;" if 
HTML.<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      CR_MIXED,     // Mixed 
content...don't add whitespace.<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      CR_ELEMENTS   // Elements...use 
normal whitespace rules.<a name="line.736"></a>
+<span class="sourceLineNo">737</span>   }<a name="line.737"></a>
+<span class="sourceLineNo">738</span>}<a name="line.738"></a>
 
 
 

Reply via email to