http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
index ed8c7ee..c5ae2f6 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
@@ -446,340 +446,361 @@
 <span class="sourceLineNo">438</span>      out.ie(i).eTag("table").nl(i);<a 
name="line.438"></a>
 <span class="sourceLineNo">439</span>   }<a name="line.439"></a>
 <span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span>   private void 
serializeBeanMap(HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; 
eType,<a name="line.441"></a>
-<span class="sourceLineNo">442</span>         BeanPropertyMeta ppMeta) throws 
Exception {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>      int i = indent;<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span>      out.oTag(i, "table");<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>      String typeName = 
m.getMeta().getDictionaryName();<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      if (typeName != null &amp;&amp; 
eType != m.getClassMeta())<a name="line.448"></a>
-<span class="sourceLineNo">449</span>         
out.attr(getBeanTypePropertyName(m.getClassMeta()), typeName);<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>      out.append('&gt;').nl(i);<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>      if (isAddKeyValueTableHeaders() 
&amp;&amp; ! 
(m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders()<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>            || (ppMeta != null &amp;&amp; 
ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>         out.sTag(i+1, "tr").nl(i+1);<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>         out.sTag(i+2, 
"th").append("key").eTag("th").nl(i+2);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>         out.sTag(i+2, 
"th").append("value").eTag("th").nl(i+2);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>         
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>      for (BeanPropertyValue p : 
m.getValues(isTrimNulls())) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.461"></a>
-<span class="sourceLineNo">462</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>         String key = p.getName();<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>         Object value = p.getValue();<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>         Throwable t = p.getThrown();<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>         if (t != null)<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>            onBeanGetterException(pMeta, 
t);<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>         if (canIgnoreValue(cMeta, key, 
value))<a name="line.470"></a>
-<span class="sourceLineNo">471</span>            continue;<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>         String link = 
cMeta.isCollectionOrArray() ? null : getLink(pMeta);<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>         out.sTag(i+1, "tr").nl(i+1);<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>         out.sTag(i+2, 
"td").text(key).eTag("td").nl(i+2);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>         out.oTag(i+2, "td");<a 
name="line.477"></a>
-<span class="sourceLineNo">478</span>         String style = getStyle(this, 
pMeta, value);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>         if (style != null)<a 
name="line.479"></a>
-<span class="sourceLineNo">480</span>            out.attr("style", style);<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>         out.cTag();<a 
name="line.481"></a>
+<span class="sourceLineNo">441</span>   @SuppressWarnings("hiding")<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>   private void 
serializeBeanMap(HtmlWriter out, BeanMap&lt;?&gt; m, ClassMeta&lt;?&gt; 
eType,<a name="line.442"></a>
+<span class="sourceLineNo">443</span>         BeanPropertyMeta ppMeta) throws 
Exception {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      int i = indent;<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span>      out.oTag(i, "table");<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>      String typeName = 
m.getMeta().getDictionaryName();<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      if (typeName != null &amp;&amp; 
eType != m.getClassMeta())<a name="line.449"></a>
+<span class="sourceLineNo">450</span>         
out.attr(getBeanTypePropertyName(m.getClassMeta()), typeName);<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>      out.append('&gt;').nl(i);<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>      if (isAddKeyValueTableHeaders() 
&amp;&amp; ! 
(m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders()<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>            || (ppMeta != null &amp;&amp; 
ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) {<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>         out.sTag(i+1, "tr").nl(i+1);<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>         out.sTag(i+2, 
"th").append("key").eTag("th").nl(i+2);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>         out.sTag(i+2, 
"th").append("value").eTag("th").nl(i+2);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>         
out.ie(i+1).eTag("tr").nl(i+1);<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>      for (BeanPropertyValue p : 
m.getValues(isTrimNulls())) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span>         String key = p.getName();<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>         Object value = p.getValue();<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>         Throwable t = p.getThrown();<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>         if (t != null)<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>            onBeanGetterException(pMeta, 
t);<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>         if (canIgnoreValue(cMeta, key, 
value))<a name="line.471"></a>
+<span class="sourceLineNo">472</span>            continue;<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>         String link = null, anchorText = 
null;<a name="line.474"></a>
+<span class="sourceLineNo">475</span>         if (! 
cMeta.isCollectionOrArray()) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>            link = 
m.resolveVars(getLink(pMeta));<a name="line.476"></a>
+<span class="sourceLineNo">477</span>            anchorText = 
m.resolveVars(getAnchorText(pMeta));<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>         if (anchorText != null)<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>            value = anchorText;<a 
name="line.481"></a>
 <span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>         try {<a name="line.483"></a>
-<span class="sourceLineNo">484</span>            if (link != null)<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>               out.oTag(i+3, 
"a").attrUri("href", m.resolveVars(link)).cTag();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>            ContentResult cr = 
serializeAnything(out, value, cMeta, key, 2, pMeta, false);<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>            if (cr == CR_NORMAL)<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>               out.i(i+2);<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>            if (link != null)<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>               out.eTag("a");<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>         } catch (SerializeException e) 
{<a name="line.491"></a>
-<span class="sourceLineNo">492</span>            throw e;<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>         } catch (Error e) {<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>            throw e;<a 
name="line.494"></a>
-<span class="sourceLineNo">495</span>         } catch (Throwable e) {<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>            e.printStackTrace();<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>            onBeanGetterException(pMeta, 
e);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>         }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>         out.eTag("td").nl(i+2);<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>         
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.500"></a>
-<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      out.ie(i).eTag("table").nl(i);<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>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   private void 
serializeCollection(HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType,<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>         ClassMeta&lt;?&gt; eType, String 
name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>      ClassMeta&lt;?&gt; seType = 
sType.getElementType();<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      if (seType == null)<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>         seType = object();<a 
name="line.511"></a>
+<span class="sourceLineNo">483</span>         out.sTag(i+1, "tr").nl(i+1);<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>         out.sTag(i+2, 
"td").text(key).eTag("td").nl(i+2);<a name="line.484"></a>
+<span class="sourceLineNo">485</span>         out.oTag(i+2, "td");<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>         String style = getStyle(this, 
pMeta, value);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>         if (style != null)<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>            out.attr("style", style);<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>         out.cTag();<a 
name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>         try {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>            if (link != null)<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>               out.oTag(i+3, 
"a").attrUri("href", link).cTag();<a name="line.493"></a>
+<span class="sourceLineNo">494</span>            ContentResult cr = 
serializeAnything(out, value, cMeta, key, 2, pMeta, false);<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>            if (cr == CR_NORMAL)<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span>               out.i(i+2);<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>            if (link != null)<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>               out.eTag("a");<a 
name="line.498"></a>
+<span class="sourceLineNo">499</span>         } catch (SerializeException e) 
{<a name="line.499"></a>
+<span class="sourceLineNo">500</span>            throw e;<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>         } catch (Error e) {<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>            throw e;<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>         } catch (Throwable e) {<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>            e.printStackTrace();<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>            onBeanGetterException(pMeta, 
e);<a name="line.505"></a>
+<span class="sourceLineNo">506</span>         }<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         out.eTag("td").nl(i+2);<a 
name="line.507"></a>
+<span class="sourceLineNo">508</span>         
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      out.ie(i).eTag("table").nl(i);<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span>   }<a name="line.511"></a>
 <span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>      Collection c = 
(sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span>      int i = indent;<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>      if (c.isEmpty()) {<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>         out.appendln(i, 
"&lt;ul&gt;&lt;/ul&gt;");<a name="line.517"></a>
-<span class="sourceLineNo">518</span>         return;<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      }<a name="line.519"></a>
+<span class="sourceLineNo">513</span>   @SuppressWarnings({ "rawtypes", 
"unchecked", "hiding" })<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   private void 
serializeCollection(HtmlWriter out, Object in, ClassMeta&lt;?&gt; sType,<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>         ClassMeta&lt;?&gt; eType, String 
name, BeanPropertyMeta ppMeta) throws Exception {<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>      ClassMeta&lt;?&gt; seType = 
sType.getElementType();<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      if (seType == null)<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>         seType = object();<a 
name="line.519"></a>
 <span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>      String type2 = null;<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span>      if (sType != eType)<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span>         type2 = 
sType.getDictionaryName();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      if (type2 == null)<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>         type2 = "array";<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>      c = sort(c);<a name="line.527"></a>
+<span class="sourceLineNo">521</span>      Collection c = 
(sType.isCollection() ? (Collection)in : toList(sType.getInnerClass(), in));<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span>      int i = indent;<a 
name="line.523"></a>
+<span class="sourceLineNo">524</span>      if (c.isEmpty()) {<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>         out.appendln(i, 
"&lt;ul&gt;&lt;/ul&gt;");<a name="line.525"></a>
+<span class="sourceLineNo">526</span>         return;<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>      HtmlBeanPropertyMeta hbpMeta = 
(ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a 
name="line.529"></a>
-<span class="sourceLineNo">530</span>      String btpn = 
getBeanTypePropertyName(eType);<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>      // Look at the objects to see how 
we're going to handle them.  Check the first object to see how we're going to<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>      // handle this.<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>      // If it's a map or bean, then 
we'll create a table.<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // Otherwise, we'll create a 
list.<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      Object[] th = getTableHeaders(c, 
hbpMeta);<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span>      if (th != null) {<a 
name="line.538"></a>
+<span class="sourceLineNo">529</span>      String type2 = null;<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>      if (sType != eType)<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>         type2 = 
sType.getDictionaryName();<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      if (type2 == null)<a 
name="line.532"></a>
+<span class="sourceLineNo">533</span>         type2 = "array";<a 
name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span>      c = sort(c);<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span>      HtmlBeanPropertyMeta hbpMeta = 
(ppMeta == null ? null : ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class));<a 
name="line.537"></a>
+<span class="sourceLineNo">538</span>      String btpn = 
getBeanTypePropertyName(eType);<a name="line.538"></a>
 <span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>         out.oTag(i, "table").attr(btpn, 
type2).append('&gt;').nl(i+1);<a name="line.540"></a>
-<span class="sourceLineNo">541</span>         out.sTag(i+1, "tr").nl(i+2);<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>         for (Object key : th) {<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>            out.sTag(i+2, "th");<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>            out.text(convertToType(key, 
String.class));<a name="line.544"></a>
-<span class="sourceLineNo">545</span>            out.eTag("th").nl(i+2);<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>         }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>         
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>         for (Object o : c) {<a 
name="line.549"></a>
-<span class="sourceLineNo">550</span>            ClassMeta&lt;?&gt; cm = 
getClassMetaForObject(o);<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>            if (cm != null &amp;&amp; 
cm.getPojoSwap() != null) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>               PojoSwap f = 
cm.getPojoSwap();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>               o = f.swap(this, o);<a 
name="line.554"></a>
-<span class="sourceLineNo">555</span>               cm = 
cm.getSerializedClassMeta();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>            }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>            out.oTag(i+1, "tr");<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>            String typeName = (cm == null 
? null : cm.getDictionaryName());<a name="line.559"></a>
-<span class="sourceLineNo">560</span>            String typeProperty = 
getBeanTypePropertyName(cm);<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>            if (typeName != null 
&amp;&amp; eType.getElementType() != cm)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>               out.attr(typeProperty, 
typeName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            out.cTag().nl(i+2);<a 
name="line.564"></a>
+<span class="sourceLineNo">540</span>      // Look at the objects to see how 
we're going to handle them.  Check the first object to see how we're going to<a 
name="line.540"></a>
+<span class="sourceLineNo">541</span>      // handle this.<a 
name="line.541"></a>
+<span class="sourceLineNo">542</span>      // If it's a map or bean, then 
we'll create a table.<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      // Otherwise, we'll create a 
list.<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      Object[] th = getTableHeaders(c, 
hbpMeta);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>      if (th != null) {<a 
name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span>         out.oTag(i, "table").attr(btpn, 
type2).append('&gt;').nl(i+1);<a name="line.548"></a>
+<span class="sourceLineNo">549</span>         out.sTag(i+1, "tr").nl(i+2);<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span>         for (Object key : th) {<a 
name="line.550"></a>
+<span class="sourceLineNo">551</span>            out.sTag(i+2, "th");<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>            out.text(convertToType(key, 
String.class));<a name="line.552"></a>
+<span class="sourceLineNo">553</span>            out.eTag("th").nl(i+2);<a 
name="line.553"></a>
+<span class="sourceLineNo">554</span>         }<a name="line.554"></a>
+<span class="sourceLineNo">555</span>         
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.555"></a>
+<span class="sourceLineNo">556</span><a name="line.556"></a>
+<span class="sourceLineNo">557</span>         for (Object o : c) {<a 
name="line.557"></a>
+<span class="sourceLineNo">558</span>            ClassMeta&lt;?&gt; cm = 
getClassMetaForObject(o);<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span>            if (cm != null &amp;&amp; 
cm.getPojoSwap() != null) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>               PojoSwap f = 
cm.getPojoSwap();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>               o = f.swap(this, o);<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>               cm = 
cm.getSerializedClassMeta();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>            }<a name="line.564"></a>
 <span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>            if (cm == null) {<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>               serializeAnything(out, o, 
null, null, 1, null, false);<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>            } else if (cm.isMap() 
&amp;&amp; ! (cm.isBeanMap())) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>               Map m2 = sort((Map)o);<a 
name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span>               for (Object k : th) {<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span>                  out.sTag(i+2, "td");<a 
name="line.573"></a>
-<span class="sourceLineNo">574</span>                  ContentResult cr = 
serializeAnything(out, m2.get(k), eType.getElementType(), toString(k), 2, null, 
false);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>                  if (cr == CR_NORMAL)<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>                     out.i(i+2);<a 
name="line.576"></a>
-<span class="sourceLineNo">577</span>                  
out.eTag("td").nl(i+2);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>               }<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            } else {<a 
name="line.579"></a>
-<span class="sourceLineNo">580</span>               BeanMap m2 = null;<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>               if (o instanceof 
BeanMap)<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                  m2 = (BeanMap)o;<a 
name="line.582"></a>
-<span class="sourceLineNo">583</span>               else<a name="line.583"></a>
-<span class="sourceLineNo">584</span>                  m2 = toBeanMap(o);<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>               for (Object k : th) {<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>                  BeanMapEntry p = 
m2.getProperty(toString(k));<a name="line.587"></a>
-<span class="sourceLineNo">588</span>                  BeanPropertyMeta pMeta 
= p.getMeta();<a name="line.588"></a>
-<span class="sourceLineNo">589</span>                  String link = 
pMeta.getClassMeta().isCollectionOrArray() ? null : getLink(pMeta);<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>                  Object value = 
p.getValue();<a name="line.590"></a>
-<span class="sourceLineNo">591</span>                  String style = 
getStyle(this, pMeta, value);<a name="line.591"></a>
-<span class="sourceLineNo">592</span>                  out.oTag(i+2, "td");<a 
name="line.592"></a>
-<span class="sourceLineNo">593</span>                  if (style != null)<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>                     out.attr("style", 
style);<a name="line.594"></a>
-<span class="sourceLineNo">595</span>                  out.cTag();<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>                  if (link != null)<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>                     
out.oTag("a").attrUri("href", m2.resolveVars(link)).cTag();<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>                  ContentResult cr = 
serializeAnything(out, value, pMeta.getClassMeta(), p.getKey().toString(), 2, 
pMeta, false);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>                  if (cr == CR_NORMAL)<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>                     out.i(i+2);<a 
name="line.600"></a>
-<span class="sourceLineNo">601</span>                  if (link != null)<a 
name="line.601"></a>
-<span class="sourceLineNo">602</span>                     out.eTag("a");<a 
name="line.602"></a>
-<span class="sourceLineNo">603</span>                  
out.eTag("td").nl(i+2);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>               }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>            }<a name="line.605"></a>
-<span class="sourceLineNo">606</span>            
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>         }<a name="line.607"></a>
-<span class="sourceLineNo">608</span>         out.ie(i).eTag("table").nl(i);<a 
name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span>      } else {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>         out.oTag(i, "ul");<a 
name="line.611"></a>
-<span class="sourceLineNo">612</span>         if (! type2.equals("array"))<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span>            out.attr(btpn, type2);<a 
name="line.613"></a>
-<span class="sourceLineNo">614</span>         out.append('&gt;').nl(i+1);<a 
name="line.614"></a>
-<span class="sourceLineNo">615</span>         for (Object o : c) {<a 
name="line.615"></a>
-<span class="sourceLineNo">616</span>            out.oTag(i+1, "li");<a 
name="line.616"></a>
-<span class="sourceLineNo">617</span>            String style = getStyle(this, 
ppMeta, o);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>            String link = 
getLink(ppMeta);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>            if (style != null)<a 
name="line.619"></a>
-<span class="sourceLineNo">620</span>               out.attr("style", 
style);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>            out.cTag();<a 
name="line.621"></a>
-<span class="sourceLineNo">622</span>            if (link != null)<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>               out.oTag(i+2, 
"a").attrUri("href", link.replace("{#}", StringUtils.toString(o))).cTag();<a 
name="line.623"></a>
-<span class="sourceLineNo">624</span>            ContentResult cr = 
serializeAnything(out, o, eType.getElementType(), name, 1, null, false);<a 
name="line.624"></a>
-<span class="sourceLineNo">625</span>            if (link != null)<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>               out.eTag("a");<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>            if (cr == CR_NORMAL)<a 
name="line.627"></a>
-<span class="sourceLineNo">628</span>               out.ie(i+1);<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>            out.eTag("li").nl(i+1);<a 
name="line.629"></a>
-<span class="sourceLineNo">630</span>         }<a name="line.630"></a>
-<span class="sourceLineNo">631</span>         out.ie(i).eTag("ul").nl(i);<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>      }<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   }<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span>   private static HtmlRender&lt;?&gt; 
getRender(HtmlSerializerSession session, BeanPropertyMeta pMeta, Object value) 
{<a name="line.635"></a>
-<span class="sourceLineNo">636</span>      if (pMeta == null)<a 
name="line.636"></a>
-<span class="sourceLineNo">637</span>         return null;<a 
name="line.637"></a>
-<span class="sourceLineNo">638</span>      HtmlBeanPropertyMeta hpMeta = 
pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.638"></a>
-<span class="sourceLineNo">639</span>      HtmlRender&lt;?&gt; render = 
hpMeta.getRender();<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      if (render != null)<a 
name="line.640"></a>
-<span class="sourceLineNo">641</span>         return render;<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span>      ClassMeta&lt;?&gt; cMeta = 
session.getClassMetaForObject(value);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>      render = cMeta == null ? null : 
cMeta.getExtendedMeta(HtmlClassMeta.class).getRender();<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      return render;<a 
name="line.644"></a>
-<span class="sourceLineNo">645</span>   }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>   
@SuppressWarnings({"rawtypes","unchecked"})<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   private static String 
getStyle(HtmlSerializerSession session, BeanPropertyMeta pMeta, Object value) 
{<a name="line.648"></a>
-<span class="sourceLineNo">649</span>      HtmlRender render = 
getRender(session, pMeta, value);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      return render == null ? null : 
render.getStyle(session, value);<a name="line.650"></a>
-<span class="sourceLineNo">651</span>   }<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>   private static String 
getLink(BeanPropertyMeta pMeta) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return pMeta == null ? null : 
pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).getLink();<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>   }<a name="line.655"></a>
-<span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>   /*<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    * Returns the table column headers 
for the specified collection of objects.<a name="line.658"></a>
-<span class="sourceLineNo">659</span>    * Returns null if collection should 
not be serialized as a 2-dimensional table.<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    * 2-dimensional tables are used for 
collections of objects that all have the same set of property names.<a 
name="line.660"></a>
-<span class="sourceLineNo">661</span>    */<a name="line.661"></a>
-<span class="sourceLineNo">662</span>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.662"></a>
-<span class="sourceLineNo">663</span>   private Object[] 
getTableHeaders(Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception 
{<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      if (c.size() == 0)<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>         return null;<a 
name="line.665"></a>
-<span class="sourceLineNo">666</span>      c = sort(c);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      Object[] th;<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      Set&lt;ClassMeta&gt; prevC = new 
HashSet&lt;ClassMeta&gt;();<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      Object o1 = null;<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>      for (Object o : c)<a 
name="line.670"></a>
-<span class="sourceLineNo">671</span>         if (o != null) {<a 
name="line.671"></a>
-<span class="sourceLineNo">672</span>            o1 = o;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>            break;<a name="line.673"></a>
-<span class="sourceLineNo">674</span>         }<a name="line.674"></a>
-<span class="sourceLineNo">675</span>      if (o1 == null)<a 
name="line.675"></a>
-<span class="sourceLineNo">676</span>         return null;<a 
name="line.676"></a>
-<span class="sourceLineNo">677</span>      ClassMeta&lt;?&gt; cm = 
getClassMetaForObject(o1);<a name="line.677"></a>
-<span class="sourceLineNo">678</span>      if (cm.getPojoSwap() != null) {<a 
name="line.678"></a>
-<span class="sourceLineNo">679</span>         PojoSwap f = cm.getPojoSwap();<a 
name="line.679"></a>
-<span class="sourceLineNo">680</span>         o1 = f.swap(this, o1);<a 
name="line.680"></a>
-<span class="sourceLineNo">681</span>         cm = 
cm.getSerializedClassMeta();<a name="line.681"></a>
-<span class="sourceLineNo">682</span>      }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      if (cm == null || ! 
cm.isMapOrBean())<a name="line.683"></a>
-<span class="sourceLineNo">684</span>         return null;<a 
name="line.684"></a>
-<span class="sourceLineNo">685</span>      if 
(cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.685"></a>
+<span class="sourceLineNo">566</span>            out.oTag(i+1, "tr");<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span>            String typeName = (cm == null 
? null : cm.getDictionaryName());<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            String typeProperty = 
getBeanTypePropertyName(cm);<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span>            if (typeName != null 
&amp;&amp; eType.getElementType() != cm)<a name="line.570"></a>
+<span class="sourceLineNo">571</span>               out.attr(typeProperty, 
typeName);<a name="line.571"></a>
+<span class="sourceLineNo">572</span>            out.cTag().nl(i+2);<a 
name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>            if (cm == null) {<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>               serializeAnything(out, o, 
null, null, 1, null, false);<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span>            } else if (cm.isMap() 
&amp;&amp; ! (cm.isBeanMap())) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>               Map m2 = sort((Map)o);<a 
name="line.578"></a>
+<span class="sourceLineNo">579</span><a name="line.579"></a>
+<span class="sourceLineNo">580</span>               for (Object k : th) {<a 
name="line.580"></a>
+<span class="sourceLineNo">581</span>                  out.sTag(i+2, "td");<a 
name="line.581"></a>
+<span class="sourceLineNo">582</span>                  ContentResult cr = 
serializeAnything(out, m2.get(k), eType.getElementType(), toString(k), 2, null, 
false);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                  if (cr == CR_NORMAL)<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>                     out.i(i+2);<a 
name="line.584"></a>
+<span class="sourceLineNo">585</span>                  
out.eTag("td").nl(i+2);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>               }<a name="line.586"></a>
+<span class="sourceLineNo">587</span>            } else {<a 
name="line.587"></a>
+<span class="sourceLineNo">588</span>               BeanMap m2 = null;<a 
name="line.588"></a>
+<span class="sourceLineNo">589</span>               if (o instanceof 
BeanMap)<a name="line.589"></a>
+<span class="sourceLineNo">590</span>                  m2 = (BeanMap)o;<a 
name="line.590"></a>
+<span class="sourceLineNo">591</span>               else<a name="line.591"></a>
+<span class="sourceLineNo">592</span>                  m2 = toBeanMap(o);<a 
name="line.592"></a>
+<span class="sourceLineNo">593</span><a name="line.593"></a>
+<span class="sourceLineNo">594</span>               for (Object k : th) {<a 
name="line.594"></a>
+<span class="sourceLineNo">595</span>                  BeanMapEntry p = 
m2.getProperty(toString(k));<a name="line.595"></a>
+<span class="sourceLineNo">596</span>                  BeanPropertyMeta pMeta 
= p.getMeta();<a name="line.596"></a>
+<span class="sourceLineNo">597</span>                  Object value = 
p.getValue();<a name="line.597"></a>
+<span class="sourceLineNo">598</span><a name="line.598"></a>
+<span class="sourceLineNo">599</span>                  String link = null, 
anchorText = null;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>                  if (! 
pMeta.getClassMeta().isCollectionOrArray()) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span>                     link = 
m2.resolveVars(getLink(pMeta));<a name="line.601"></a>
+<span class="sourceLineNo">602</span>                     anchorText = 
m2.resolveVars(getAnchorText(pMeta));<a name="line.602"></a>
+<span class="sourceLineNo">603</span>                  }<a name="line.603"></a>
+<span class="sourceLineNo">604</span><a name="line.604"></a>
+<span class="sourceLineNo">605</span>                  if (anchorText != 
null)<a name="line.605"></a>
+<span class="sourceLineNo">606</span>                     value = 
anchorText;<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>                  String style = 
getStyle(this, pMeta, value);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>                  out.oTag(i+2, "td");<a 
name="line.609"></a>
+<span class="sourceLineNo">610</span>                  if (style != null)<a 
name="line.610"></a>
+<span class="sourceLineNo">611</span>                     out.attr("style", 
style);<a name="line.611"></a>
+<span class="sourceLineNo">612</span>                  out.cTag();<a 
name="line.612"></a>
+<span class="sourceLineNo">613</span>                  if (link != null)<a 
name="line.613"></a>
+<span class="sourceLineNo">614</span>                     
out.oTag("a").attrUri("href", link).cTag();<a name="line.614"></a>
+<span class="sourceLineNo">615</span>                  ContentResult cr = 
serializeAnything(out, value, pMeta.getClassMeta(), p.getKey().toString(), 2, 
pMeta, false);<a name="line.615"></a>
+<span class="sourceLineNo">616</span>                  if (cr == CR_NORMAL)<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>                     out.i(i+2);<a 
name="line.617"></a>
+<span class="sourceLineNo">618</span>                  if (link != null)<a 
name="line.618"></a>
+<span class="sourceLineNo">619</span>                     out.eTag("a");<a 
name="line.619"></a>
+<span class="sourceLineNo">620</span>                  
out.eTag("td").nl(i+2);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>               }<a name="line.621"></a>
+<span class="sourceLineNo">622</span>            }<a name="line.622"></a>
+<span class="sourceLineNo">623</span>            
out.ie(i+1).eTag("tr").nl(i+1);<a name="line.623"></a>
+<span class="sourceLineNo">624</span>         }<a name="line.624"></a>
+<span class="sourceLineNo">625</span>         out.ie(i).eTag("table").nl(i);<a 
name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span>      } else {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>         out.oTag(i, "ul");<a 
name="line.628"></a>
+<span class="sourceLineNo">629</span>         if (! type2.equals("array"))<a 
name="line.629"></a>
+<span class="sourceLineNo">630</span>            out.attr(btpn, type2);<a 
name="line.630"></a>
+<span class="sourceLineNo">631</span>         out.append('&gt;').nl(i+1);<a 
name="line.631"></a>
+<span class="sourceLineNo">632</span>         for (Object o : c) {<a 
name="line.632"></a>
+<span class="sourceLineNo">633</span>            out.oTag(i+1, "li");<a 
name="line.633"></a>
+<span class="sourceLineNo">634</span>            String style = getStyle(this, 
ppMeta, o);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>            String link = 
getLink(ppMeta);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>            if (style != null)<a 
name="line.636"></a>
+<span class="sourceLineNo">637</span>               out.attr("style", 
style);<a name="line.637"></a>
+<span class="sourceLineNo">638</span>            out.cTag();<a 
name="line.638"></a>
+<span class="sourceLineNo">639</span>            if (link != null)<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span>               out.oTag(i+2, 
"a").attrUri("href", link.replace("{#}", StringUtils.toString(o))).cTag();<a 
name="line.640"></a>
+<span class="sourceLineNo">641</span>            ContentResult cr = 
serializeAnything(out, o, eType.getElementType(), name, 1, null, false);<a 
name="line.641"></a>
+<span class="sourceLineNo">642</span>            if (link != null)<a 
name="line.642"></a>
+<span class="sourceLineNo">643</span>               out.eTag("a");<a 
name="line.643"></a>
+<span class="sourceLineNo">644</span>            if (cr == CR_NORMAL)<a 
name="line.644"></a>
+<span class="sourceLineNo">645</span>               out.ie(i+1);<a 
name="line.645"></a>
+<span class="sourceLineNo">646</span>            out.eTag("li").nl(i+1);<a 
name="line.646"></a>
+<span class="sourceLineNo">647</span>         }<a name="line.647"></a>
+<span class="sourceLineNo">648</span>         out.ie(i).eTag("ul").nl(i);<a 
name="line.648"></a>
+<span class="sourceLineNo">649</span>      }<a name="line.649"></a>
+<span class="sourceLineNo">650</span>   }<a name="line.650"></a>
+<span class="sourceLineNo">651</span><a name="line.651"></a>
+<span class="sourceLineNo">652</span>   private static HtmlRender&lt;?&gt; 
getRender(HtmlSerializerSession session, BeanPropertyMeta pMeta, Object value) 
{<a name="line.652"></a>
+<span class="sourceLineNo">653</span>      if (pMeta == null)<a 
name="line.653"></a>
+<span class="sourceLineNo">654</span>         return null;<a 
name="line.654"></a>
+<span class="sourceLineNo">655</span>      HtmlBeanPropertyMeta hpMeta = 
pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>      HtmlRender&lt;?&gt; render = 
hpMeta.getRender();<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      if (render != null)<a 
name="line.657"></a>
+<span class="sourceLineNo">658</span>         return render;<a 
name="line.658"></a>
+<span class="sourceLineNo">659</span>      ClassMeta&lt;?&gt; cMeta = 
session.getClassMetaForObject(value);<a name="line.659"></a>
+<span class="sourceLineNo">660</span>      render = cMeta == null ? null : 
cMeta.getExtendedMeta(HtmlClassMeta.class).getRender();<a name="line.660"></a>
+<span class="sourceLineNo">661</span>      return render;<a 
name="line.661"></a>
+<span class="sourceLineNo">662</span>   }<a name="line.662"></a>
+<span class="sourceLineNo">663</span><a name="line.663"></a>
+<span class="sourceLineNo">664</span>   
@SuppressWarnings({"rawtypes","unchecked"})<a name="line.664"></a>
+<span class="sourceLineNo">665</span>   private static String 
getStyle(HtmlSerializerSession session, BeanPropertyMeta pMeta, Object value) 
{<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      HtmlRender render = 
getRender(session, pMeta, value);<a name="line.666"></a>
+<span class="sourceLineNo">667</span>      return render == null ? null : 
render.getStyle(session, value);<a name="line.667"></a>
+<span class="sourceLineNo">668</span>   }<a name="line.668"></a>
+<span class="sourceLineNo">669</span><a name="line.669"></a>
+<span class="sourceLineNo">670</span>   private static String 
getLink(BeanPropertyMeta pMeta) {<a name="line.670"></a>
+<span class="sourceLineNo">671</span>      return pMeta == null ? null : 
pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).getLink();<a 
name="line.671"></a>
+<span class="sourceLineNo">672</span>   }<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span>   private static String 
getAnchorText(BeanPropertyMeta pMeta) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      return pMeta == null ? null : 
pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).getAnchorText();<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span>   }<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>   /*<a name="line.678"></a>
+<span class="sourceLineNo">679</span>    * Returns the table column headers 
for the specified collection of objects.<a name="line.679"></a>
+<span class="sourceLineNo">680</span>    * Returns null if collection should 
not be serialized as a 2-dimensional table.<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    * 2-dimensional tables are used for 
collections of objects that all have the same set of property names.<a 
name="line.681"></a>
+<span class="sourceLineNo">682</span>    */<a name="line.682"></a>
+<span class="sourceLineNo">683</span>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.683"></a>
+<span class="sourceLineNo">684</span>   private Object[] 
getTableHeaders(Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception 
{<a name="line.684"></a>
+<span class="sourceLineNo">685</span>      if (c.size() == 0)<a 
name="line.685"></a>
 <span class="sourceLineNo">686</span>         return null;<a 
name="line.686"></a>
-<span class="sourceLineNo">687</span>      HtmlClassMeta h = 
cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      if (h.isNoTables() || (hbpMeta != 
null &amp;&amp; hbpMeta.isNoTables()))<a name="line.688"></a>
-<span class="sourceLineNo">689</span>         return null;<a 
name="line.689"></a>
-<span class="sourceLineNo">690</span>      if (h.isNoTableHeaders() || 
(hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.690"></a>
-<span class="sourceLineNo">691</span>         return new Object[0];<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>      if (canIgnoreValue(cm, null, o1))<a 
name="line.692"></a>
-<span class="sourceLineNo">693</span>         return null;<a 
name="line.693"></a>
-<span class="sourceLineNo">694</span>      if (cm.isMap() &amp;&amp; ! 
cm.isBeanMap()) {<a name="line.694"></a>
-<span class="sourceLineNo">695</span>         Set&lt;Object&gt; set = new 
LinkedHashSet&lt;Object&gt;();<a name="line.695"></a>
-<span class="sourceLineNo">696</span>         for (Object o : c) {<a 
name="line.696"></a>
-<span class="sourceLineNo">697</span>            if (! canIgnoreValue(cm, 
null, o)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>               if (! cm.isInstance(o))<a 
name="line.698"></a>
-<span class="sourceLineNo">699</span>                  return null;<a 
name="line.699"></a>
-<span class="sourceLineNo">700</span>               Map m = sort((Map)o);<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span>               for (Map.Entry e : 
(Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span>                  if (e.getValue() != 
null)<a name="line.702"></a>
-<span class="sourceLineNo">703</span>                     set.add(e.getKey() 
== null ? null : e.getKey());<a name="line.703"></a>
-<span class="sourceLineNo">704</span>               }<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>         th = set.toArray(new 
Object[set.size()]);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      } else {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>         Map&lt;String,Boolean&gt; m = 
new LinkedHashMap&lt;String,Boolean&gt;();<a name="line.709"></a>
-<span class="sourceLineNo">710</span>         for (Object o : c) {<a 
name="line.710"></a>
-<span class="sourceLineNo">711</span>            if (! canIgnoreValue(cm, 
null, o)) {<a name="line.711"></a>
-<span class="sourceLineNo">712</span>               if (! cm.isInstance(o))<a 
name="line.712"></a>
-<span class="sourceLineNo">713</span>                  return null;<a 
name="line.713"></a>
-<span class="sourceLineNo">714</span>               BeanMap&lt;?&gt; bm = (o 
instanceof BeanMap ? (BeanMap)o : toBeanMap(o));<a name="line.714"></a>
-<span class="sourceLineNo">715</span>               for 
(Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>                  String key = 
e.getKey();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>                  if (e.getValue() != 
null)<a name="line.717"></a>
-<span class="sourceLineNo">718</span>                     m.put(key, true);<a 
name="line.718"></a>
-<span class="sourceLineNo">719</span>                  else if (! 
m.containsKey(key))<a name="line.719"></a>
-<span class="sourceLineNo">720</span>                     m.put(key, false);<a 
name="line.720"></a>
-<span class="sourceLineNo">721</span>               }<a name="line.721"></a>
-<span class="sourceLineNo">722</span>            }<a name="line.722"></a>
-<span class="sourceLineNo">723</span>         }<a name="line.723"></a>
-<span class="sourceLineNo">724</span>         for (Iterator&lt;Boolean&gt; i = 
m.values().iterator(); i.hasNext();)<a name="line.724"></a>
-<span class="sourceLineNo">725</span>            if (! i.next())<a 
name="line.725"></a>
-<span class="sourceLineNo">726</span>               i.remove();<a 
name="line.726"></a>
-<span class="sourceLineNo">727</span>         th = m.keySet().toArray(new 
Object[m.size()]);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      prevC.add(cm);<a 
name="line.729"></a>
-<span class="sourceLineNo">730</span>      boolean isSortable = true;<a 
name="line.730"></a>
-<span class="sourceLineNo">731</span>      for (Object o : th)<a 
name="line.731"></a>
-<span class="sourceLineNo">732</span>         isSortable &amp;= (o instanceof 
Comparable);<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      Set&lt;Object&gt; s = (isSortable ? 
new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a 
name="line.733"></a>
-<span class="sourceLineNo">734</span>      s.addAll(Arrays.asList(th));<a 
name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>      for (Object o : c) {<a 
name="line.736"></a>
-<span class="sourceLineNo">737</span>         if (o == null)<a 
name="line.737"></a>
-<span class="sourceLineNo">738</span>            continue;<a 
name="line.738"></a>
-<span class="sourceLineNo">739</span>         cm = getClassMetaForObject(o);<a 
name="line.739"></a>
-<span class="sourceLineNo">740</span>         if (cm != null &amp;&amp; 
cm.getPojoSwap() != null) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span>            PojoSwap f = 
cm.getPojoSwap();<a name="line.741"></a>
-<span class="sourceLineNo">742</span>            o = f.swap(this, o);<a 
name="line.742"></a>
-<span class="sourceLineNo">743</span>            cm = 
cm.getSerializedClassMeta();<a name="line.743"></a>
+<span class="sourceLineNo">687</span>      c = sort(c);<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      Object[] th;<a name="line.688"></a>
+<span class="sourceLineNo">689</span>      Set&lt;ClassMeta&gt; prevC = new 
HashSet&lt;ClassMeta&gt;();<a name="line.689"></a>
+<span class="sourceLineNo">690</span>      Object o1 = null;<a 
name="line.690"></a>
+<span class="sourceLineNo">691</span>      for (Object o : c)<a 
name="line.691"></a>
+<span class="sourceLineNo">692</span>         if (o != null) {<a 
name="line.692"></a>
+<span class="sourceLineNo">693</span>            o1 = o;<a name="line.693"></a>
+<span class="sourceLineNo">694</span>            break;<a name="line.694"></a>
+<span class="sourceLineNo">695</span>         }<a name="line.695"></a>
+<span class="sourceLineNo">696</span>      if (o1 == null)<a 
name="line.696"></a>
+<span class="sourceLineNo">697</span>         return null;<a 
name="line.697"></a>
+<span class="sourceLineNo">698</span>      ClassMeta&lt;?&gt; cm = 
getClassMetaForObject(o1);<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      if (cm.getPojoSwap() != null) {<a 
name="line.699"></a>
+<span class="sourceLineNo">700</span>         PojoSwap f = cm.getPojoSwap();<a 
name="line.700"></a>
+<span class="sourceLineNo">701</span>         o1 = f.swap(this, o1);<a 
name="line.701"></a>
+<span class="sourceLineNo">702</span>         cm = 
cm.getSerializedClassMeta();<a name="line.702"></a>
+<span class="sourceLineNo">703</span>      }<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      if (cm == null || ! 
cm.isMapOrBean())<a name="line.704"></a>
+<span class="sourceLineNo">705</span>         return null;<a 
name="line.705"></a>
+<span class="sourceLineNo">706</span>      if 
(cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.706"></a>
+<span class="sourceLineNo">707</span>         return null;<a 
name="line.707"></a>
+<span class="sourceLineNo">708</span>      HtmlClassMeta h = 
cm.getExtendedMeta(HtmlClassMeta.class);<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      if (h.isNoTables() || (hbpMeta != 
null &amp;&amp; hbpMeta.isNoTables()))<a name="line.709"></a>
+<span class="sourceLineNo">710</span>         return null;<a 
name="line.710"></a>
+<span class="sourceLineNo">711</span>      if (h.isNoTableHeaders() || 
(hbpMeta != null &amp;&amp; hbpMeta.isNoTableHeaders()))<a name="line.711"></a>
+<span class="sourceLineNo">712</span>         return new Object[0];<a 
name="line.712"></a>
+<span class="sourceLineNo">713</span>      if (canIgnoreValue(cm, null, o1))<a 
name="line.713"></a>
+<span class="sourceLineNo">714</span>         return null;<a 
name="line.714"></a>
+<span class="sourceLineNo">715</span>      if (cm.isMap() &amp;&amp; ! 
cm.isBeanMap()) {<a name="line.715"></a>
+<span class="sourceLineNo">716</span>         Set&lt;Object&gt; set = new 
LinkedHashSet&lt;Object&gt;();<a name="line.716"></a>
+<span class="sourceLineNo">717</span>         for (Object o : c) {<a 
name="line.717"></a>
+<span class="sourceLineNo">718</span>            if (! canIgnoreValue(cm, 
null, o)) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>               if (! cm.isInstance(o))<a 
name="line.719"></a>
+<span class="sourceLineNo">720</span>                  return null;<a 
name="line.720"></a>
+<span class="sourceLineNo">721</span>               Map m = sort((Map)o);<a 
name="line.721"></a>
+<span class="sourceLineNo">722</span>               for (Map.Entry e : 
(Set&lt;Map.Entry&gt;)m.entrySet()) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>                  if (e.getValue() != 
null)<a name="line.723"></a>
+<span class="sourceLineNo">724</span>                     set.add(e.getKey() 
== null ? null : e.getKey());<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>         th = set.toArray(new 
Object[set.size()]);<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      } else {<a name="line.729"></a>
+<span class="sourceLineNo">730</span>         Map&lt;String,Boolean&gt; m = 
new LinkedHashMap&lt;String,Boolean&gt;();<a name="line.730"></a>
+<span class="sourceLineNo">731</span>         for (Object o : c) {<a 
name="line.731"></a>
+<span class="sourceLineNo">732</span>            if (! canIgnoreValue(cm, 
null, o)) {<a name="line.732"></a>
+<span class="sourceLineNo">733</span>               if (! cm.isInstance(o))<a 
name="line.733"></a>
+<span class="sourceLineNo">734</span>                  return null;<a 
name="line.734"></a>
+<span class="sourceLineNo">735</span>               BeanMap&lt;?&gt; bm = (o 
instanceof BeanMap ? (BeanMap)o : toBeanMap(o));<a name="line.735"></a>
+<span class="sourceLineNo">736</span>               for 
(Map.Entry&lt;String,Object&gt; e : bm.entrySet()) {<a name="line.736"></a>
+<span class="sourceLineNo">737</span>                  String key = 
e.getKey();<a name="line.737"></a>
+<span class="sourceLineNo">738</span>                  if (e.getValue() != 
null)<a name="line.738"></a>
+<span class="sourceLineNo">739</span>                     m.put(key, true);<a 
name="line.739"></a>
+<span class="sourceLineNo">740</span>                  else if (! 
m.containsKey(key))<a name="line.740"></a>
+<span class="sourceLineNo">741</span>                     m.put(key, false);<a 
name="line.741"></a>
+<span class="sourceLineNo">742</span>               }<a name="line.742"></a>
+<span class="sourceLineNo">743</span>            }<a name="line.743"></a>
 <span class="sourceLineNo">744</span>         }<a name="line.744"></a>
-<span class="sourceLineNo">745</span>         if (prevC.contains(cm))<a 
name="line.745"></a>
-<span class="sourceLineNo">746</span>            continue;<a 
name="line.746"></a>
-<span class="sourceLineNo">747</span>         if (cm == null || ! (cm.isMap() 
|| cm.isBean()))<a name="line.747"></a>
-<span class="sourceLineNo">748</span>            return null;<a 
name="line.748"></a>
-<span class="sourceLineNo">749</span>         if 
(cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.749"></a>
-<span class="sourceLineNo">750</span>            return null;<a 
name="line.750"></a>
-<span class="sourceLineNo">751</span>         if (canIgnoreValue(cm, null, 
o))<a name="line.751"></a>
-<span class="sourceLineNo">752</span>            return null;<a 
name="line.752"></a>
-<span class="sourceLineNo">753</span>         if (cm.isMap() &amp;&amp; ! 
cm.isBeanMap()) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>            Map m = (Map)o;<a 
name="line.754"></a>
-<span class="sourceLineNo">755</span>            if (th.length != 
m.keySet().size())<a name="line.755"></a>
-<span class="sourceLineNo">756</span>               return null;<a 
name="line.756"></a>
-<span class="sourceLineNo">757</span>            for (Object k : m.keySet())<a 
name="line.757"></a>
-<span class="sourceLineNo">758</span>               if (! 
s.contains(k.toString()))<a name="line.758"></a>
-<span class="sourceLineNo">759</span>                  return null;<a 
name="line.759"></a>
-<span class="sourceLineNo">760</span>         } else {<a name="line.760"></a>
-<span class="sourceLineNo">761</span>            BeanMap&lt;?&gt; bm = (o 
instanceof BeanMap ? (BeanMap)o : toBeanMap(o));<a name="line.761"></a>
-<span class="sourceLineNo">762</span>            int l = 0;<a 
name="line.762"></a>
-<span class="sourceLineNo">763</span>            for (String k : bm.keySet()) 
{<a name="line.763"></a>
-<span class="sourceLineNo">764</span>               if (! s.contains(k))<a 
name="line.764"></a>
-<span class="sourceLineNo">765</span>                  return null;<a 
name="line.765"></a>
-<span class="sourceLineNo">766</span>               l++;<a name="line.766"></a>
-<span class="sourceLineNo">767</span>            }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>            if (s.size() != l)<a 
name="line.768"></a>
-<span class="sourceLineNo">769</span>               return null;<a 
name="line.769"></a>
-<span class="sourceLineNo">770</span>         }<a name="line.770"></a>
-<span class="sourceLineNo">771</span>      }<a name="line.771"></a>
-<span class="sourceLineNo">772</span>      return th;<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   }<a name="line.773"></a>
-<span class="sourceLineNo">774</span>}<a name="line.774"></a>
+<span class="sourceLineNo">745</span>         for (Iterator&lt;Boolean&gt; i = 
m.values().iterator(); i.hasNext();)<a name="line.745"></a>
+<span class="sourceLineNo">746</span>            if (! i.next())<a 
name="line.746"></a>
+<span class="sourceLineNo">747</span>               i.remove();<a 
name="line.747"></a>
+<span class="sourceLineNo">748</span>         th = m.keySet().toArray(new 
Object[m.size()]);<a name="line.748"></a>
+<span class="sourceLineNo">749</span>      }<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      prevC.add(cm);<a 
name="line.750"></a>
+<span class="sourceLineNo">751</span>      boolean isSortable = true;<a 
name="line.751"></a>
+<span class="sourceLineNo">752</span>      for (Object o : th)<a 
name="line.752"></a>
+<span class="sourceLineNo">753</span>         isSortable &amp;= (o instanceof 
Comparable);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      Set&lt;Object&gt; s = (isSortable ? 
new TreeSet&lt;Object&gt;() : new LinkedHashSet&lt;Object&gt;());<a 
name="line.754"></a>
+<span class="sourceLineNo">755</span>      s.addAll(Arrays.asList(th));<a 
name="line.755"></a>
+<span class="sourceLineNo">756</span><a name="line.756"></a>
+<span class="sourceLineNo">757</span>      for (Object o : c) {<a 
name="line.757"></a>
+<span class="sourceLineNo">758</span>         if (o == null)<a 
name="line.758"></a>
+<span class="sourceLineNo">759</span>            continue;<a 
name="line.759"></a>
+<span class="sourceLineNo">760</span>         cm = getClassMetaForObject(o);<a 
name="line.760"></a>
+<span class="sourceLineNo">761</span>         if (cm != null &amp;&amp; 
cm.getPojoSwap() != null) {<a name="line.761"></a>
+<span class="sourceLineNo">762</span>            PojoSwap f = 
cm.getPojoSwap();<a name="line.762"></a>
+<span class="sourceLineNo">763</span>            o = f.swap(this, o);<a 
name="line.763"></a>
+<span class="sourceLineNo">764</span>            cm = 
cm.getSerializedClassMeta();<a name="line.764"></a>
+<span class="sourceLineNo">765</span>         }<a name="line.765"></a>
+<span class="sourceLineNo">766</span>         if (prevC.contains(cm))<a 
name="line.766"></a>
+<span class="sourceLineNo">767</span>            continue;<a 
name="line.767"></a>
+<span class="sourceLineNo">768</span>         if (cm == null || ! (cm.isMap() 
|| cm.isBean()))<a name="line.768"></a>
+<span class="sourceLineNo">769</span>            return null;<a 
name="line.769"></a>
+<span class="sourceLineNo">770</span>         if 
(cm.getInnerClass().isAnnotationPresent(HtmlLink.class))<a name="line.770"></a>
+<span class="sourceLineNo">771</span>            return null;<a 
name="line.771"></a>
+<span class="sourceLineNo">772</span>         if (canIgnoreValue(cm, null, 
o))<a name="line.772"></a>
+<span class="sourceLineNo">773</span>            return null;<a 
name="line.773"></a>
+<span class="sourceLineNo">774</span>         if (cm.isMap() &amp;&amp; ! 
cm.isBeanMap()) {<a name="line.774"></a>
+<span class="sourceLineNo">775</span>            Map m = (Map)o;<a 
name="line.775"></a>
+<span class="sourceLineNo">776</span>            if (th.length != 
m.keySet().size())<a name="line.776"></a>
+<span class="sourceLineNo">777</span>               return null;<a 
name="line.777"></a>
+<span class="sourceLineNo">778</span>            for (Object k : m.keySet())<a 
name="line.778"></a>
+<span class="sourceLineNo">779</span>               if (! 
s.contains(k.toString()))<a name="line.779"></a>
+<span class="sourceLineNo">780</span>                  return null;<a 
name="line.780"></a>
+<span class="sourceLineNo">781</span>         } else {<a name="line.781"></a>
+<span class="sourceLineNo">782</span>            BeanMap&lt;?&gt; bm = (o 
instanceof BeanMap ? (BeanMap)o : toBeanMap(o));<a name="line.782"></a>
+<span class="sourceLineNo">783</span>            int l = 0;<a 
name="line.783"></a>
+<span class="sourceLineNo">784</span>            for (String k : bm.keySet()) 
{<a name="line.784"></a>
+<span class="sourceLineNo">785</span>               if (! s.contains(k))<a 
name="line.785"></a>
+<span class="sourceLineNo">786</span>                  return null;<a 
name="line.786"></a>
+<span class="sourceLineNo">787</span>               l++;<a name="line.787"></a>
+<span class="sourceLineNo">788</span>            }<a name="line.788"></a>
+<span class="sourceLineNo">789</span>            if (s.size() != l)<a 
name="line.789"></a>
+<span class="sourceLineNo">790</span>               return null;<a 
name="line.790"></a>
+<span class="sourceLineNo">791</span>         }<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      }<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      return th;<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   }<a name="line.794"></a>
+<span class="sourceLineNo">795</span>}<a name="line.795"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html 
b/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
index 0038d40..6a0cb48 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/annotation/Html.html
@@ -106,7 +106,26 @@
 <span class="sourceLineNo">098</span>    * &lt;/p&gt;<a name="line.98"></a>
 <span class="sourceLineNo">099</span>    */<a name="line.99"></a>
 <span class="sourceLineNo">100</span>   String link() default "";<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>}<a name="line.101"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>   /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    * Use the specified anchor text when 
serializing a URI.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    * &lt;p&gt;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    * The text can contain any bean 
property values resolved through variables of the form 
&lt;js&gt;"{property-name}"&lt;/js&gt;.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    *<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    * &lt;h6 
class='figure'&gt;Example:&lt;/h6&gt;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * &lt;p class='bcode'&gt;<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    *    &lt;jk&gt;public 
class&lt;/jk&gt; FileSpace {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    *<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    *       
&lt;ja&gt;@Html&lt;/ja&gt;(anchorText=&lt;js&gt;"drive/{drive}"&lt;/js&gt;)<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    *       &lt;jk&gt;public&lt;/jk&gt; 
String getDrive() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    *          ...;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    *       }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    *    }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    * &lt;/p&gt;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   String anchorText() default "";<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>}<a name="line.120"></a>
 
 
 

Reply via email to